Merge pull request #21 from GetStream/fix/issues

tschellenbach · web-flow · commit 09da9960f719 · 2020-10-26T16:58:57.000-06:00
Fix back button handling
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt
@@ -44,12 +44,21 @@ class ChannelActivity : AppCompatActivity(R.layout.activity_channel) {
                 is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()
             }
         }
-        // step 4 - let the message input know when we are editing a message
+
+        // step 4 - handle navigate up state
+        messageListViewModel.state.observe(this) {
+            when (it) {
+                is MessageListViewModel.State.NavigateUp -> finish()
+                else -> Unit
+            }
+        }
+
+        // step 5 - let the message input know when we are editing a message
         messageListView.setOnMessageEditHandler {
             messageInputViewModel.editMessage.postValue(it)
         }
 
-        // step 5 - handle back button behaviour correctly when you're in a thread
+        // step 6 - handle back button behaviour correctly when you're in a thread
         val backButtonHandler = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)
         }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt
@@ -45,12 +45,21 @@ class ChannelActivity2 : AppCompatActivity(R.layout.activity_channel_2) {
                 is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()
             }
         }
-        // step 4 - let the message input know when we are editing a message
+
+        // step 4 - handle navigate up state
+        messageListViewModel.state.observe(this) {
+            when (it) {
+                is MessageListViewModel.State.NavigateUp -> finish()
+                else -> Unit
+            }
+        }
+
+        // step 5 - let the message input know when we are editing a message
         messageListView.setOnMessageEditHandler {
             messageInputViewModel.editMessage.postValue(it)
         }
 
-        // step 5 - handle back button behaviour correctly when you're in a thread
+        // step 6 - handle back button behaviour correctly when you're in a thread
         val backButtonHandler = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)
         }
@@ -70,7 +79,7 @@ class ChannelActivity2 : AppCompatActivity(R.layout.activity_channel_2) {
         private const val CID_KEY = "key:cid"
 
         fun newIntent(context: Context, channel: Channel) =
-            Intent(context, ChannelActivity::class.java).apply {
+            Intent(context, ChannelActivity2::class.java).apply {
                 putExtra(CID_KEY, channel.cid)
             }
     }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt
@@ -49,7 +49,16 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {
                 is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()
             }
         }
-        // step 4 - let the message input know when we are editing a message
+
+        // step 4 - handle navigate up state
+        messageListViewModel.state.observe(this) {
+            when (it) {
+                is MessageListViewModel.State.NavigateUp -> finish()
+                else -> Unit
+            }
+        }
+
+        // step 5 - let the message input know when we are editing a message
         messageListView.setOnMessageEditHandler {
             messageInputViewModel.editMessage.postValue(it)
         }
@@ -65,7 +74,7 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {
         }
         channelController.typing.observe(this, typingObserver)
 
-        // step 5 - handle back button behaviour correctly when you're in a thread
+        // step 6 - handle back button behaviour correctly when you're in a thread
         val backButtonHandler = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)
         }
@@ -85,7 +94,7 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {
         private const val CID_KEY = "key:cid"
 
         fun newIntent(context: Context, channel: Channel) =
-            Intent(context, ChannelActivity::class.java).apply {
+            Intent(context, ChannelActivity3::class.java).apply {
                 putExtra(CID_KEY, channel.cid)
             }
     }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt
@@ -51,7 +51,16 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {
                 is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()
             }
         }
-        // step 4 - let the message input know when we are editing a message
+
+        // step 4 - handle navigate up state
+        messageListViewModel.state.observe(this) {
+            when (it) {
+                is MessageListViewModel.State.NavigateUp -> finish()
+                else -> Unit
+            }
+        }
+
+        // step 5 - let the message input know when we are editing a message
         messageListView.setOnMessageEditHandler {
             messageInputViewModel.editMessage.postValue(it)
         }
@@ -85,7 +94,7 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {
         }
         currentlyTyping.observe(this, typingObserver)
 
-        // step 5 - handle back button behaviour correctly when you're in a thread
+        // step 6 - handle back button behaviour correctly when you're in a thread
         val backButtonHandler = {
             messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)
         }
