small tutorial tweaks

Author: tschellenbach

build.gradle

@@ -1,25 +1,25 @@
-
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = "1.4.10"
     repositories {
         google()
         jcenter()
-        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
+        classpath "com.android.tools.build:gradle:4.1.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
-        mavenLocal()
         google()
         jcenter()
+        // add jitpack here:
         maven { url 'https://jitpack.io' }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

samplekotlin/build.gradle

@@ -37,11 +37,11 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.10"
-    implementation "com.github.getstream:stream-chat-android:4.3.1-beta-3"
+    implementation "com.github.getstream:stream-chat-android:4.4.0"
     implementation "io.coil-kt:coil:1.0.0"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.0-beta1"
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.3"
     implementation 'androidx.activity:activity-ktx:1.1.0'
 }

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

@@ -49,18 +49,18 @@ class ChannelActivity : AppCompatActivity(R.layout.activity_channel) {
             }
         }
 
-        // Step 4 - Handle navigate up state
+        // Step 4 - Let the message input know when we are editing a message
+        messageListView.setOnMessageEditHandler {
+            messageInputViewModel.editMessage.postValue(it)
+        }
+
+        // Step 5 - Handle navigate up state
         messageListViewModel.state.observe(this) { state ->
             if (state is NavigateUp) {
                 finish()
             }
         }
 
-        // Step 5 - Let the message input know when we are editing a message
-        messageListView.setOnMessageEditHandler {
-            messageInputViewModel.editMessage.postValue(it)
-        }
-
         // Step 6 - Handle back button behaviour correctly when you're in a thread
         channelHeaderView.onBackClick = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)

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

@@ -79,9 +79,7 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {
         typingHeader.text = nobodyTyping
 
         // Obtain a ChannelController
-        // TODO replace watchChannel with getChannelController
-        val channelController: ChannelController =
-            ChatDomain.instance().useCases.watchChannel(cid, 0).execute().data()
+        val channelController = ChatDomain.instance().useCases.getChannelController(cid).execute().data()
 
         // Observe typing users
         channelController.typing.observe(this) { users ->

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

@@ -28,7 +28,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             extraData["name"] = "Paranoid Android"
             extraData["image"] = "https://bit.ly/2TIt8NR"
         }
-        ChatClient.instance().setUser(
+        client.setUser(
             user = user,
             token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoic3VtbWVyLWJyb29rLTIifQ.CzyOx8kgrc61qVbzWvhV1WD3KPEo5ZFZH-326hIdKz0"
         )