Merge pull request #174 from firebase/ss-ktx

Convert Kotlin samples to KTX

Author: vkryachko

database/app/build.gradle

@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.google.firebase.referencecode.database"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -29,7 +29,7 @@ android {
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.google.firebase:firebase-database:19.2.1"
+    implementation "com.google.firebase:firebase-database-ktx:19.2.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
 }
 

database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/EmulatorSuite.kt

@@ -1,6 +1,8 @@
 package com.google.firebase.referencecode.database.kotlin
 
 import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
 
 class EmulatorSuite {
 
@@ -9,7 +11,7 @@ class EmulatorSuite {
         // 10.0.2.2 is the special IP address to connect to the 'localhost' of
         // the host computer from an Android emulator.
         // In almost all cases the ns (namespace) is your project ID.
-        val database = FirebaseDatabase.getInstance("http://10.0.2.2:9000?ns=YOUR_DATABASE_NAMESPACE")
+        val database = Firebase.database("http://10.0.2.2:9000?ns=YOUR_DATABASE_NAMESPACE")
         // [END rtdb_emulator_connect]
     }
 
@@ -19,4 +21,4 @@ class EmulatorSuite {
         database.reference.setValue(null)
         // [END rtdb_emulator_flush]
     }
-}
+}

database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/MainActivity.kt

