merged

Author: tschellenbach

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+

samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt

@@ -4,29 +4,32 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.getstream.sdk.chat.Chat
+import com.getstream.sdk.chat.ChatUI
 import com.getstream.sdk.chat.viewmodel.channels.ChannelsViewModel
 import com.getstream.sdk.chat.viewmodel.channels.bindView
 import com.getstream.sdk.chat.viewmodel.factory.ChannelsViewModelFactory
+import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.logger.ChatLogLevel
 import io.getstream.chat.android.client.models.Filters
 import io.getstream.chat.android.client.models.User
+import io.getstream.chat.android.livedata.ChatDomain
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // step 1 - setup the Chat Client
-        Chat.Builder(apiKey = "b67pax5b2wdq", context = applicationContext)
-            .apply { chatLogLevel = ChatLogLevel.ALL }
-            .build()
+        // step 1 - setup the client for API calls, the chatDomain for offline storage and the UX components
+        val client = ChatClient.Builder("b67pax5b2wdq", applicationContext).logLevel(ChatLogLevel.ALL).build()
+        val domain = ChatDomain.Builder(client, applicationContext).build()
+        ChatUI.Builder(client, domain, applicationContext).build()
 
         val user = User("summer-brook-2").apply {
             extraData["name"] = "Paranoid Android"
             extraData["image"] = "https://bit.ly/2TIt8NR"
         }
         // step 2 - Authenticate and connect the user
-        Chat.instance().setUser(
+        ChatClient.instance().setUser(
             user = user,
             token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoic3VtbWVyLWJyb29rLTIifQ.CzyOx8kgrc61qVbzWvhV1WD3KPEo5ZFZH-326hIdKz0"
         )
@@ -38,13 +41,8 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             Filters.eq("type", "messaging"),
             Filters.`in`("members", listOf(user.id))
         )
-
-        val viewModel: ChannelsViewModel by viewModels {
-            ChannelsViewModelFactory(
-                filter,
-                ChannelsViewModel.DEFAULT_SORT
-            )
-        }
+        val viewModelFactory = ChannelsViewModelFactory(filter, ChannelsViewModel.DEFAULT_SORT)
+        val viewModel: ChannelsViewModel by viewModels {viewModelFactory}
 
         // step 4 -  connect the ChannelsViewModel to the channelsView, loose coupling make it easy to customize
         viewModel.bindView(channelsView, this)