Skip to content

Commit 03cf10d

Browse files
authored
refactor(*): remove kotlin-android-extensions (firebase#310)
* refactor(*): remove kotlin-android-extensions * refactor(dl-invites): replace if-else with elvis operator
1 parent c7de79f commit 03cf10d

File tree

25 files changed

+16
-41
lines changed

25 files changed

+16
-41
lines changed

admob/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

analytics/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

appindexing/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

auth/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

crashlytics/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

database/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

dl-invites/app/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30
@@ -21,10 +20,6 @@ android {
2120
}
2221
}
2322

24-
androidExtensions {
25-
experimental = true
26-
}
27-
2823
dependencies {
2924
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
3025
implementation 'androidx.appcompat:appcompat:1.3.0'

dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package com.google.firebase.dynamicinvites.kotlin.view
22

33
import android.os.Bundle
4+
import android.widget.Button
45
import androidx.appcompat.app.AppCompatActivity
56

67
import com.google.firebase.dynamicinvites.R
78
import com.google.firebase.dynamicinvites.kotlin.presenter.InvitePresenter
8-
import kotlinx.android.synthetic.main.activity_main.buttonShare
99

1010
class AdvancedActivity : AppCompatActivity(), ShareDialogFragment.Listener {
1111

1212
override fun onCreate(savedInstanceState: Bundle?) {
1313
super.onCreate(savedInstanceState)
1414
setContentView(R.layout.activity_advanced)
1515

16-
buttonShare.setOnClickListener {
16+
findViewById<Button>(R.id.buttonShare).setOnClickListener {
1717
ShareDialogFragment.newInstance().show(supportFragmentManager, "dialog")
1818
}
1919
}

dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ package com.google.firebase.dynamicinvites.kotlin.view
22

33
import android.content.Intent
44
import android.os.Bundle
5+
import android.widget.Button
56
import androidx.appcompat.app.AppCompatActivity
67
import com.google.firebase.dynamicinvites.R
78
import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
8-
import kotlinx.android.synthetic.main.activity_main.buttonShare
99

1010
class MainActivity : AppCompatActivity() {
1111

1212
override fun onCreate(savedInstanceState: Bundle?) {
1313
super.onCreate(savedInstanceState)
1414
setContentView(R.layout.activity_main)
1515

16-
buttonShare.setOnClickListener {
16+
findViewById<Button>(R.id.buttonShare).setOnClickListener {
1717
onShareClicked()
1818
}
1919
}

dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import android.os.Bundle
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8+
import android.widget.ImageView
9+
import android.widget.TextView
810
import androidx.recyclerview.widget.LinearLayoutManager
911
import androidx.recyclerview.widget.RecyclerView
1012
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -16,9 +18,6 @@ import com.google.firebase.dynamicinvites.kotlin.presenter.MessagePresenter
1618
import com.google.firebase.dynamicinvites.kotlin.presenter.MorePresenter
1719
import com.google.firebase.dynamicinvites.kotlin.presenter.SocialPresenter
1820
import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
19-
import kotlinx.android.synthetic.main.fragment_item_list_dialog.recycler
20-
import kotlinx.android.synthetic.main.item_share_method.view.itemIcon
21-
import kotlinx.android.synthetic.main.item_share_method.view.itemName
2221

2322
/**
2423
* A fragment that shows a list of items as a modal bottom sheet.
@@ -55,18 +54,15 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
5554
MorePresenter(true, content)
5655
)
5756

57+
val recycler = view.findViewById<RecyclerView>(R.id.recycler)
5858
recycler.layoutManager = LinearLayoutManager(context)
5959
recycler.adapter = ItemAdapter(presenters)
6060
}
6161

6262
override fun onAttach(context: Context) {
6363
super.onAttach(context)
6464
val parent = parentFragment
65-
listener = if (parent != null) {
66-
parent as Listener
67-
} else {
68-
context as Listener
69-
}
65+
listener = (parent ?: context) as Listener
7066
}
7167

7268
override fun onDetach() {
@@ -81,9 +77,9 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
8177
private inner class ViewHolder(inflater: LayoutInflater, parent: ViewGroup) :
8278
RecyclerView.ViewHolder(inflater.inflate(R.layout.item_share_method, parent, false)) {
8379

84-
internal fun bind(presenter: InvitePresenter) {
85-
itemView.itemName.text = presenter.name
86-
itemView.itemIcon.setImageResource(presenter.icon)
80+
fun bind(presenter: InvitePresenter) {
81+
itemView.findViewById<TextView>(R.id.itemName).text = presenter.name
82+
itemView.findViewById<ImageView>(R.id.itemIcon).setImageResource(presenter.icon)
8783

8884
itemView.setOnClickListener {
8985
listener?.onItemClicked(presenter)

dynamic-links/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

firebaseoptions/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

firestore/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

functions/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

inappmessaging/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

installations/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

messaging/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

mlkit/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

perf/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

predictions/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

predictions/app/src/main/java/com/google/firebase/example/predictions/kotlin/MainActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import android.os.Bundle
44
import android.view.View
55
import androidx.appcompat.app.AppCompatActivity
66
import com.google.android.gms.ads.AdRequest
7+
import com.google.android.gms.ads.AdView
78
import com.google.firebase.analytics.FirebaseAnalytics
9+
import com.google.firebase.example.predictions.R
810
import com.google.firebase.ktx.Firebase
911
import com.google.firebase.remoteconfig.ktx.get
1012
import com.google.firebase.remoteconfig.ktx.remoteConfig
11-
import kotlinx.android.synthetic.main.activity_main.adView
1213

1314
class MainActivity : AppCompatActivity() {
1415

@@ -44,6 +45,7 @@ class MainActivity : AppCompatActivity() {
4445
}
4546

4647
private fun executeAdsPolicy() {
48+
val adView = findViewById<AdView>(R.id.adView)
4749
// [START pred_ads_policy]
4850
val config = Firebase.remoteConfig
4951
val adPolicy = config["ads_policy"].asString()

storage/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt'
4-
apply plugin: 'kotlin-android-extensions'
54

65
android {
76
compileSdkVersion 30

storage/app/src/main/java/com/google/firebase/referencecode/storage/kotlin/StorageActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.graphics.drawable.BitmapDrawable
55
import android.net.Uri
66
import android.os.Bundle
77
import android.util.Log
8+
import android.widget.ImageView
89
import androidx.appcompat.app.AppCompatActivity
910
import com.google.android.gms.tasks.OnFailureListener
1011
import com.google.firebase.ktx.Firebase
@@ -18,7 +19,6 @@ import com.google.firebase.storage.ktx.component2
1819
import com.google.firebase.storage.ktx.component3
1920
import com.google.firebase.storage.ktx.storage
2021
import com.google.firebase.storage.ktx.storageMetadata
21-
import kotlinx.android.synthetic.main.activity_storage.imageView
2222
import java.io.ByteArrayOutputStream
2323
import java.io.File
2424
import java.io.FileInputStream
@@ -140,6 +140,7 @@ abstract class StorageActivity : AppCompatActivity() {
140140
mountainsRef.path == mountainImagesRef.path // false
141141
// [END upload_create_reference]
142142

143+
val imageView = findViewById<ImageView>(R.id.imageView)
143144
// [START upload_memory]
144145
// Get the data from an ImageView as bytes
145146
imageView.isDrawingCacheEnabled = true

tasks/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

test-lab/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65
compileSdkVersion 30

0 commit comments

Comments
 (0)