refactor(*): remove kotlin-android-extensions (firebase#310)

thatfiredev · web-flow · commit 03cf10de9e46 · 2021-07-16T05:15:14.000-04:00
* refactor(*): remove kotlin-android-extensions

* refactor(dl-invites): replace if-else with elvis operator
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/appindexing/app/build.gradle b/appindexing/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/crashlytics/app/build.gradle b/crashlytics/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/database/app/build.gradle b/database/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/dl-invites/app/build.gradle b/dl-invites/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
@@ -21,10 +20,6 @@ android {
     }
 }
 
-androidExtensions {
-    experimental = true
-}
-
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt
@@ -1,19 +1,19 @@
 package com.google.firebase.dynamicinvites.kotlin.view
 
 import android.os.Bundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.presenter.InvitePresenter
-import kotlinx.android.synthetic.main.activity_main.buttonShare
 
 class AdvancedActivity : AppCompatActivity(), ShareDialogFragment.Listener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_advanced)
 
-        buttonShare.setOnClickListener {
+        findViewById<Button>(R.id.buttonShare).setOnClickListener {
             ShareDialogFragment.newInstance().show(supportFragmentManager, "dialog")
         }
     }
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt
@@ -2,18 +2,18 @@ package com.google.firebase.dynamicinvites.kotlin.view
 
 import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
-import kotlinx.android.synthetic.main.activity_main.buttonShare
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        buttonShare.setOnClickListener {
+        findViewById<Button>(R.id.buttonShare).setOnClickListener {
             onShareClicked()
         }
     }
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt
@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -16,9 +18,6 @@ import com.google.firebase.dynamicinvites.kotlin.presenter.MessagePresenter
 import com.google.firebase.dynamicinvites.kotlin.presenter.MorePresenter
 import com.google.firebase.dynamicinvites.kotlin.presenter.SocialPresenter
 import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
-import kotlinx.android.synthetic.main.fragment_item_list_dialog.recycler
-import kotlinx.android.synthetic.main.item_share_method.view.itemIcon
-import kotlinx.android.synthetic.main.item_share_method.view.itemName
 
 /**
  * A fragment that shows a list of items as a modal bottom sheet.
@@ -55,18 +54,15 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
                 MorePresenter(true, content)
         )
 
+        val recycler = view.findViewById<RecyclerView>(R.id.recycler)
         recycler.layoutManager = LinearLayoutManager(context)
         recycler.adapter = ItemAdapter(presenters)
     }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         val parent = parentFragment
-        listener = if (parent != null) {
-            parent as Listener
-        } else {
-            context as Listener
-        }
+        listener = (parent ?: context) as Listener
     }
 
     override fun onDetach() {
@@ -81,9 +77,9 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
     private inner class ViewHolder(inflater: LayoutInflater, parent: ViewGroup) :
         RecyclerView.ViewHolder(inflater.inflate(R.layout.item_share_method, parent, false)) {
 
-        internal fun bind(presenter: InvitePresenter) {
-            itemView.itemName.text = presenter.name
-            itemView.itemIcon.setImageResource(presenter.icon)
+        fun bind(presenter: InvitePresenter) {
+            itemView.findViewById<TextView>(R.id.itemName).text = presenter.name
+            itemView.findViewById<ImageView>(R.id.itemIcon).setImageResource(presenter.icon)
 
             itemView.setOnClickListener {
                 listener?.onItemClicked(presenter)
diff --git a/dynamic-links/app/build.gradle b/dynamic-links/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/firebaseoptions/app/build.gradle b/firebaseoptions/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/functions/app/build.gradle b/functions/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/installations/app/build.gradle b/installations/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/mlkit/app/build.gradle b/mlkit/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/perf/app/build.gradle b/perf/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/predictions/app/build.gradle b/predictions/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/predictions/app/src/main/java/com/google/firebase/example/predictions/kotlin/MainActivity.kt b/predictions/app/src/main/java/com/google/firebase/example/predictions/kotlin/MainActivity.kt
@@ -4,11 +4,12 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.ads.AdRequest
+import com.google.android.gms.ads.AdView
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.example.predictions.R
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.ktx.get
 import com.google.firebase.remoteconfig.ktx.remoteConfig
-import kotlinx.android.synthetic.main.activity_main.adView
 
 class MainActivity : AppCompatActivity() {
 
@@ -44,6 +45,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun executeAdsPolicy() {
+        val adView = findViewById<AdView>(R.id.adView)
         // [START pred_ads_policy]
         val config = Firebase.remoteConfig
         val adPolicy = config["ads_policy"].asString()
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/storage/app/src/main/java/com/google/firebase/referencecode/storage/kotlin/StorageActivity.kt b/storage/app/src/main/java/com/google/firebase/referencecode/storage/kotlin/StorageActivity.kt
@@ -5,6 +5,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.tasks.OnFailureListener
 import com.google.firebase.ktx.Firebase
@@ -18,7 +19,6 @@ import com.google.firebase.storage.ktx.component2
 import com.google.firebase.storage.ktx.component3
 import com.google.firebase.storage.ktx.storage
 import com.google.firebase.storage.ktx.storageMetadata
-import kotlinx.android.synthetic.main.activity_storage.imageView
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
@@ -140,6 +140,7 @@ abstract class StorageActivity : AppCompatActivity() {
         mountainsRef.path == mountainImagesRef.path // false
         // [END upload_create_reference]
 
+        val imageView = findViewById<ImageView>(R.id.imageView)
         // [START upload_memory]
         // Get the data from an ImageView as bytes
         imageView.isDrawingCacheEnabled = true
diff --git a/tasks/app/build.gradle b/tasks/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
diff --git a/test-lab/app/build.gradle b/test-lab/app/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
