Refactor MessengerViewModel and update Kotlin to latest RC

proxer · Oct 9, 2018 · 53c6b95 · 53c6b95
1 parent 7a3a36e
commit 53c6b95
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 93 deletions.
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -16,7 +16,7 @@ ext {
 
     // Core plugins
     androidPluginVersion = '3.3.0-alpha13'
-    kotlinVersion = '1.3-M2'
+    kotlinVersion = '1.3.0-rc-146'
 
     // Utility plugins
     detektPluginVersion = '1.0.0.RC9.2'

diff --git a/src/main/kotlin/me/proxer/app/anime/AnimeActivity.kt b/src/main/kotlin/me/proxer/app/anime/AnimeActivity.kt
@@ -135,7 +135,7 @@ class AnimeActivity : DrawerActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         toolbar.clicks()
             .autoDisposable(this.scope())
-            .subscribe { _ ->
+            .subscribe {
                 name?.let {
                     MediaActivity.navigateTo(this, id, it, Category.ANIME)
                 }

diff --git a/src/main/kotlin/me/proxer/app/anime/AnimeFragment.kt b/src/main/kotlin/me/proxer/app/anime/AnimeFragment.kt
@@ -218,13 +218,13 @@ class AnimeFragment : BaseContentFragment<AnimeStreamInfo>() {
         })
 
         viewModel.userStateData.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 snackbar(root, R.string.fragment_set_user_info_success)
             }
         })
 
         viewModel.userStateError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_set_user_info, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)
@@ -287,7 +287,7 @@ class AnimeFragment : BaseContentFragment<AnimeStreamInfo>() {
             errorContainer.isInvisible = true
 
             errorInnerContainer.doOnLayout {
-                header.doOnLayout { _ ->
+                header.doOnLayout {
                     val newCenter = root.height / 2f + header.height / 2f
                     val containerCenterCorrection = errorInnerContainer.height / 2f
 

diff --git a/src/main/kotlin/me/proxer/app/auth/LoginDialog.kt b/src/main/kotlin/me/proxer/app/auth/LoginDialog.kt
@@ -98,7 +98,7 @@ class LoginDialog : BaseDialog() {
             it.editorActionEvents(Predicate { event -> event.actionId() == EditorInfo.IME_ACTION_GO })
                 .filter { event -> event.actionId() == EditorInfo.IME_ACTION_GO }
                 .autoDisposable(dialogLifecycleOwner.scope())
-                .subscribe { _ -> validateAndLogin() }
+                .subscribe { validateAndLogin() }
         }
 
         listOf(username to usernameContainer, password to passwordContainer).forEach { (input, container) ->
@@ -116,7 +116,7 @@ class LoginDialog : BaseDialog() {
 
     private fun setupViewModel() {
         viewModel.data.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 storageHelper.user = LocalUser(it.loginToken, it.id, username.safeText.trim().toString(), it.image)
 
                 bus.post(LoginEvent())
@@ -126,7 +126,7 @@ class LoginDialog : BaseDialog() {
         })
 
         viewModel.error.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 viewModel.error.value = null
 
                 requireContext().toast(it.message)

diff --git a/src/main/kotlin/me/proxer/app/auth/LogoutDialog.kt b/src/main/kotlin/me/proxer/app/auth/LogoutDialog.kt
@@ -40,11 +40,11 @@ class LogoutDialog : BaseDialog() {
         super.onDialogCreated(savedInstanceState)
 
         viewModel.data.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ -> dismiss() }
+            it?.let { dismiss() }
         })
 
         viewModel.error.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 viewModel.error.value = null
 
                 requireContext().toast(it.message)

diff --git a/src/main/kotlin/me/proxer/app/base/PagedContentFragment.kt b/src/main/kotlin/me/proxer/app/base/PagedContentFragment.kt
@@ -82,7 +82,7 @@ abstract class PagedContentFragment<T> : BaseContentFragment<List<T>>() {
             .subscribe { viewModel.loadIfPossible() }
 
         viewModel.refreshError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_refresh, getString(it.message)), Snackbar.LENGTH_LONG,
                     it.buttonMessage, it.toClickListener(hostingActivity)

diff --git a/src/main/kotlin/me/proxer/app/bookmark/BookmarkFragment.kt b/src/main/kotlin/me/proxer/app/bookmark/BookmarkFragment.kt
@@ -113,7 +113,7 @@ class BookmarkFragment : PagedContentFragment<Bookmark>() {
         innerAdapter.glide = GlideApp.with(this)
 
         viewModel.itemDeletionError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_bookmark_deletion, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)

diff --git a/src/main/kotlin/me/proxer/app/chat/prv/create/CreateConferenceFragment.kt b/src/main/kotlin/me/proxer/app/chat/prv/create/CreateConferenceFragment.kt
@@ -332,15 +332,15 @@ class CreateConferenceFragment : BaseFragment() {
         })
 
         viewModel.result.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 requireActivity().finish()
 
                 MessengerActivity.navigateTo(requireActivity(), it)
             }
         })
 
         viewModel.error.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root,
                     it.message,