@@ -105,7 +114,7 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {
         private const val CID_KEY = "key:cid"
 
         fun newIntent(context: Context, channel: Channel) =
-            Intent(context, ChannelActivity::class.java).apply {
+            Intent(context, ChannelActivity4::class.java).apply {
                 putExtra(CID_KEY, channel.cid)
             }
     }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt b/samplekotlin/src/main/java/com/example/chattutorial/MainActivity.kt
@@ -9,7 +9,6 @@ import com.getstream.sdk.chat.viewmodel.channels.ChannelsViewModelImpl
 import com.getstream.sdk.chat.viewmodel.channels.bindView
 import com.getstream.sdk.chat.viewmodel.factory.ChannelsViewModelFactory
 import io.getstream.chat.android.client.logger.ChatLogLevel
-import io.getstream.chat.android.client.logger.ChatLogger
 import io.getstream.chat.android.client.models.Filters
 import io.getstream.chat.android.client.models.User
 import kotlinx.android.synthetic.main.activity_main.*
@@ -19,8 +18,9 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
         super.onCreate(savedInstanceState)
 
         // step 1 - setup the Chat Client
-        Chat.Builder(apiKey = "b67pax5b2wdq", context = applicationContext).build()
-        // TODO: set log level to all
+        Chat.Builder(apiKey = "b67pax5b2wdq", context = applicationContext)
+            .apply { chatLogLevel = ChatLogLevel.ALL }
+            .build()
 
         val user = User("summer-brook-2").apply {
             extraData["name"] = "Paranoid Android"
@@ -38,13 +38,14 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             Filters.`in`("members", listOf(user.id))
         )
         val viewModelFactory = ChannelsViewModelFactory(filter, ChannelsViewModel.DEFAULT_SORT)
-        val viewModel = ViewModelProvider(this, viewModelFactory).get(ChannelsViewModelImpl::class.java)
+        val viewModel =
+            ViewModelProvider(this, viewModelFactory).get(ChannelsViewModelImpl::class.java)
 
         // step 4 -  connect the ChannelsViewModel to the channelsView, loose coupling make it easy to customize
         viewModel.bindView(channelsView, this)
         channelsView.setOnChannelClickListener { channel ->
             // open the channel activity
-            startActivity(ChannelActivity3.newIntent(this, channel))
+            startActivity(ChannelActivity4.newIntent(this, channel))
         }
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 include ':samplejava', ':samplekotlin'
-rootProject.name='doc-sample-android-chat-client-kotlin'
+rootProject.name='android-chat-tutorial'
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,21 @@ class ChannelActivity : AppCompatActivity(R.layout.activity_channel) {`
`44`	`44`	`is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`- // step 4 - let the message input know when we are editing a message`
	`47`	`+`
	`48`	`+ // step 4 - handle navigate up state`
	`49`	`+ messageListViewModel.state.observe(this) {`
	`50`	`+ when (it) {`
	`51`	`+ is MessageListViewModel.State.NavigateUp -> finish()`
	`52`	`+ else -> Unit`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ // step 5 - let the message input know when we are editing a message`
`48`	`57`	`messageListView.setOnMessageEditHandler {`
`49`	`58`	`messageInputViewModel.editMessage.postValue(it)`
`50`	`59`	`}`
`51`	`60`
`52`		`- // step 5 - handle back button behaviour correctly when you're in a thread`
	`61`	`+ // step 6 - handle back button behaviour correctly when you're in a thread`
`53`	`62`	`val backButtonHandler = {`
`54`	`63`	`messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)`
`55`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,21 @@ class ChannelActivity2 : AppCompatActivity(R.layout.activity_channel_2) {`
`45`	`45`	`is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`- // step 4 - let the message input know when we are editing a message`
	`48`	`+`
	`49`	`+ // step 4 - handle navigate up state`
	`50`	`+ messageListViewModel.state.observe(this) {`
	`51`	`+ when (it) {`
	`52`	`+ is MessageListViewModel.State.NavigateUp -> finish()`
	`53`	`+ else -> Unit`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ // step 5 - let the message input know when we are editing a message`
`49`	`58`	`messageListView.setOnMessageEditHandler {`
`50`	`59`	`messageInputViewModel.editMessage.postValue(it)`
`51`	`60`	`}`
`52`	`61`
`53`		`- // step 5 - handle back button behaviour correctly when you're in a thread`
	`62`	`+ // step 6 - handle back button behaviour correctly when you're in a thread`
`54`	`63`	`val backButtonHandler = {`
`55`	`64`	`messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)`
`56`	`65`	`}`
`@@ -70,7 +79,7 @@ class ChannelActivity2 : AppCompatActivity(R.layout.activity_channel_2) {`
`70`	`79`	`private const val CID_KEY = "key:cid"`
`71`	`80`
`72`	`81`	`fun newIntent(context: Context, channel: Channel) =`
`73`		`- Intent(context, ChannelActivity::class.java).apply {`
	`82`	`+ Intent(context, ChannelActivity2::class.java).apply {`
`74`	`83`	`putExtra(CID_KEY, channel.cid)`
`75`	`84`	`}`
`76`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,16 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {`
`49`	`49`	`is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- // step 4 - let the message input know when we are editing a message`
	`52`	`+`
	`53`	`+ // step 4 - handle navigate up state`
	`54`	`+ messageListViewModel.state.observe(this) {`
	`55`	`+ when (it) {`
	`56`	`+ is MessageListViewModel.State.NavigateUp -> finish()`
	`57`	`+ else -> Unit`
	`58`	`+ }`
	`59`	`+ }`
	`60`	`+`
	`61`	`+ // step 5 - let the message input know when we are editing a message`
`53`	`62`	`messageListView.setOnMessageEditHandler {`
`54`	`63`	`messageInputViewModel.editMessage.postValue(it)`
`55`	`64`	`}`
`@@ -65,7 +74,7 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {`
`65`	`74`	`}`
`66`	`75`	`channelController.typing.observe(this, typingObserver)`
`67`	`76`
`68`		`- // step 5 - handle back button behaviour correctly when you're in a thread`
	`77`	`+ // step 6 - handle back button behaviour correctly when you're in a thread`
`69`	`78`	`val backButtonHandler = {`
`70`	`79`	`messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)`
`71`	`80`	`}`
`@@ -85,7 +94,7 @@ class ChannelActivity3 : AppCompatActivity(R.layout.activity_channel_3) {`
`85`	`94`	`private const val CID_KEY = "key:cid"`
`86`	`95`
`87`	`96`	`fun newIntent(context: Context, channel: Channel) =`
`88`		`- Intent(context, ChannelActivity::class.java).apply {`
	`97`	`+ Intent(context, ChannelActivity3::class.java).apply {`
`89`	`98`	`putExtra(CID_KEY, channel.cid)`
`90`	`99`	`}`
`91`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,16 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {`
`51`	`51`	`is MessageListViewModel.Mode.Normal -> messageInputViewModel.resetThread()`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- // step 4 - let the message input know when we are editing a message`
	`54`	`+`
	`55`	`+ // step 4 - handle navigate up state`
	`56`	`+ messageListViewModel.state.observe(this) {`
	`57`	`+ when (it) {`
	`58`	`+ is MessageListViewModel.State.NavigateUp -> finish()`
	`59`	`+ else -> Unit`
	`60`	`+ }`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ // step 5 - let the message input know when we are editing a message`
`55`	`64`	`messageListView.setOnMessageEditHandler {`
`56`	`65`	`messageInputViewModel.editMessage.postValue(it)`
`57`	`66`	`}`
`@@ -85,7 +94,7 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {`
`85`	`94`	`}`
`86`	`95`	`currentlyTyping.observe(this, typingObserver)`
`87`	`96`
`88`		`- // step 5 - handle back button behaviour correctly when you're in a thread`
	`97`	`+ // step 6 - handle back button behaviour correctly when you're in a thread`
`89`	`98`	`val backButtonHandler = {`
`90`	`99`	`messageListViewModel.onEvent(MessageListViewModel.Event.BackButtonPressed)`
`91`	`100`	`}`
`@@ -105,7 +114,7 @@ class ChannelActivity4 : AppCompatActivity(R.layout.activity_channel_4) {`
`105`	`114`	`private const val CID_KEY = "key:cid"`
`106`	`115`
`107`	`116`	`fun newIntent(context: Context, channel: Channel) =`
`108`		`- Intent(context, ChannelActivity::class.java).apply {`
	`117`	`+ Intent(context, ChannelActivity4::class.java).apply {`
`109`	`118`	`putExtra(CID_KEY, channel.cid)`
`110`	`119`	`}`
`111`	`120`	`}`