Migrate sample codes to v6

skydoves · skydoves · commit fc44ad7ccb5c · 2023-09-15T13:43:51.000+09:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,12 +4,13 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
+    namespace "com.example.chattutorial"
 
     defaultConfig {
         applicationId "com.example.chattutorial"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -26,11 +27,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
@@ -46,11 +47,15 @@ android {
 }
 
 dependencies {
-    implementation "io.getstream:stream-chat-android-compose:5.12.0"
+    implementation "io.getstream:stream-chat-android-compose:6.0.2"
+    implementation "io.getstream:stream-chat-android-offline:6.0.2"
 
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation "androidx.activity:activity-compose:1.5.1"
+    implementation(platform("androidx.compose:compose-bom:2023.08.00"))
+    implementation("androidx.activity:activity-compose:1.7.2")
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-tooling")
+    implementation("androidx.compose.runtime:runtime")
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.compose.material:material-icons-extended")
 }
diff --git a/app/src/main/java/com/example/chattutorial/MainActivity.kt b/app/src/main/java/com/example/chattutorial/MainActivity.kt
@@ -6,12 +6,12 @@ import androidx.activity.compose.setContent
 import androidx.compose.ui.res.stringResource
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.logger.ChatLogLevel
-import io.getstream.chat.android.client.models.User
 import io.getstream.chat.android.compose.ui.channels.ChannelsScreen
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
-import io.getstream.chat.android.offline.model.message.attachments.UploadAttachmentsNetworkType
-import io.getstream.chat.android.offline.plugin.configuration.Config
+import io.getstream.chat.android.models.User
 import io.getstream.chat.android.offline.plugin.factory.StreamOfflinePluginFactory
+import io.getstream.chat.android.state.plugin.config.StatePluginConfig
+import io.getstream.chat.android.state.plugin.factory.StreamStatePluginFactory
 
 class MainActivity : ComponentActivity() {
 
@@ -20,18 +20,19 @@ class MainActivity : ComponentActivity() {
 
         // 1 - Set up the OfflinePlugin for offline storage
         val offlinePluginFactory = StreamOfflinePluginFactory(
-            config = Config(
+            appContext = applicationContext,
+        )
+        val statePluginFactory = StreamStatePluginFactory(
+            config = StatePluginConfig(
                 backgroundSyncEnabled = true,
                 userPresence = true,
-                persistenceEnabled = true,
-                uploadAttachmentsNetworkType = UploadAttachmentsNetworkType.NOT_ROAMING,
             ),
-            appContext = applicationContext,
+            appContext = this,
         )
 
         // 2 - Set up the client for API calls and with the plugin for offline storage
         val client = ChatClient.Builder("uun7ywwamhs9", applicationContext)
-            .withPlugin(offlinePluginFactory)
+            .withPlugins(offlinePluginFactory, statePluginFactory)
             .logLevel(ChatLogLevel.ALL) // Set to NOTHING in prod
             .build()
 
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import io.getstream.chat.android.compose.ui.messages.MessagesScreen
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
 
 class MessagesActivity : ComponentActivity() {
 
@@ -24,8 +25,11 @@ class MessagesActivity : ComponentActivity() {
         setContent {
             ChatTheme {
                 MessagesScreen(
-                    channelId = channelId,
-                    messageLimit = 30,
+                    viewModelFactory = MessagesViewModelFactory(
+                        context = this,
+                        channelId = channelId,
+                        messageLimit = 30
+                    ),
                     onBackPressed = { finish() }
                 )
             }
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity2.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity2.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp
 import io.getstream.chat.android.compose.ui.messages.MessagesScreen
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.theme.StreamShapes
+import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
 
 class MessagesActivity2 : ComponentActivity() {
 
@@ -38,8 +39,11 @@ class MessagesActivity2 : ComponentActivity() {
                     )
             ) {
                 MessagesScreen(
-                    channelId = channelId,
-                    messageLimit = 30,
+                    viewModelFactory = MessagesViewModelFactory(
+                        context = this,
+                        channelId = channelId,
+                        messageLimit = 30
+                    ),
                     onBackPressed = { finish() }
                 )
             }
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity3.kt
@@ -21,9 +21,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.common.state.MessageMode.MessageThread
-import io.getstream.chat.android.compose.state.messages.SelectedMessageOptionsState
-import io.getstream.chat.android.compose.state.messages.SelectedMessageReactionsState
 import io.getstream.chat.android.compose.ui.components.messageoptions.defaultMessageOptionsState
 import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedMessageMenu
 import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedReactionsMenu
@@ -36,6 +33,9 @@ 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.ui.common.state.messages.MessageMode
+import io.getstream.chat.android.ui.common.state.messages.list.SelectedMessageOptionsState
+import io.getstream.chat.android.ui.common.state.messages.list.SelectedMessageReactionsState
 
 class MessagesActivity3 : ComponentActivity() {
 
@@ -106,7 +106,7 @@ class MessagesActivity3 : ComponentActivity() {
                         .fillMaxSize(),
                     viewModel = listViewModel,
                     onThreadClick = { message ->
-                        composerViewModel.setMessageMode(MessageThread(message))
+                        composerViewModel.setMessageMode(MessageMode.MessageThread(message))
                         listViewModel.openMessageThread(message)
                     }
                 )
diff --git a/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt b/app/src/main/java/com/example/chattutorial/MessagesActivity4.kt
@@ -29,9 +29,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.common.state.MessageMode.MessageThread
-import io.getstream.chat.android.compose.state.messages.SelectedMessageOptionsState
-import io.getstream.chat.android.compose.state.messages.SelectedMessageReactionsState
 import io.getstream.chat.android.compose.ui.components.composer.MessageInput
 import io.getstream.chat.android.compose.ui.components.messageoptions.defaultMessageOptionsState
 import io.getstream.chat.android.compose.ui.components.selectedmessage.SelectedMessageMenu
@@ -45,6 +42,9 @@ 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.ui.common.state.messages.MessageMode
+import io.getstream.chat.android.ui.common.state.messages.list.SelectedMessageOptionsState
+import io.getstream.chat.android.ui.common.state.messages.list.SelectedMessageReactionsState
 
 class MessagesActivity4 : ComponentActivity() {
 
@@ -110,7 +110,7 @@ class MessagesActivity4 : ComponentActivity() {
                         .fillMaxSize(),
                     viewModel = listViewModel,
                     onThreadClick = { message ->
-                        composerViewModel.setMessageMode(MessageThread(message))
+                        composerViewModel.setMessageMode(MessageMode.MessageThread(message))
                         listViewModel.openMessageThread(message)
                     }
                 )
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
     ext {
-        compose_version = '1.3.0'
-        compose_compiler_version = '1.4.0'
+        compose_version = '1.5.1'
+        compose_compiler_version = '1.5.3'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
+        classpath "com.android.tools.build:gradle:8.1.1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Sep 15 12:53:53 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp`
`11`	`11`	`import io.getstream.chat.android.compose.ui.messages.MessagesScreen`
`12`	`12`	`import io.getstream.chat.android.compose.ui.theme.ChatTheme`
`13`	`13`	`import io.getstream.chat.android.compose.ui.theme.StreamShapes`
	`14`	`+import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory`
`14`	`15`
`15`	`16`	`class MessagesActivity2 : ComponentActivity() {`
`16`	`17`
`@@ -38,8 +39,11 @@ class MessagesActivity2 : ComponentActivity() {`
`38`	`39`	`)`
`39`	`40`	`) {`
`40`	`41`	`MessagesScreen(`
`41`		`- channelId = channelId,`
`42`		`- messageLimit = 30,`
	`42`	`+ viewModelFactory = MessagesViewModelFactory(`
	`43`	`+ context = this,`
	`44`	`+ channelId = channelId,`
	`45`	`+ messageLimit = 30`
	`46`	`+ ),`
`43`	`47`	`onBackPressed = { finish() }`
`44`	`48`	`)`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- compose_version = '1.3.0'`
`4`		`- compose_compiler_version = '1.4.0'`
	`3`	`+ compose_version = '1.5.1'`
	`4`	`+ compose_compiler_version = '1.5.3'`
`5`	`5`	`}`
`6`	`6`	`repositories {`
`7`	`7`	`google()`
`8`	`8`	`mavenCentral()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath "com.android.tools.build:gradle:7.2.2"`
`12`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"`
	`11`	`+ classpath "com.android.tools.build:gradle:8.1.1"`
	`12`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`