MBL-772: MessagesThreadViewModel to RXJava2 (#1974)

kickstarter · Mar 12, 2024 · c169558 · c169558
1 parent 1fb13d5
commit c169558
Show file tree

Hide file tree

Showing 4 changed files with 280 additions and 186 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/activities/HelpSettingsActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/HelpSettingsActivity.kt
@@ -9,28 +9,31 @@ import androidx.appcompat.app.AppCompatActivity
 import com.kickstarter.R
 import com.kickstarter.databinding.ActivityHelpSettingsBinding
 import com.kickstarter.libs.Build
-import com.kickstarter.libs.CurrentUserType
+import com.kickstarter.libs.CurrentUserTypeV2
 import com.kickstarter.libs.Environment
 import com.kickstarter.libs.utils.UrlUtils
 import com.kickstarter.libs.utils.UrlUtils.baseCustomTabsIntent
+import com.kickstarter.libs.utils.extensions.addToDisposable
 import com.kickstarter.libs.utils.extensions.getEnvironment
 import com.kickstarter.models.User
 import com.kickstarter.models.chrome.ChromeTabsHelperActivity
 import com.kickstarter.ui.extensions.startDisclaimerChromeTab
-import rx.android.schedulers.AndroidSchedulers
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
 
 class HelpSettingsActivity : AppCompatActivity() {
 
     private var environment: Environment? = null
     private lateinit var build: Build
-    private lateinit var currentUser: CurrentUserType
+    private lateinit var currentUser: CurrentUserTypeV2
 
     private val mailto = R.string.mailto
     private val supportEmail = R.string.support_email_to_android
     private val supportEmailBody = R.string.support_email_body
     private val supportEmailSubject = R.string.support_email_subject
 
     private lateinit var binding: ActivityHelpSettingsBinding
+    private val disposables = CompositeDisposable()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,13 +43,16 @@ class HelpSettingsActivity : AppCompatActivity() {
 
         environment = this.getEnvironment()
         this.build = requireNotNull(environment?.build())
-        this.currentUser = requireNotNull(environment?.currentUser())
+        this.currentUser = requireNotNull(environment?.currentUserV2())
 
         binding.contact.setOnClickListener {
             this.currentUser.observable()
+                .filter { it.isPresent() }
                 .take(1)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::composeContactEmail)
+                .subscribe {
+                    this.composeContactEmail(it.getValue())
+                }.addToDisposable(disposables)
         }
 
         binding.accessibilityStatement.setOnClickListener {

diff --git a/app/src/main/java/com/kickstarter/ui/activities/MessageThreadsActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/MessageThreadsActivity.kt
@@ -2,34 +2,45 @@ package com.kickstarter.ui.activities
 
 import android.graphics.Typeface
 import android.os.Bundle
+import androidx.activity.addCallback
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.kickstarter.R
 import com.kickstarter.databinding.MessageThreadsLayoutBinding
-import com.kickstarter.libs.BaseActivity
 import com.kickstarter.libs.KSString
-import com.kickstarter.libs.RecyclerViewPaginator
-import com.kickstarter.libs.SwipeRefresher
-import com.kickstarter.libs.qualifiers.RequiresActivityViewModel
+import com.kickstarter.libs.recyclerviewpagination.RecyclerViewPaginatorV2
 import com.kickstarter.libs.rx.transformers.Transformers
 import com.kickstarter.libs.utils.NumberUtils
 import com.kickstarter.libs.utils.ToolbarUtils.fadeToolbarTitleOnExpand
-import com.kickstarter.libs.utils.TransitionUtils
 import com.kickstarter.libs.utils.ViewUtils
+import com.kickstarter.libs.utils.extensions.addToDisposable
+import com.kickstarter.libs.utils.extensions.getEnvironment
 import com.kickstarter.libs.utils.extensions.wrapInParentheses
 import com.kickstarter.models.MessageThread
 import com.kickstarter.ui.adapters.MessageThreadsAdapter
 import com.kickstarter.ui.data.Mailbox
-import com.kickstarter.viewmodels.MessageThreadsViewModel
+import com.kickstarter.ui.extensions.finishWithAnimation
+import com.kickstarter.viewmodels.MessageThreadsViewModel.Factory
+import com.kickstarter.viewmodels.MessageThreadsViewModel.MessageThreadsViewModel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
 
-@RequiresActivityViewModel(MessageThreadsViewModel.ViewModel::class)
-class MessageThreadsActivity : BaseActivity<MessageThreadsViewModel.ViewModel>() {
+class MessageThreadsActivity : AppCompatActivity() {
     private lateinit var adapter: MessageThreadsAdapter
     private lateinit var ksString: KSString
-    private lateinit var recyclerViewPaginator: RecyclerViewPaginator
+    private lateinit var recyclerViewPaginator: RecyclerViewPaginatorV2
     private lateinit var binding: MessageThreadsLayoutBinding
 
+    private val disposables = CompositeDisposable()
+
+    private lateinit var viewModelFactory: Factory
+    private val viewModel: MessageThreadsViewModel by viewModels {
+        viewModelFactory
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MessageThreadsLayoutBinding.inflate(layoutInflater)
@@ -38,78 +49,101 @@ class MessageThreadsActivity : BaseActivity<MessageThreadsViewModel.ViewModel>()
 
         setUpAdapter()
 
-        ksString = requireNotNull(environment().ksString())
+        val environment = this.getEnvironment()?.let { env ->
+            viewModelFactory = Factory(env, intent = intent)
+            env
+        }
+        ksString = requireNotNull(environment?.ksString())
 
         binding.messageThreadsRecyclerView.adapter = adapter
         binding.messageThreadsRecyclerView.layoutManager = LinearLayoutManager(this)
 
-        recyclerViewPaginator = RecyclerViewPaginator(binding.messageThreadsRecyclerView, { viewModel.inputs.nextPage() }, viewModel.outputs.isFetchingMessageThreads())
+        recyclerViewPaginator = RecyclerViewPaginatorV2(
+            binding.messageThreadsRecyclerView,
+            { viewModel.inputs.nextPage() },
+            viewModel.outputs.isFetchingMessageThreads()
+        )
 
-        SwipeRefresher(
-            this, binding.messageThreadsSwipeRefreshLayout, { viewModel.inputs.swipeRefresh() }
-        ) { viewModel.outputs.isFetchingMessageThreads() }
+        binding.messageThreadsSwipeRefreshLayout.setOnRefreshListener {
+            viewModel.inputs.swipeRefresh()
+        }
+
+        viewModel.outputs.isFetchingMessageThreads()
+            .compose(Transformers.observeForUIV2())
+            .subscribe {
+                // - Hides loading spinner from SwipeRefreshLayout according to isFetchingUpdates
+                binding.messageThreadsSwipeRefreshLayout.isRefreshing = it
+            }
+            .addToDisposable(disposables)
 
         fadeToolbarTitleOnExpand(binding.messageThreadsAppBarLayout, binding.messageThreadsToolbar.messageThreadsCollapsedToolbarTitle)
 
         viewModel.outputs.mailboxTitle()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { setMailboxStrings(it) }
+            .addToDisposable(disposables)
 
         viewModel.outputs.hasNoMessages()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { binding.unreadCountTextView.text = getString(R.string.No_messages) }
+            .addToDisposable(disposables)
 
         viewModel.outputs.hasNoUnreadMessages()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { binding.unreadCountTextView.text = getString(R.string.No_unread_messages) }
+            .addToDisposable(disposables)
+
         viewModel.outputs.messageThreadList()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
                 adapter.messageThreads(it)
             }
+            .addToDisposable(disposables)
 
         viewModel.outputs.unreadCountTextViewColorInt()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { binding.unreadCountTextView.setTextColor(ContextCompat.getColor(this, it)) }
+            .addToDisposable(disposables)
 
         viewModel.outputs.unreadCountTextViewTypefaceInt()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
                 binding.unreadCountTextView.typeface = Typeface.create(getString(R.string.font_family_sans_serif), it)
             }
+            .addToDisposable(disposables)
 
         viewModel.outputs.unreadCountToolbarTextViewIsGone()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
-            .subscribe(ViewUtils.setGone(binding.messageThreadsToolbar.messageThreadsToolbarUnreadCountTextView))
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                ViewUtils.setGone(binding.messageThreadsToolbar.messageThreadsToolbarUnreadCountTextView)
+            }
+            .addToDisposable(disposables)
 
         viewModel.outputs.unreadMessagesCount()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { setUnreadTextViewText(it) }
+            .addToDisposable(disposables)
 
         viewModel.outputs.unreadMessagesCountIsGone()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { ViewUtils.setGone(binding.unreadCountTextView, it) }
+            .addToDisposable(disposables)
 
         viewModel.outputs.isFetchingMessageThreads()
-            .compose(bindToLifecycle())
-            .compose(Transformers.observeForUI())
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribe { binding.messageThreadsSwipeRefreshLayout.isRefreshing = it }
+            .addToDisposable(disposables)
 
         binding.switchMailboxButton.setOnClickListener {
             mailboxSwitchClicked()
         }
+
+        this.onBackPressedDispatcher.addCallback {
+            finishWithAnimation()
+        }
     }
 
-    fun mailboxSwitchClicked() = viewModel.inputs.mailbox(
+    private fun mailboxSwitchClicked() = viewModel.inputs.mailbox(
         if (binding.mailboxTextView.text == this.getString(R.string.messages_navigation_inbox))
             Mailbox.SENT
         else
@@ -123,8 +157,6 @@ class MessageThreadsActivity : BaseActivity<MessageThreadsViewModel.ViewModel>()
         binding.switchMailboxButton.text = if (mailbox == this.getString(R.string.messages_navigation_inbox)) getString(R.string.messages_navigation_sent) else this.getString(R.string.messages_navigation_inbox)
     }
 
-    override fun exitTransition() = TransitionUtils.slideInFromLeft()
-
     override fun onDestroy() {
         super.onDestroy()
         recyclerViewPaginator.stop()