Migrate from Kotlin synthetics to Jetpack view binding (#5546)

app/build.gradle

@@ -5,7 +5,7 @@ apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply from: "$rootDir/jacoco.gradle"
 
 def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
@@ -357,6 +357,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 
     buildToolsVersion buildToolsVersion
 
@@ -397,7 +400,3 @@ if (isRunningOnTravisAndIsNotPRBuild) {
         }
     }
 }
-
-androidExtensions {
-    experimental = true
-}

app/src/main/java/fr/free/nrw/commons/Media.kt

@@ -2,7 +2,7 @@ package fr.free.nrw.commons
 
 import android.os.Parcelable
 import fr.free.nrw.commons.location.LatLng
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import fr.free.nrw.commons.wikidata.model.page.PageTitle
 import java.util.*
 

app/src/main/java/fr/free/nrw/commons/category/CategoryItem.kt

@@ -1,7 +1,7 @@
 package fr.free.nrw.commons.category
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class CategoryItem(val name: String, val description: String?,

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -12,7 +12,7 @@ import fr.free.nrw.commons.upload.UploadMediaDetail
 import fr.free.nrw.commons.upload.WikidataPlace
 import fr.free.nrw.commons.upload.WikidataPlace.Companion.from
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.*
 
 @Entity(tableName = "contribution")

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

@@ -6,7 +6,6 @@ import android.animation.ValueAnimator
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
-import android.graphics.drawable.BitmapDrawable
 import android.media.ExifInterface
 import android.os.Bundle
 import android.util.Log
@@ -18,10 +17,7 @@ import androidx.core.graphics.rotationMatrix
 import androidx.core.graphics.scaleMatrix
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModelProvider
-import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.ActivityEditBinding
-import kotlinx.android.synthetic.main.activity_edit.btn_save
-import kotlinx.android.synthetic.main.activity_edit.iv
-import kotlinx.android.synthetic.main.activity_edit.rotate_btn
 import timber.log.Timber
 import java.io.File
 
@@ -37,10 +33,12 @@ class EditActivity : AppCompatActivity() {
     private var imageUri = ""
     private lateinit var vm: EditViewModel
     private val sourceExifAttributeList = mutableListOf<Pair<String, String?>>()
+    private lateinit var binding: ActivityEditBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_edit)
+        binding = ActivityEditBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         supportActionBar?.title = ""
         val intent = intent
         imageUri = intent.getStringExtra("image") ?: ""
@@ -87,9 +85,9 @@ class EditActivity : AppCompatActivity() {
      * for the "Rotate" and "Save" buttons.
      */
     private fun init() {
-        iv.adjustViewBounds = true
+        binding.iv.adjustViewBounds = true
-        iv.scaleType = ImageView.ScaleType.MATRIX
+        binding.iv.scaleType = ImageView.ScaleType.MATRIX
-        iv.post(Runnable {
+        binding.iv.post(Runnable {
             val options = BitmapFactory.Options()
             options.inJustDecodeBounds = true
             BitmapFactory.decodeFile(imageUri, options)
@@ -104,26 +102,26 @@ class EditActivity : AppCompatActivity() {
                 options.inSampleSize = scaleFactor
                 options.inJustDecodeBounds = false
                 val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)
-                iv.setImageBitmap(scaledBitmap)
+                binding.iv.setImageBitmap(scaledBitmap)
                 // Update the ImageView with the scaled bitmap
-                val scale = iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
+                val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
-                iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
+                binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
-                iv.imageMatrix = scaleMatrix(scale, scale)
+                binding.iv.imageMatrix = scaleMatrix(scale, scale)
             } else {
 
                 options.inJustDecodeBounds = false
                 val bitmap = BitmapFactory.decodeFile(imageUri, options)
-                iv.setImageBitmap(bitmap)
+                binding.iv.setImageBitmap(bitmap)
 
-                val scale = iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
+                val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
-                iv.layoutParams.height = (scale * bitmapHeight).toInt()
+                binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()
-                iv.imageMatrix = scaleMatrix(scale, scale)
+                binding.iv.imageMatrix = scaleMatrix(scale, scale)
             }
         })
-        rotate_btn.setOnClickListener {
+        binding.rotateBtn.setOnClickListener {
             animateImageHeight()
         }
-        btn_save.setOnClickListener {
+        binding.btnSave.setOnClickListener {
             getRotatedImage()
         }
     }
@@ -140,10 +138,10 @@ class EditActivity : AppCompatActivity() {
      * further rotation actions.
      */
     private fun animateImageHeight() {
-        val drawableWidth: Float = iv.getDrawable().getIntrinsicWidth().toFloat()
+        val drawableWidth: Float = binding.iv.getDrawable().getIntrinsicWidth().toFloat()
-        val drawableHeight: Float = iv.getDrawable().getIntrinsicHeight().toFloat()
+        val drawableHeight: Float = binding.iv.getDrawable().getIntrinsicHeight().toFloat()
-        val viewWidth: Float = iv.getMeasuredWidth().toFloat()
+        val viewWidth: Float = binding.iv.getMeasuredWidth().toFloat()
-        val viewHeight: Float = iv.getMeasuredHeight().toFloat()
+        val viewHeight: Float = binding.iv.getMeasuredHeight().toFloat()
         val rotation = imageRotation % 360
         val newRotation = rotation + 90
 
@@ -173,12 +171,12 @@ class EditActivity : AppCompatActivity() {
 
         animator.addListener(object : AnimatorListener {
             override fun onAnimationStart(animation: Animator) {
-                rotate_btn.setEnabled(false)
+                binding.rotateBtn.setEnabled(false)
             }
 
             override fun onAnimationEnd(animation: Animator) {
                 imageRotation = newRotation % 360
-                rotate_btn.setEnabled(true)
+                binding.rotateBtn.setEnabled(true)
             }
 
             override fun onAnimationCancel(animation: Animator) {
@@ -196,7 +194,7 @@ class EditActivity : AppCompatActivity() {
                 (complementaryAnimVal * viewHeight + animVal * newViewHeight).toInt()
             val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale
             val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation
-            iv.getLayoutParams().height = animatedHeight
+            binding.iv.getLayoutParams().height = animatedHeight
             val matrix: Matrix = rotationMatrix(
                 animatedRotation,
                 drawableWidth / 2,
@@ -209,11 +207,11 @@ class EditActivity : AppCompatActivity() {
                 drawableHeight / 2
             )
             matrix.postTranslate(
-                -(drawableWidth - iv.getMeasuredWidth()) / 2,
+                -(drawableWidth - binding.iv.getMeasuredWidth()) / 2,
-                -(drawableHeight - iv.getMeasuredHeight()) / 2
+                -(drawableHeight - binding.iv.getMeasuredHeight()) / 2
             )
-            iv.setImageMatrix(matrix)
+            binding.iv.setImageMatrix(matrix)
-            iv.requestLayout()
+            binding.iv.requestLayout()
         }
 
         animator.start()

app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaFragment.kt

@@ -18,7 +18,7 @@ abstract class PageableMediaFragment : BasePagingFragment<Media>(), MediaDetailP
      * ViewBinding
      */
     private var _binding: FragmentSearchPaginatedBinding? = null
-    private val binding get() = _binding
+    private val binding get() = _binding!!
 
     override val pagedListAdapter by lazy {
         PagedMediaAdapter(categoryImagesCallback::onMediaClicked)
@@ -43,9 +43,9 @@ abstract class PageableMediaFragment : BasePagingFragment<Media>(), MediaDetailP
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         _binding = FragmentSearchPaginatedBinding.inflate(inflater, container, false)
-        return binding?.root
+        return binding.root
     }
 
     private val simpleDataObserver =
@@ -66,7 +66,7 @@ abstract class PageableMediaFragment : BasePagingFragment<Media>(), MediaDetailP
         pagedListAdapter.currentList?.get(position)?.takeIf { it.filename != null }
             .also {
                 pagedListAdapter.currentList?.loadAround(position)
-                binding?.paginatedSearchResultsList?.scrollToPosition(position)
+                binding.paginatedSearchResultsList.scrollToPosition(position)
             }
 
     override fun getTotalMediaCount(): Int = pagedListAdapter.itemCount

app/src/main/java/fr/free/nrw/commons/explore/media/PagedMediaAdapter.kt

@@ -6,9 +6,9 @@ import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.DiffUtil
 import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.LayoutCategoryImagesBinding
 import fr.free.nrw.commons.explore.paging.BaseViewHolder
 import fr.free.nrw.commons.explore.paging.inflate
-import kotlinx.android.synthetic.main.layout_category_images.*
 
 class PagedMediaAdapter(private val onImageClicked: (Int) -> Unit) :
     PagedListAdapter<Media, SearchImagesViewHolder>(object : DiffUtil.ItemCallback<Media>() {
@@ -32,17 +32,19 @@ class PagedMediaAdapter(private val onImageClicked: (Int) -> Unit) :
 
 class SearchImagesViewHolder(containerView: View, val onImageClicked: (Int) -> Unit) :
     BaseViewHolder<Pair<Media, Int>>(containerView) {
+    val binding = LayoutCategoryImagesBinding.bind(itemView)
+
     override fun bind(item: Pair<Media, Int>) {
         val media = item.first
-        categoryImageView.setOnClickListener { onImageClicked(item.second) }
+        binding.categoryImageView.setOnClickListener { onImageClicked(item.second) }
-        categoryImageTitle.text = media.mostRelevantCaption
+        binding.categoryImageTitle.text = media.mostRelevantCaption
-        categoryImageView.setImageURI(media.thumbUrl)
+        binding.categoryImageView.setImageURI(media.thumbUrl)
         if (media.author?.isNotEmpty() == true) {
-            categoryImageAuthor.visibility = View.VISIBLE
+            binding.categoryImageAuthor.visibility = View.VISIBLE
-            categoryImageAuthor.text =
+            binding.categoryImageAuthor.text =
                 containerView.context.getString(R.string.image_uploaded_by, media.user)
         } else {
-            categoryImageAuthor.visibility = View.GONE
+            binding.categoryImageAuthor.visibility = View.GONE
         }
     }
 

app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingFragment.kt

@@ -5,7 +5,8 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.*
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
@@ -14,11 +15,9 @@ import androidx.paging.PagedList
 import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.MergeAdapter
-import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.FragmentSearchPaginatedBinding
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
 import fr.free.nrw.commons.utils.ViewUtil
-import kotlinx.android.synthetic.main.fragment_search_paginated.*
-
 
 abstract class BasePagingFragment<T> : CommonsDaggerSupportFragment(),
     PagingContract.View<T> {
@@ -30,15 +29,21 @@ abstract class BasePagingFragment<T> : CommonsDaggerSupportFragment(),
     private val mergeAdapter by lazy { MergeAdapter(pagedListAdapter, loadingAdapter) }
     private var searchResults: LiveData<PagedList<T>>? = null
 
+    private var _binding: FragmentSearchPaginatedBinding? = null
+    private val binding get() = _binding!!
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ) = inflater.inflate(R.layout.fragment_search_paginated, container, false)
+    ): View {
+        _binding = FragmentSearchPaginatedBinding.inflate(inflater, container, false)
+        return binding.root
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        paginatedSearchResultsList.apply {
+        binding.paginatedSearchResultsList.apply {
             layoutManager = GridLayoutManager(context, if (isPortrait) 1 else 2)
             adapter = mergeAdapter
         }
@@ -53,7 +58,7 @@ abstract class BasePagingFragment<T> : CommonsDaggerSupportFragment(),
      */
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        paginatedSearchResultsList.apply {
+        binding.paginatedSearchResultsList.apply {
             layoutManager = GridLayoutManager(context, if (isPortrait) 1 else 2)
         }
     }
@@ -77,15 +82,15 @@ abstract class BasePagingFragment<T> : CommonsDaggerSupportFragment(),
     }
 
     override fun hideInitialLoadProgress() {
-        paginatedSearchInitialLoadProgress.visibility = GONE
+        binding.paginatedSearchInitialLoadProgress.visibility = GONE
     }
 
     override fun showInitialLoadInProgress() {
-        paginatedSearchInitialLoadProgress.visibility = VISIBLE
+        binding.paginatedSearchInitialLoadProgress.visibility = VISIBLE
     }
 
     override fun showSnackbar() {
-        ViewUtil.showShortSnackbar(paginatedSearchResultsList, errorTextId)
+        ViewUtil.showShortSnackbar(binding.paginatedSearchResultsList, errorTextId)
     }
 
     fun onQueryUpdated(query: String) {
@@ -93,14 +98,14 @@ abstract class BasePagingFragment<T> : CommonsDaggerSupportFragment(),
     }
 
     override fun showEmptyText(query: String) {
-        contentNotFound.text = getEmptyText(query)
+        binding.contentNotFound.text = getEmptyText(query)
-        contentNotFound.visibility = VISIBLE
+        binding.contentNotFound.visibility = VISIBLE
     }
 
     abstract fun getEmptyText(query: String): String
 
     override fun hideEmptyText() {
-        contentNotFound.visibility = GONE
+        binding.contentNotFound.visibility = GONE
     }
 }
 

app/src/main/java/fr/free/nrw/commons/explore/paging/FooterAdapter.kt

@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.ListItemLoadMoreBinding
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.list_item_load_more.*
 
 class FooterAdapter(private val onRefreshClicked: () -> Unit) :
     ListAdapter<FooterItem, FooterViewHolder>(object :
@@ -45,8 +45,10 @@ open class FooterViewHolder(override val containerView: View) :
 class LoadingViewHolder(containerView: View) : FooterViewHolder(containerView)
 class RefreshViewHolder(containerView: View, onRefreshClicked: () -> Unit) :
     FooterViewHolder(containerView) {
+    val binding = ListItemLoadMoreBinding.bind(itemView)
+
     init {
-        listItemLoadMoreButton.setOnClickListener { onRefreshClicked() }
+        binding.listItemLoadMoreButton.setOnClickListener { onRefreshClicked() }
     }
 }
 

app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt

@@ -2,7 +2,7 @@ package fr.free.nrw.commons.upload
 
 import android.os.Parcelable
 import fr.free.nrw.commons.nearby.Place
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * Holds a description of an item being uploaded by [UploadActivity]

app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt

@@ -3,7 +3,7 @@ package fr.free.nrw.commons.upload
 import android.os.Parcelable
 import fr.free.nrw.commons.location.LatLng
 import fr.free.nrw.commons.nearby.Place
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class WikidataPlace(

app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictedItem.kt

@@ -11,7 +11,7 @@ import fr.free.nrw.commons.wikidata.WikidataProperties.*
 import fr.free.nrw.commons.wikidata.model.DataValue
 import fr.free.nrw.commons.wikidata.model.Entities
 import fr.free.nrw.commons.wikidata.model.Statement_partial
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.math.BigInteger
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException

app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapterUnitTest.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import fr.free.nrw.commons.TestCommonsApplication
-import kotlinx.android.synthetic.main.row_item_languages_spinner.view.*
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test