Merge pull request #3 from GetStream/feature/update-to-4.22.0

zsmb13 · web-flow · commit aa9c313dc02c · 2021-11-29T17:03:28.000+01:00
Update SDK version to 4.22.0
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 30
+    compileSdk 31
 
     defaultConfig {
         applicationId "com.example.chattutorial"
         minSdk 21
-        targetSdk 30
+        targetSdk 31
         versionCode 1
         versionName "1.0"
 
@@ -38,7 +38,6 @@ android {
     }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion '1.5.10'
     }
     packagingOptions {
         resources {
@@ -48,7 +47,7 @@ android {
 }
 
 dependencies {
-    def stream_version = "4.18.0"
+    def stream_version = "4.22.0"
     implementation "io.getstream:stream-chat-android-compose:$stream_version-beta"
 
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
diff --git a/app/src/main/java/com/example/chattutorial/MainActivity.kt b/app/src/main/java/com/example/chattutorial/MainActivity.kt
@@ -16,13 +16,13 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        // Step 1 - Set up the client for API calls and the domain for offline storage
+        // 1 - Set up the client for API calls and the domain for offline storage
         val client = ChatClient.Builder("b67pax5b2wdq", applicationContext)
             .logLevel(ChatLogLevel.ALL) // Set to NOTHING in prod
             .build()
         ChatDomain.Builder(client, applicationContext).build()
 
-        // Step 2 - Authenticate and connect the user
+        // 2 - Authenticate and connect the user
         val user = User(
             id = "tutorial-droid",
             extraData = mutableMapOf(
@@ -35,7 +35,7 @@ class MainActivity : AppCompatActivity() {
             token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoidHV0b3JpYWwtZHJvaWQifQ.NhEr0hP9W9nwqV7ZkdShxvi02C5PR7SJE7Cs4y7kyqg"
         ).enqueue()
 
-        // Step 3 - Set up the Channels Screen UI
+        // 3 - Set up the Channels Screen UI
         setContent {
             ChatTheme {
                 ChannelsScreen(
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt
@@ -1,12 +1,12 @@
 package com.example.chattutorial
 
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
@@ -20,7 +20,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
-import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.compose.state.messages.Thread
 import io.getstream.chat.android.compose.ui.messages.attachments.AttachmentsPicker
 import io.getstream.chat.android.compose.ui.messages.composer.MessageComposer
@@ -33,20 +32,14 @@ import io.getstream.chat.android.compose.viewmodel.messages.AttachmentsPickerVie
 import io.getstream.chat.android.compose.viewmodel.messages.MessageComposerViewModel
 import io.getstream.chat.android.compose.viewmodel.messages.MessageListViewModel
 import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
-import io.getstream.chat.android.offline.ChatDomain
 
 class MessagesActivity3 : AppCompatActivity() {
 
     // Build the ViewModel factory
     private val factory by lazy {
         MessagesViewModelFactory(
-            this,
-            getSystemService(CLIPBOARD_SERVICE) as ClipboardManager,
-            ChatClient.instance(),
-            ChatDomain.instance(),
-            intent.getStringExtra(MessagesActivity3.KEY_CHANNEL_ID) ?: "",
-            enforceUniqueReactions = true,
-            messageLimit = 30
+            context = this,
+            channelId = intent.getStringExtra(KEY_CHANNEL_ID) ?: "",
         )
     }
 
@@ -94,11 +87,17 @@ class MessagesActivity3 : AppCompatActivity() {
             Scaffold(
                 modifier = Modifier.fillMaxSize(),
                 bottomBar = {
-                    MessageComposer(composerViewModel) // 3 - Add a composer
+                    MessageComposer( // 3 - Add a composer
+                        composerViewModel,
+                        onAttachmentsClick = {
+                            attachmentsPickerViewModel.changeAttachmentState(true)
+                        }
+                    )
                 }
             ) {
                 MessageList( // 4 - Build the MessageList and connect the actions
                     modifier = Modifier
+                        .background(ChatTheme.colors.appBackground)
                         .padding(it)
                         .fillMaxSize(),
                     viewModel = listViewModel,
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt
@@ -1,13 +1,20 @@
 package com.example.chattutorial
 
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.Scaffold
@@ -21,7 +28,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
-import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.compose.state.messages.Thread
 import io.getstream.chat.android.compose.ui.messages.attachments.AttachmentsPicker
 import io.getstream.chat.android.compose.ui.messages.composer.MessageComposer
@@ -35,20 +41,14 @@ import io.getstream.chat.android.compose.viewmodel.messages.AttachmentsPickerVie
 import io.getstream.chat.android.compose.viewmodel.messages.MessageComposerViewModel
 import io.getstream.chat.android.compose.viewmodel.messages.MessageListViewModel
 import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
-import io.getstream.chat.android.offline.ChatDomain
 
 class MessagesActivity4 : AppCompatActivity() {
 
     // Build the ViewModel factory
     private val factory by lazy {
         MessagesViewModelFactory(
-            this,
-            getSystemService(CLIPBOARD_SERVICE) as ClipboardManager,
-            ChatClient.instance(),
-            ChatDomain.instance(),
-            intent.getStringExtra(MessagesActivity4.KEY_CHANNEL_ID) ?: "",
-            enforceUniqueReactions = true,
-            messageLimit = 30
+            context = this,
+            channelId = intent.getStringExtra(KEY_CHANNEL_ID) ?: "",
         )
     }
 
@@ -101,6 +101,7 @@ class MessagesActivity4 : AppCompatActivity() {
             ) {
                 MessageList( // 4 - Build the MessageList and connect the actions
                     modifier = Modifier
+                        .background(ChatTheme.colors.appBackground)
                         .padding(it)
                         .fillMaxSize(),
                     viewModel = listViewModel,
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.0.3"
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21'
 
         // NOTE: Do not place your application dependencies here; they belong

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`mavenCentral()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath "com.android.tools.build:gradle:7.0.2"`
	`11`	`+ classpath "com.android.tools.build:gradle:7.0.3"`
`12`	`12`	`classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21'`
`13`	`13`
`14`	`14`	`// NOTE: Do not place your application dependencies here; they belong`