Skip to content

Commit 34ffee4

Browse files
thatfiredevsamtstern
authored andcommitted
refactor: make kotlin improvements where possible (firebase#1005)
1 parent 40f0620 commit 34ffee4

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/AnonymousAuthActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ class AnonymousAuthActivity : BaseActivity(), View.OnClickListener {
159159
}
160160

161161
override fun onClick(v: View) {
162-
val i = v.id
163-
when (i) {
162+
when (v.id) {
164163
R.id.buttonAnonymousSignIn -> signInAnonymously()
165164
R.id.buttonAnonymousSignOut -> signOut()
166165
R.id.buttonLinkAccount -> linkAccount()

auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ class GoogleSignInActivity : BaseActivity(), View.OnClickListener {
163163
}
164164

165165
override fun onClick(v: View) {
166-
val i = v.id
167-
when (i) {
166+
when (v.id) {
168167
R.id.signInButton -> signIn()
169168
R.id.signOutButton -> signOut()
170169
R.id.disconnectButton -> revokeAccess()

config/app/src/main/java/com/google/samples/quickstart/config/kotlin/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity() {
5656
remoteConfig.fetchAndActivate()
5757
.addOnCompleteListener(this) { task ->
5858
if (task.isSuccessful) {
59-
val updated = task.getResult()
59+
val updated = task.result
6060
Log.d(TAG, "Config params updated: $updated")
6161
Toast.makeText(this, "Fetch and activate succeeded",
6262
Toast.LENGTH_SHORT).show()

functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
111111

112112
// [START call_add_numbers]
113113
addNumbers(firstNumber, secondNumber)
114-
.addOnCompleteListener(OnCompleteListener { task ->
114+
.addOnCompleteListener { task ->
115115
if (!task.isSuccessful) {
116116
val e = task.exception
117117
if (e is FirebaseFunctionsException) {
@@ -128,15 +128,15 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
128128
// [START_EXCLUDE]
129129
Log.w(TAG, "addNumbers:onFailure", e)
130130
showSnackbar("An error occurred.")
131-
return@OnCompleteListener
131+
return@addOnCompleteListener
132132
// [END_EXCLUDE]
133133
}
134134

135135
// [START_EXCLUDE]
136136
val result = task.result
137137
fieldAddResult.setText(result.toString())
138138
// [END_EXCLUDE]
139-
})
139+
}
140140
// [END call_add_numbers]
141141
}
142142

inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@ class KotlinMainActivity : AppCompatActivity() {
3636

3737
// Get and display/log the Instance ID
3838
FirebaseInstanceId.getInstance().instanceId
39-
.addOnSuccessListener(object : OnSuccessListener<InstanceIdResult> {
40-
override fun onSuccess(instanceIdResult: InstanceIdResult) {
41-
val instanceId = instanceIdResult.id
42-
instanceIdText.text = getString(R.string.instance_id_fmt, instanceId)
43-
Log.d(TAG, "InstanceId: $instanceId")
44-
}
45-
})
39+
.addOnSuccessListener { instanceIdResult ->
40+
val instanceId = instanceIdResult.id
41+
instanceIdText.text = getString(R.string.instance_id_fmt, instanceId)
42+
Log.d(TAG, "InstanceId: $instanceId")
43+
}
4644
}
4745

4846
companion object {

mlkit-smartreply/app/src/main/java/com/google/firebase/samples/apps/mlkit/smartreply/kotlin/chat/ChatViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ChatViewModel : ViewModel() {
5454
}
5555

5656
internal fun addMessage(message: String) {
57-
var list: MutableList<Message>? = messageList.getValue()
57+
var list: MutableList<Message>? = messageList.value
5858
if (list == null) {
5959
list = ArrayList()
6060
}

0 commit comments

Comments
 (0)