Merge pull request #67 from GetStream/task/updateSDK

Update tutorial to latest SDK version

Author: skydoves

samplejava/build.gradle

@@ -30,11 +30,8 @@ android {
 
 dependencies {
     // Add new dependencies
-    implementation "io.getstream:stream-chat-android-ui-components:5.4.0"
+    implementation "io.getstream:stream-chat-android-ui-components:5.6.1"
     implementation "com.google.android.material:material:1.6.1"
-    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "io.coil-kt:coil:2.1.0"
-
-    // We use the ktx dependency for transforming StateFlow into LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
-}
+}

samplejava/src/main/java/com/example/chattutorial/ChannelActivity.java

@@ -50,7 +50,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // Step 1 - Create three separate ViewModels for the views so it's easy
         //          to customize them individually
-        MessageListViewModelFactory factory = new MessageListViewModelFactory(cid);
+        ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder()
+                .cid(cid)
+                .build();
         ViewModelProvider provider = new ViewModelProvider(this, factory);
         MessageListHeaderViewModel messageListHeaderViewModel = provider.get(MessageListHeaderViewModel.class);
         MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);

samplejava/src/main/java/com/example/chattutorial/ChannelActivity2.java

@@ -54,7 +54,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // Step 1 - Create three separate ViewModels for the views so it's easy
         //          to customize them individually
-        MessageListViewModelFactory factory = new MessageListViewModelFactory(cid);
+        ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder()
+                .cid(cid)
+                .build();
         ViewModelProvider provider = new ViewModelProvider(this, factory);
         MessageListHeaderViewModel messageListHeaderViewModel = provider.get(MessageListHeaderViewModel.class);
         MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);

samplejava/src/main/java/com/example/chattutorial/ChannelActivity3.java

@@ -8,7 +8,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.lifecycle.FlowLiveDataConversions;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModelProvider;
@@ -24,6 +23,7 @@
 import java.util.List;
 
 import io.getstream.chat.android.client.ChatClient;
+import io.getstream.chat.android.client.extensions.FlowExtensions;
 import io.getstream.chat.android.client.models.Channel;
 import io.getstream.chat.android.client.models.Message;
 import io.getstream.chat.android.client.models.TypingEvent;
@@ -36,9 +36,7 @@
 import io.getstream.chat.android.ui.message.list.header.viewmodel.MessageListHeaderViewModelBinding;
 import io.getstream.chat.android.ui.message.list.viewmodel.MessageListViewModelBinding;
 import io.getstream.chat.android.ui.message.list.viewmodel.factory.MessageListViewModelFactory;
-import kotlinx.coroutines.Dispatchers;
 import kotlinx.coroutines.flow.Flow;
-import kotlinx.coroutines.flow.FlowKt;
 
 public class ChannelActivity3 extends AppCompatActivity {
 
@@ -65,7 +63,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // Step 1 - Create three separate ViewModels for the views so it's easy
         //          to customize them individually
-        MessageListViewModelFactory factory = new MessageListViewModelFactory(cid);
+        ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder()
+                .cid(cid)
+                .build();
         ViewModelProvider provider = new ViewModelProvider(this, factory);
         MessageListHeaderViewModel messageListHeaderViewModel = provider.get(MessageListHeaderViewModel.class);
         MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);
@@ -126,8 +126,8 @@ public void handleOnBackPressed() {
         // Observe typing events and update typing header depending on its state.
         Flow<ChannelState> channelStateFlow = ChatClientExtensions.watchChannelAsState(ChatClient.instance(), cid, 30);
         LiveData<TypingEvent> typingEventLiveData = Transformations.switchMap(
-                FlowLiveDataConversions.asLiveData(channelStateFlow),
-                channelState -> FlowLiveDataConversions.asLiveData(channelState.getTyping())
+                FlowExtensions.asLiveData(channelStateFlow),
+                channelState -> FlowExtensions.asLiveData(channelState.getTyping())
         );
 
         typingEventLiveData.observe(this, typingEvent -> {

samplejava/src/main/java/com/example/chattutorial/ChannelActivity4.java

@@ -62,7 +62,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // Step 1 - Create three separate ViewModels for the views so it's easy
         //          to customize them individually
-        MessageListViewModelFactory factory = new MessageListViewModelFactory(cid);
+        ViewModelProvider.Factory factory = new MessageListViewModelFactory.Builder()
+                .cid(cid)
+                .build();
         ViewModelProvider provider = new ViewModelProvider(this, factory);
         MessageListHeaderViewModel messageListHeaderViewModel = provider.get(MessageListHeaderViewModel.class);
         MessageListViewModel messageListViewModel = provider.get(MessageListViewModel.class);

samplejava/src/main/java/com/example/chattutorial/MainActivity.java

@@ -68,10 +68,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 Filters.in("members", singletonList(user.getId()))
         );
 
-        ChannelListViewModelFactory factory = new ChannelListViewModelFactory(
-                filter,
-                ChannelListViewModel.DEFAULT_SORT
-        );
+        ViewModelProvider.Factory factory = new ChannelListViewModelFactory.Builder()
+                .filter(filter)
+                .sort(ChannelListViewModel.DEFAULT_SORT)
+                .build();
 
         ChannelListViewModel channelsViewModel =
                 new ViewModelProvider(this, factory).get(ChannelListViewModel.class);

samplekotlin/build.gradle

@@ -22,9 +22,9 @@ android {
 
 dependencies {
     // Add new dependencies
-    implementation "io.getstream:stream-chat-android-ui-components:5.4.0"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
+    implementation "io.getstream:stream-chat-android-ui-components:5.6.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
     implementation "com.google.android.material:material:1.6.1"
-    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "io.coil-kt:coil:2.1.0"
 }