@@ -1,12 +1,14 @@
 package com.google.firebase.referencecode.database.kotlin
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
-import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ValueEventListener
+import com.google.firebase.database.ktx.database
+import com.google.firebase.database.ktx.getValue
+import com.google.firebase.ktx.Firebase
 import com.google.firebase.referencecode.database.R
 
 abstract class MainActivity : AppCompatActivity() {
@@ -24,7 +26,7 @@ abstract class MainActivity : AppCompatActivity() {
     fun basicReadWrite() {
         // [START write_message]
         // Write a message to the database
-        val database = FirebaseDatabase.getInstance()
+        val database = Firebase.database
         val myRef = database.getReference("message")
 
         myRef.setValue("Hello, World!")
@@ -36,7 +38,7 @@ abstract class MainActivity : AppCompatActivity() {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
                 // This method is called once with the initial value and again
                 // whenever data at this location is updated.
-                val value = dataSnapshot.getValue(String::class.java)
+                val value = dataSnapshot.getValue<String>()
                 Log.d(TAG, "Value is: $value")
             }
 

database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/OfflineActivity.kt

@@ -1,25 +1,27 @@
 package com.google.firebase.referencecode.database.kotlin
 
-import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.database.ChildEventListener
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
-import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ServerValue
 import com.google.firebase.database.ValueEventListener
+import com.google.firebase.database.ktx.database
+import com.google.firebase.database.ktx.getValue
+import com.google.firebase.ktx.Firebase
 
 class OfflineActivity : AppCompatActivity() {
 
     private fun enablePersistence() {
         // [START rtdb_enable_persistence]
-        FirebaseDatabase.getInstance().setPersistenceEnabled(true)
+        Firebase.database.setPersistenceEnabled(true)
         // [END rtdb_enable_persistence]
     }
 
     private fun keepSynced() {
         // [START rtdb_keep_synced]
-        val scoresRef = FirebaseDatabase.getInstance().getReference("scores")
+        val scoresRef = Firebase.database.getReference("scores")
         scoresRef.keepSynced(true)
         // [END rtdb_keep_synced]
 
@@ -30,7 +32,7 @@ class OfflineActivity : AppCompatActivity() {
 
     private fun queryRecentScores() {
         // [START rtdb_query_recent_scores]
-        val scoresRef = FirebaseDatabase.getInstance().getReference("scores")
+        val scoresRef = Firebase.database.getReference("scores")
         scoresRef.orderByValue().limitToLast(4).addChildEventListener(object : ChildEventListener {
             override fun onChildAdded(snapshot: DataSnapshot, previousChild: String?) {
                 Log.d(TAG, "The ${snapshot.key} dinosaur's score is ${snapshot.value}")
@@ -69,7 +71,7 @@ class OfflineActivity : AppCompatActivity() {
 
     private fun onDisconnect() {
         // [START rtdb_on_disconnect_set]
-        val presenceRef = FirebaseDatabase.getInstance().getReference("disconnectmessage")
+        val presenceRef = Firebase.database.getReference("disconnectmessage")
         // Write a string when this client loses connection
         presenceRef.onDisconnect().setValue("I disconnected!")
         // [END rtdb_on_disconnect_set]
@@ -94,7 +96,7 @@ class OfflineActivity : AppCompatActivity() {
 
     private fun getConnectionState() {
         // [START rtdb_listen_connected]
-        val connectedRef = FirebaseDatabase.getInstance().getReference(".info/connected")
+        val connectedRef = Firebase.database.getReference(".info/connected")
         connectedRef.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(snapshot: DataSnapshot) {
                 val connected = snapshot.getValue(Boolean::class.java) ?: false
@@ -114,14 +116,14 @@ class OfflineActivity : AppCompatActivity() {
 
     private fun disconnectionTimestamp() {
         // [START rtdb_on_disconnect_timestamp]
-        val userLastOnlineRef = FirebaseDatabase.getInstance().getReference("users/joe/lastOnline")
+        val userLastOnlineRef = Firebase.database.getReference("users/joe/lastOnline")
         userLastOnlineRef.onDisconnect().setValue(ServerValue.TIMESTAMP)
         // [END rtdb_on_disconnect_timestamp]
     }
 
     private fun getServerTimeOffset() {
         // [START rtdb_server_time_offset]
-        val offsetRef = FirebaseDatabase.getInstance().getReference(".info/serverTimeOffset")
+        val offsetRef = Firebase.database.getReference(".info/serverTimeOffset")
         offsetRef.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(snapshot: DataSnapshot) {
                 val offset = snapshot.getValue(Double::class.java) ?: 0.0
@@ -139,7 +141,7 @@ class OfflineActivity : AppCompatActivity() {
         // [START rtdb_full_connection_example]
         // Since I can connect from multiple devices, we store each connection instance separately
         // any time that connectionsRef's value is null (i.e. has no children) I am offline
-        val database = FirebaseDatabase.getInstance()
+        val database = Firebase.database
         val myConnectionsRef = database.getReference("users/joe/connections")
 
         // Stores the timestamp of my last disconnect (the last time I was seen online)
@@ -148,7 +150,7 @@ class OfflineActivity : AppCompatActivity() {
         val connectedRef = database.getReference(".info/connected")
         connectedRef.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(snapshot: DataSnapshot) {
-                val connected = snapshot.getValue(Boolean::class.java) ?: false
+                val connected = snapshot.getValue<Boolean>() ?: false
                 if (connected) {
                     val con = myConnectionsRef.push()
 

database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/QueryActivity.kt

@@ -1,15 +1,17 @@
 package com.google.firebase.referencecode.database.kotlin
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.database.ChildEventListener
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
-import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.Query
 import com.google.firebase.database.ValueEventListener
+import com.google.firebase.database.ktx.database
+import com.google.firebase.database.ktx.getValue
+import com.google.firebase.ktx.Firebase
 import com.google.firebase.referencecode.database.R
 import com.google.firebase.referencecode.database.models.Message
 
@@ -35,7 +37,7 @@ abstract class QueryActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_query)
 
-        databaseReference = FirebaseDatabase.getInstance().reference
+        databaseReference = Firebase.database.reference
     }
 
     private fun basicListen() {
@@ -51,7 +53,7 @@ abstract class QueryActivity : AppCompatActivity() {
                 Log.d(TAG, "Number of messages: ${dataSnapshot.childrenCount}")
                 dataSnapshot.children.forEach { child ->
                     // Extract Message object from the DataSnapshot
-                    val message: Message? = child.getValue(Message::class.java)
+                    val message: Message? = child.getValue<Message>()
 
                     // Use the message
                     // [START_EXCLUDE]

database/app/src/main/java/com/google/firebase/referencecode/database/kotlin/ShardingActivity.kt

@@ -1,19 +1,18 @@
 package com.google.firebase.referencecode.database.kotlin
 
 import androidx.appcompat.app.AppCompatActivity
-
-import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
 
 class ShardingActivity : AppCompatActivity() {
 
     private fun getMultipleInstances() {
         // [START rtdb_multi_instance]
         // Get the default database instance for an app
-        val primary = FirebaseDatabase.getInstance().reference
+        val primary = Firebase.database.reference
 
         // Get a secondary database instance by URL
-        val secondary = FirebaseDatabase
-                .getInstance("https://testapp-1234.firebaseio.com").reference
+        val secondary = Firebase.database("https://testapp-1234.firebaseio.com").reference
         // [END rtdb_multi_instance]
     }
 }

dynamic-links/app/build.gradle

@@ -26,13 +26,13 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "com.google.firebase:firebase-auth:19.2.0"
     implementation "com.google.firebase:firebase-invites:17.0.0"
-    implementation "com.google.firebase:firebase-dynamic-links:19.1.0"
+    implementation "com.google.firebase:firebase-dynamic-links-ktx:19.1.0"
 
     // For an optimal experience using Dynamic Links, add the Firebase SDK
     // for Google Analytics. This is recommended, but not required.
     implementation 'com.google.firebase:firebase-analytics:17.2.2'
 
-    implementation "com.google.firebase:firebase-database:19.2.1"
+    implementation "com.google.firebase:firebase-database-ktx:19.2.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }