Merge branch 'v6' into feature/new_event_parsing

Author: VelikovPetar

.github/workflows/pr-checks.yml

@@ -8,15 +8,15 @@ concurrency:
 
 jobs:
   base-android-ci:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@v0.10.0
     secrets: inherit
 
   detekt:
     name: Detekt
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4.2.2
-      - uses: GetStream/stream-build-conventions-android/.github/actions/setup-gradle@v0.9.0
+      - uses: GetStream/stream-build-conventions-android/.github/actions/setup-gradle@v0.10.0
       - name: Detekt
         run: ./gradlew detekt
 

.github/workflows/pr-cleanup.yaml

@@ -12,5 +12,5 @@ permissions:
 
 jobs:
   pr-clean-stale:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.10.0
     secrets: inherit

.github/workflows/pr-quality.yml

@@ -15,5 +15,5 @@ concurrency:
 
 jobs:
   pr-checklist:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.10.0
     secrets: inherit

.github/workflows/publish-new-version.yml

@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     needs: pre_release_check
-    uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v0.10.0
     with:
       bump: ${{ inputs.bump }}
     secrets:

.github/workflows/sdk-size-checks.yml

@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   compare-sdk-sizes:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v0.10.0
     with:
       modules: "stream-chat-android-client stream-chat-android-offline stream-chat-android-ui-components stream-chat-android-compose"
       metrics-project: "stream-chat-android-metrics"

.github/workflows/sdk-size-updates.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   update-sdk-sizes:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@v0.9.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@v0.10.0
     with:
       modules: "stream-chat-android-client stream-chat-android-offline stream-chat-android-ui-components stream-chat-android-compose"
       metrics-project: "stream-chat-android-metrics"

gradle.properties

@@ -10,4 +10,4 @@ android.enableR8.fullMode=true
 android.suppressUnsupportedCompileSdk=34
 
 # Project version
-version=6.37.2
+version=6.37.3

gradle/libs.versions.toml

@@ -78,7 +78,7 @@ room = "2.6.1"
 shimmer = "0.5.0"
 shimmerCompose = "1.3.1"
 shot = "6.1.0"
-streamConventions = "0.8.0"
+streamConventions = "0.10.0"
 streamLog = "1.3.2"
 streamPush = "1.3.1"
 streamResult = "1.3.2"

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/messages/MessagesViewModelFactory.kt

@@ -32,6 +32,9 @@ import io.getstream.chat.android.core.internal.coroutines.DispatcherProvider
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.state.extensions.watchChannelAsState
 import io.getstream.chat.android.ui.common.feature.messages.composer.MessageComposerController
+import io.getstream.chat.android.ui.common.feature.messages.composer.internal.ComposerStateSaver
+import io.getstream.chat.android.ui.common.feature.messages.composer.internal.NoOpComposerStateSaver
+import io.getstream.chat.android.ui.common.feature.messages.composer.internal.SavedStateComposerStateSaver
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.DefaultUserLookupHandler
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.UserLookupHandler
 import io.getstream.chat.android.ui.common.feature.messages.list.DateSeparatorHandler
@@ -123,21 +126,7 @@ public class MessagesViewModelFactory(
      */
     private val factories: Map<Class<*>, () -> ViewModel> = mapOf(
         MessageComposerViewModel::class.java to {
-            MessageComposerViewModel(
-                MessageComposerController(
-                    chatClient = chatClient,
-                    channelState = channelStateFlow,
-                    mediaRecorder = mediaRecorder,
-                    userLookupHandler = userLookupHandler,
-                    fileToUri = fileToUriConverter,
-                    channelCid = channelId,
-                    config = MessageComposerController.Config(
-                        maxAttachmentCount = maxAttachmentCount,
-                        isLinkPreviewEnabled = isComposerLinkPreviewEnabled,
-                        isDraftMessageEnabled = isComposerDraftMessageEnabled,
-                    ),
-                ),
-            )
+            createMessageComposerViewModel(NoOpComposerStateSaver)
         },
         MessageListViewModel::class.java to {
             MessageListViewModel(
@@ -190,6 +179,11 @@ public class MessagesViewModelFactory(
      * that do not require a [SavedStateHandle].
      */
     override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
+        if (modelClass == MessageComposerViewModel::class.java) {
+            val savedStateHandle = extras.createSavedStateHandle()
+            @Suppress("UNCHECKED_CAST")
+            return createMessageComposerViewModel(SavedStateComposerStateSaver(savedStateHandle)) as T
+        }
         if (modelClass == AttachmentsPickerViewModel::class.java) {
             val savedStateHandle = extras.createSavedStateHandle()
             @Suppress("UNCHECKED_CAST")
@@ -201,4 +195,23 @@ public class MessagesViewModelFactory(
         }
         return create(modelClass)
     }
+
+    private fun createMessageComposerViewModel(stateSaver: ComposerStateSaver): MessageComposerViewModel {
+        return MessageComposerViewModel(
+            MessageComposerController(
+                chatClient = chatClient,
+                channelState = channelStateFlow,
+                mediaRecorder = mediaRecorder,
+                userLookupHandler = userLookupHandler,
+                fileToUri = fileToUriConverter,
+                channelCid = channelId,
+                config = MessageComposerController.Config(
+                    maxAttachmentCount = maxAttachmentCount,
+                    isLinkPreviewEnabled = isComposerLinkPreviewEnabled,
+                    isDraftMessageEnabled = isComposerDraftMessageEnabled,
+                ),
+                stateSaver = stateSaver,
+            ),
+        )
+    }
 }

stream-chat-android-compose/src/test/kotlin/io/getstream/chat/android/compose/viewmodel/messages/MessageComposerViewModelTest.kt

@@ -41,6 +41,7 @@ import io.getstream.chat.android.state.plugin.state.global.GlobalState
 import io.getstream.chat.android.test.TestCoroutineExtension
 import io.getstream.chat.android.test.asCall
 import io.getstream.chat.android.ui.common.feature.messages.composer.MessageComposerController
+import io.getstream.chat.android.ui.common.feature.messages.composer.internal.NoOpComposerStateSaver
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.DefaultUserLookupHandler
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.Mention
 import io.getstream.chat.android.ui.common.feature.messages.composer.mention.MentionType
@@ -475,6 +476,7 @@ internal class MessageComposerViewModelTest {
                     ),
                     channelState = MutableStateFlow(channelState),
                     globalState = MutableStateFlow(globalState),
+                    stateSaver = NoOpComposerStateSaver,
                 ),
             )
         }