Change order when setting active thread

adasiewiczr · adasiewiczr · commit e20ddab4fc96 · 2021-02-17T14:01:28.000+01:00
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity.kt
@@ -52,10 +52,10 @@ class ChannelActivity : AppCompatActivity() {
         messageListViewModel.mode.observe(this) { mode ->
             when (mode) {
                 is Thread -> {
-                    messageInputViewModel.setActiveThread(mode.parentMessage)
                     messageListHeaderViewModel.setActiveThread(mode.parentMessage)
+                    messageInputViewModel.setActiveThread(mode.parentMessage)
                 }
-                is Normal -> {
+                Normal -> {
                     messageListHeaderViewModel.resetThread()
                     messageInputViewModel.resetThread()
                 }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity2.kt
@@ -53,10 +53,10 @@ class ChannelActivity2 : AppCompatActivity() {
         messageListViewModel.mode.observe(this) { mode ->
             when (mode) {
                 is Thread -> {
-                    messageInputViewModel.setActiveThread(mode.parentMessage)
                     messageListHeaderViewModel.setActiveThread(mode.parentMessage)
+                    messageInputViewModel.setActiveThread(mode.parentMessage)
                 }
-                is Normal -> {
+                Normal -> {
                     messageListHeaderViewModel.resetThread()
                     messageInputViewModel.resetThread()
                 }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity3.kt
@@ -55,10 +55,10 @@ class ChannelActivity3 : AppCompatActivity() {
         messageListViewModel.mode.observe(this) { mode ->
             when (mode) {
                 is Thread -> {
-                    messageInputViewModel.setActiveThread(mode.parentMessage)
                     messageListHeaderViewModel.setActiveThread(mode.parentMessage)
+                    messageInputViewModel.setActiveThread(mode.parentMessage)
                 }
-                is Normal -> {
+                Normal -> {
                     messageListHeaderViewModel.resetThread()
                     messageInputViewModel.resetThread()
                 }
diff --git a/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt b/samplekotlin/src/main/java/com/example/chattutorial/ChannelActivity4.kt
@@ -58,10 +58,10 @@ class ChannelActivity4 : AppCompatActivity() {
         messageListViewModel.mode.observe(this) { mode ->
             when (mode) {
                 is Thread -> {
-                    messageInputViewModel.setActiveThread(mode.parentMessage)
                     messageListHeaderViewModel.setActiveThread(mode.parentMessage)
+                    messageInputViewModel.setActiveThread(mode.parentMessage)
                 }
-                is Normal -> {
+                Normal -> {
                     messageListHeaderViewModel.resetThread()
                     messageInputViewModel.resetThread()
                 }

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ class ChannelActivity : AppCompatActivity() {`
`52`	`52`	`messageListViewModel.mode.observe(this) { mode ->`
`53`	`53`	`when (mode) {`
`54`	`54`	`is Thread -> {`
`55`		`- messageInputViewModel.setActiveThread(mode.parentMessage)`
`56`	`55`	`messageListHeaderViewModel.setActiveThread(mode.parentMessage)`
	`56`	`+ messageInputViewModel.setActiveThread(mode.parentMessage)`
`57`	`57`	`}`
`58`		`- is Normal -> {`
	`58`	`+ Normal -> {`
`59`	`59`	`messageListHeaderViewModel.resetThread()`
`60`	`60`	`messageInputViewModel.resetThread()`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ class ChannelActivity2 : AppCompatActivity() {`
`53`	`53`	`messageListViewModel.mode.observe(this) { mode ->`
`54`	`54`	`when (mode) {`
`55`	`55`	`is Thread -> {`
`56`		`- messageInputViewModel.setActiveThread(mode.parentMessage)`
`57`	`56`	`messageListHeaderViewModel.setActiveThread(mode.parentMessage)`
	`57`	`+ messageInputViewModel.setActiveThread(mode.parentMessage)`
`58`	`58`	`}`
`59`		`- is Normal -> {`
	`59`	`+ Normal -> {`
`60`	`60`	`messageListHeaderViewModel.resetThread()`
`61`	`61`	`messageInputViewModel.resetThread()`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ class ChannelActivity3 : AppCompatActivity() {`
`55`	`55`	`messageListViewModel.mode.observe(this) { mode ->`
`56`	`56`	`when (mode) {`
`57`	`57`	`is Thread -> {`
`58`		`- messageInputViewModel.setActiveThread(mode.parentMessage)`
`59`	`58`	`messageListHeaderViewModel.setActiveThread(mode.parentMessage)`
	`59`	`+ messageInputViewModel.setActiveThread(mode.parentMessage)`
`60`	`60`	`}`
`61`		`- is Normal -> {`
	`61`	`+ Normal -> {`
`62`	`62`	`messageListHeaderViewModel.resetThread()`
`63`	`63`	`messageInputViewModel.resetThread()`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ class ChannelActivity4 : AppCompatActivity() {`
`58`	`58`	`messageListViewModel.mode.observe(this) { mode ->`
`59`	`59`	`when (mode) {`
`60`	`60`	`is Thread -> {`
`61`		`- messageInputViewModel.setActiveThread(mode.parentMessage)`
`62`	`61`	`messageListHeaderViewModel.setActiveThread(mode.parentMessage)`
	`62`	`+ messageInputViewModel.setActiveThread(mode.parentMessage)`
`63`	`63`	`}`
`64`		`- is Normal -> {`
	`64`	`+ Normal -> {`
`65`	`65`	`messageListHeaderViewModel.resetThread()`
`66`	`66`	`messageInputViewModel.resetThread()`
`67`	`67`	`}`