Adjust remote message show logic.

Author: Tans5

app/build.gradle

@@ -59,7 +59,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation "androidx.fragment:fragment-ktx:1.3.0"
+    implementation "androidx.fragment:fragment-ktx:1.3.2"
     implementation deps.view.swiperefresh
 
     implementation deps.rxJava.runtime

app/src/main/java/com/tans/tfiletransporter/ui/activity/filetransport/MessageFragment.kt

@@ -20,13 +20,8 @@ import net.yslibrary.android.keyboardvisibilityevent.KeyboardVisibilityEvent
 import net.yslibrary.android.keyboardvisibilityevent.KeyboardVisibilityEventListener
 import org.kodein.di.instance
 
-data class Message(
-        val isRemote: Boolean,
-        val timeMilli: Long,
-        val message: String
-)
 
-class MessageFragment : BaseFragment<MessageFragmentBinding, List<Message>>(
+class MessageFragment : BaseFragment<MessageFragmentBinding, List<FileTransportScopeData.Companion.Message>>(
     R.layout.message_fragment,
     emptyList()
 ) {
@@ -37,22 +32,16 @@ class MessageFragment : BaseFragment<MessageFragmentBinding, List<Message>>(
 
     override fun initViews(binding: MessageFragmentBinding) {
 
-        binding.messageRv.adapter = SimpleAdapterSpec<Message, MessageItemLayoutBinding>(
+        binding.messageRv.adapter = SimpleAdapterSpec<FileTransportScopeData.Companion.Message, MessageItemLayoutBinding>(
             layoutId = R.layout.message_item_layout,
             bindData = { _, data, lBinding -> lBinding.message = data },
             dataUpdater = bindState()
         ).toAdapter { if (it.isNotEmpty()) { binding.messageRv.scrollToPosition(it.size - 1) } }
 
-        fileTransportScopeData.remoteMessageEvent
-            .flatMapSingle { remoteMessage ->
-                updateState { oldState ->
-                    val message = Message(
-                        isRemote = true,
-                        timeMilli = System.currentTimeMillis(),
-                        message = remoteMessage
-                    )
-                    val newState = oldState + message
-                    newState
+        fileTransportScopeData.messagesEvent
+            .flatMapSingle { messages ->
+                updateState {
+                    messages
                 }
             }
             .bindLife()
@@ -68,13 +57,14 @@ class MessageFragment : BaseFragment<MessageFragmentBinding, List<Message>>(
                             newSendMessageShareWriterHandle(sendingMessage)
                         )
                     }
-                    updateState { oldState ->
-                        oldState + Message(
-                            isRemote = false,
-                            timeMilli = System.currentTimeMillis(),
-                            message = sendingMessage
-                        )
-                    }.await()
+
+                    val messages = fileTransportScopeData.messagesEvent.firstOrError().await()
+                    val newMessage = FileTransportScopeData.Companion.Message(
+                        isRemote = false,
+                        timeMilli = System.currentTimeMillis(),
+                        message = sendingMessage
+                    )
+                    fileTransportScopeData.messagesEvent.onNext(messages + newMessage)
                     withContext(Dispatchers.Main) {
                         binding.editText.text?.clear()
                         // dialog.cancel()

app/src/main/java/com/tans/tfiletransporter/ui/activity/filetransport/activity/FileTransportActivity.kt

@@ -31,7 +31,6 @@ import org.kodein.di.bind
 import org.kodein.di.instance
 import org.kodein.di.singleton
 import java.net.InetAddress
-import java.net.InetSocketAddress
 import java.util.*
 import kotlin.runCatching
 
@@ -116,7 +115,13 @@ class FileTransportActivity : BaseActivity<FileTransportActivityBinding, FileTra
 
                     sendMessageChain { _, inputStream, limit, _ ->
                         val message = inputStream.readString(limit)
-                        fileTransportScopeData.remoteMessageEvent.onNext(message)
+                        val newMessage = FileTransportScopeData.Companion.Message(
+                            isRemote = true,
+                            message = message,
+                            timeMilli = System.currentTimeMillis()
+                        )
+                        val messages: List<FileTransportScopeData.Companion.Message> = fileTransportScopeData.messagesEvent.firstOrError().await()
+                        fileTransportScopeData.messagesEvent.onNext(messages + newMessage)
                     }
                 }
             }

app/src/main/java/com/tans/tfiletransporter/ui/activity/filetransport/activity/FileTransportScopeData.kt

@@ -2,6 +2,7 @@ package com.tans.tfiletransporter.ui.activity.filetransport.activity
 
 import com.tans.tfiletransporter.net.filetransporter.FileTransporter
 import com.tans.tfiletransporter.net.model.ResponseFolderModel
+import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 
@@ -13,6 +14,15 @@ class FileTransportScopeData(
     // Floating Action Button in Activity clicks event, Activity To Event
     val floatBtnEvent: Subject<Unit> = PublishSubject.create<Unit>().toSerialized()
 
-    val remoteMessageEvent: Subject<String> = PublishSubject.create<String>().toSerialized()
+    val messagesEvent: Subject<List<Message>> = BehaviorSubject.createDefault<List<Message>>(emptyList()).toSerialized()
     val remoteFolderModelEvent: Subject<ResponseFolderModel> = PublishSubject.create<ResponseFolderModel>().toSerialized()
+
+    companion object {
+        data class Message(
+            val isRemote: Boolean,
+            val timeMilli: Long,
+            val message: String
+        )
+    }
+
 }