diff --git a/src/main/kotlin/me/proxer/app/chat/prv/message/MessengerFragment.kt b/src/main/kotlin/me/proxer/app/chat/prv/message/MessengerFragment.kt
@@ -195,7 +195,7 @@ class MessengerFragment : PagedContentFragment<LocalMessage>() {
         }
 
         viewModel.conference.observe(viewLifecycleOwner, Observer {
-            it?.let { _ -> conference = it }
+            it?.let { conference = it }
         })
 
         recyclerView.scrollEvents()

diff --git a/src/main/kotlin/me/proxer/app/chat/prv/message/MessengerViewModel.kt b/src/main/kotlin/me/proxer/app/chat/prv/message/MessengerViewModel.kt
@@ -34,44 +34,9 @@ class MessengerViewModel(initialConference: LocalConference) : PagedViewModel<Lo
         get() = safeConference.isFullyLoaded
         set(value) = Unit
 
-    override val data = object : MediatorLiveData<List<LocalMessage>>() {
-
-        private val source by lazy { messengerDao.getMessagesLiveDataForConference(safeConference.id) }
-
-        override fun onActive() {
-            super.onActive()
-
-            addSource(source) {
-                it?.let { _ ->
-                    if (storageHelper.isLoggedIn) {
-                        if (it.isEmpty() && !hasReachedEnd) {
-                            MessengerWorker.enqueueMessageLoad(safeConference.id)
-                        } else {
-                            if (error.value == null) {
-                                dataDisposable?.dispose()
-
-                                page = it.size.div(itemsOnPage)
-
-                                isLoading.value = false
-                                error.value = null
-                                this.value = it
-
-                                Completable.fromAction { messengerDao.markConferenceAsRead(safeConference.id) }
-                                    .subscribeOn(Schedulers.io())
-                                    .subscribeAndLogErrors()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        override fun onInactive() {
-            removeSource(source)
-
-            super.onInactive()
-        }
-    }
+    override val data = MediatorLiveData<List<LocalMessage>>()
+    val conference = MediatorLiveData<LocalConference>()
+    val draft = ResettingMutableLiveData<String?>()
 
     override val dataSingle: Single<List<LocalMessage>>
         get() = Single.fromCallable { validators.validateLogin() }
@@ -84,26 +49,37 @@ class MessengerViewModel(initialConference: LocalConference) : PagedViewModel<Lo
                 Single.never<List<LocalMessage>>()
             }
 
-    val conference = object : MediatorLiveData<LocalConference>() {
+    private val dataSource = { it: List<LocalMessage>? ->
+        it?.also {
+            if (storageHelper.isLoggedIn) {
+                if (it.isEmpty() && !hasReachedEnd) {
+                    MessengerWorker.enqueueMessageLoad(safeConference.id)
+                } else {
+                    if (error.value == null) {
+                        dataDisposable?.dispose()
 
-        private val source by lazy { messengerDao.getConferenceLiveData(safeConference.id) }
+                        page = it.size.div(itemsOnPage)
 
-        override fun onActive() {
-            super.onActive()
+                        isLoading.value = false
+                        error.value = null
+                        data.value = it
 
-            addSource(source) {
-                it?.let { _ -> this.value = it }
+                        Completable.fromAction { messengerDao.markConferenceAsRead(safeConference.id) }
+                            .subscribeOn(Schedulers.io())
+                            .subscribeAndLogErrors()
+                    }
+                }
             }
         }
 
-        override fun onInactive() {
-            removeSource(source)
-
-            super.onInactive()
-        }
+        Unit
     }
 
-    val draft = ResettingMutableLiveData<String?>()
+    private val conferenceSource = { it: LocalConference? ->
+        it?.also { conference.value = it }
+
+        Unit
+    }
 
     private val messengerDao by inject<MessengerDao>()
 
@@ -115,6 +91,15 @@ class MessengerViewModel(initialConference: LocalConference) : PagedViewModel<Lo
     init {
         conference.value = initialConference
 
+        data.addSource(
+            messengerDao.getMessagesLiveDataForConference(initialConference.id),
+            dataSource
+        )
+        conference.addSource(
+            messengerDao.getConferenceLiveData(initialConference.id),
+            conferenceSource
+        )
+
         disposables += bus.register(MessengerErrorEvent::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe { event: MessengerErrorEvent ->

diff --git a/src/main/kotlin/me/proxer/app/chat/pub/message/ChatReportDialog.kt b/src/main/kotlin/me/proxer/app/chat/pub/message/ChatReportDialog.kt
@@ -78,11 +78,11 @@ class ChatReportDialog : BaseDialog() {
             .subscribe { setError(messageContainer, null) }
 
         viewModel.data.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ -> dismiss() }
+            it?.let { dismiss() }
         })
 
         viewModel.error.observe(dialogLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 viewModel.error.value = null
 
                 requireContext().toast(it.message)

diff --git a/src/main/kotlin/me/proxer/app/chat/pub/message/ChatViewModel.kt b/src/main/kotlin/me/proxer/app/chat/pub/message/ChatViewModel.kt
@@ -189,8 +189,8 @@ class ChatViewModel(private val chatRoomId: String) : PagedViewModel<ParsedChatM
         pollingDisposable = Single.fromCallable { validators.validateLogin() }
             .flatMap { api.chat().messages(chatRoomId).messageId("0").buildSingle() }
             .map { it.map { message -> message.toParsedMessage() } }
-            .repeatWhen { it.concatMap { _ -> Flowable.timer(3, TimeUnit.SECONDS) } }
-            .retryWhen { it.concatMap { _ -> Flowable.timer(3, TimeUnit.SECONDS) } }
+            .repeatWhen { it.concatMap { Flowable.timer(3, TimeUnit.SECONDS) } }
+            .retryWhen { it.concatMap { Flowable.timer(3, TimeUnit.SECONDS) } }
             .map { newData -> mergeNewDataWithExistingData(newData, "0") }
             .let { if (!immediate) it.delaySubscription(3, TimeUnit.SECONDS) else it }
             .subscribeOn(Schedulers.io())

diff --git a/src/main/kotlin/me/proxer/app/chat/pub/room/info/ChatRoomInfoViewModel.kt b/src/main/kotlin/me/proxer/app/chat/pub/room/info/ChatRoomInfoViewModel.kt
@@ -45,8 +45,8 @@ class ChatRoomInfoViewModel(private val chatRoomId: String) : BaseContentViewMod
 
     private fun startPolling() {
         pollingDisposable = dataSingle
-            .repeatWhen { it.concatMap { _ -> Flowable.timer(10, TimeUnit.SECONDS) } }
-            .retryWhen { it.concatMap { _ -> Flowable.timer(10, TimeUnit.SECONDS) } }
+            .repeatWhen { it.concatMap { Flowable.timer(10, TimeUnit.SECONDS) } }
+            .retryWhen { it.concatMap { Flowable.timer(10, TimeUnit.SECONDS) } }
             .delaySubscription(10, TimeUnit.SECONDS)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())

diff --git a/src/main/kotlin/me/proxer/app/forum/TopicFragment.kt b/src/main/kotlin/me/proxer/app/forum/TopicFragment.kt
@@ -78,7 +78,7 @@ class TopicFragment : PagedContentFragment<ParsedPost>() {
         innerAdapter.glide = GlideApp.with(this)
 
         viewModel.metaData.observe(viewLifecycleOwner, Observer {
-            it?.let { _ -> topic = it.subject }
+            it?.let { topic = it.subject }
         })
     }
 

diff --git a/src/main/kotlin/me/proxer/app/manga/MangaActivity.kt b/src/main/kotlin/me/proxer/app/manga/MangaActivity.kt
@@ -203,7 +203,7 @@ class MangaActivity : BaseActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         toolbar.clicks()
             .autoDisposable(this.scope())
-            .subscribe { _ ->
+            .subscribe {
                 name?.let {
                     MediaActivity.navigateTo(this, id, name, Category.MANGA)
                 }

diff --git a/src/main/kotlin/me/proxer/app/manga/MangaFragment.kt b/src/main/kotlin/me/proxer/app/manga/MangaFragment.kt
@@ -268,13 +268,13 @@ class MangaFragment : BaseContentFragment<MangaChapterInfo>() {
         recyclerView.adapter = adapter
 
         viewModel.userStateData.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 snackbar(activityRoot, R.string.fragment_set_user_info_success)
             }
         })
 
         viewModel.userStateError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_set_user_info, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)
@@ -397,7 +397,7 @@ class MangaFragment : BaseContentFragment<MangaChapterInfo>() {
             errorContainer.isInvisible = true
 
             errorInnerContainer.doOnLayout {
-                header.doOnLayout { _ ->
+                header.doOnLayout {
                     val newCenter = root.height / 2f + header.height / 2f
                     val containerCenterCorrection = errorInnerContainer.height / 2f
 

diff --git a/src/main/kotlin/me/proxer/app/media/MediaInfoViewModel.kt b/src/main/kotlin/me/proxer/app/media/MediaInfoViewModel.kt
@@ -92,7 +92,7 @@ class MediaInfoViewModel(private val entryId: String) : BaseViewModel<Pair<Entry
             .subscribeOn(Schedulers.io())
             .flatMap { Single.fromCallable { it.apply { validators.validateLogin() } } }
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribeAndLogErrors({ _ ->
+            .subscribeAndLogErrors({
                 userInfoUpdateError.value = null
                 userInfoUpdateData.value = Unit
 

diff --git a/src/main/kotlin/me/proxer/app/media/info/MediaInfoFragment.kt b/src/main/kotlin/me/proxer/app/media/info/MediaInfoFragment.kt
@@ -159,13 +159,13 @@ class MediaInfoFragment : BaseContentFragment<Pair<Entry, Optional<MediaUserInfo
             }
 
         viewModel.userInfoUpdateData.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 snackbar(root, R.string.fragment_set_user_info_success)
             }
         })
 
         viewModel.userInfoUpdateError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_set_user_info, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)
@@ -450,13 +450,13 @@ class MediaInfoFragment : BaseContentFragment<Pair<Entry, Optional<MediaUserInfo
                 if (onClick != null) {
                     chip.clicks()
                         .autoDisposable(viewLifecycleOwner.scope(Lifecycle.Event.ON_DESTROY))
-                        .subscribe { _ -> onClick.invoke(items[index]) }
+                        .subscribe { onClick.invoke(items[index]) }
                 }
 
                 if (layout is MaxLineFlexboxLayout && !layout.canAddView(chip)) {
                     layout.showAllEvents
                         .autoDisposable(viewLifecycleOwner.scope(Lifecycle.Event.ON_DESTROY))
-                        .subscribe { _ -> bindChips(layout, items, mapFunction, onClick) }
+                        .subscribe { bindChips(layout, items, mapFunction, onClick) }
 
                     layout.enableShowAllButton()
 

diff --git a/src/main/kotlin/me/proxer/app/notification/NotificationFragment.kt b/src/main/kotlin/me/proxer/app/notification/NotificationFragment.kt
@@ -61,7 +61,7 @@ class NotificationFragment : PagedContentFragment<ProxerNotification>() {
         super.onViewCreated(view, savedInstanceState)
 
         viewModel.deletionError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_notification_deletion, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)

diff --git a/src/main/kotlin/me/proxer/app/ucp/media/UcpMediaListFragment.kt b/src/main/kotlin/me/proxer/app/ucp/media/UcpMediaListFragment.kt
@@ -95,7 +95,7 @@ class UcpMediaListFragment : PagedContentFragment<UserMediaListEntry>() {
         innerAdapter.glide = GlideApp.with(this)
 
         viewModel.itemDeletionError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_ucp_entry_deletion, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)

diff --git a/src/main/kotlin/me/proxer/app/ucp/topten/UcpTopTenFragment.kt b/src/main/kotlin/me/proxer/app/ucp/topten/UcpTopTenFragment.kt
@@ -86,7 +86,7 @@ class UcpTopTenFragment : BaseContentFragment<ZippedTopTenResult>() {
         mangaRecyclerView.adapter = mangaAdapter
 
         viewModel.itemDeletionError.observe(viewLifecycleOwner, Observer {
-            it?.let { _ ->
+            it?.let {
                 multilineSnackbar(
                     root, getString(R.string.error_topten_entry_removal, getString(it.message)),
                     Snackbar.LENGTH_LONG, it.buttonMessage, it.toClickListener(hostingActivity)

diff --git a/src/main/kotlin/me/proxer/app/ui/view/ExpandableSelectionView.kt b/src/main/kotlin/me/proxer/app/ui/view/ExpandableSelectionView.kt
@@ -191,7 +191,7 @@ class ExpandableSelectionView @JvmOverloads constructor(
         items.zip(itemContainer.children.toList()).forEach { (item, view) ->
             view.clicks()
                 .autoDisposable(ViewScopeProvider.from(this))
-                .subscribeAndLogErrors { _ ->
+                .subscribeAndLogErrors {
                     selection.clear()
                     selection.add(item)