From d6beabfb10ff93192cbc285c125f5b314ce5dfb1 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 15 Sep 2019 21:53:18 -0400 Subject: [PATCH] Move blocked numbers up a level --- .../feature/blocking/BlockingController.kt | 12 ++++++++- .../feature/blocking/BlockingPresenter.kt | 13 ++++++++++ .../QKSMS/feature/blocking/BlockingView.kt | 2 ++ .../manager/BlockingManagerController.kt | 23 +++-------------- .../manager/BlockingManagerPresenter.kt | 25 ------------------- .../blocking/manager/BlockingManagerView.kt | 4 --- .../main/res/layout/blocking_controller.xml | 8 +++++- .../layout/blocking_manager_controller.xml | 3 +-- .../layout/blocking_manager_list_option.xml | 4 +-- 9 files changed, 39 insertions(+), 55 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt index 366fc803..fb0d46ba 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt @@ -19,6 +19,7 @@ package com.moez.QKSMS.feature.blocking import android.view.View +import androidx.core.view.isVisible import com.bluelinelabs.conductor.RouterTransaction import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R @@ -28,6 +29,7 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController +import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController import com.moez.QKSMS.injection.appComponent import kotlinx.android.synthetic.main.blocking_controller.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* @@ -36,7 +38,8 @@ import javax.inject.Inject class BlockingController : QkController(), BlockingView { override val blockingManagerIntent by lazy { blockingManager.clicks() } - override val blockedMessagesIntent by lazy { blockedNumbers.clicks() } + override val blockedNumbersIntent by lazy { blockedNumbers.clicks() } + override val blockedMessagesIntent by lazy { blockedMessages.clicks() } override val dropClickedIntent by lazy { drop.clicks() } @Inject lateinit var colors: Colors @@ -63,6 +66,13 @@ class BlockingController : QkController(BlockingState()) { @@ -55,6 +57,17 @@ class BlockingPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.openBlockingManager() } + view.blockedNumbersIntent + .autoDisposable(view.scope()) + .subscribe { + if (prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_QKSMS) { + // TODO: This is a hack, get rid of it once we implement AndroidX navigation + view.openBlockedNumbers() + } else { + blockingClient.openSettings() + } + } + view.blockedMessagesIntent .autoDisposable(view.scope()) .subscribe { view.openBlockedMessages() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt index 08555d40..8ca05048 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt @@ -24,9 +24,11 @@ import io.reactivex.Observable interface BlockingView : QkViewContract { val blockingManagerIntent: Observable<*> + val blockedNumbersIntent: Observable<*> val blockedMessagesIntent: Observable<*> val dropClickedIntent: Observable<*> fun openBlockingManager() + fun openBlockedNumbers() fun openBlockedMessages() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt index 96e647e8..ed64b1d5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt @@ -3,12 +3,10 @@ package com.moez.QKSMS.feature.blocking.manager import android.app.Activity import android.app.AlertDialog import android.view.View -import com.bluelinelabs.conductor.RouterTransaction +import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R -import com.moez.QKSMS.common.QkChangeHandler import com.moez.QKSMS.common.base.QkController -import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.util.Preferences import io.reactivex.Observable @@ -47,25 +45,16 @@ class BlockingManagerController : QkController R.drawable.ic_chevron_right_black_24dp - false -> R.drawable.ic_info_black_24dp - }) + callControl.install.isVisible = !state.callControlInstalled shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA - shouldIAnswer.launch.setImageResource(when (state.siaInstalled) { - true -> R.drawable.ic_chevron_right_black_24dp - false -> R.drawable.ic_info_black_24dp - }) + shouldIAnswer.install.isVisible = !state.siaInstalled } override fun activityResumed(): Observable<*> = activityResumedSubject override fun qksmsClicked(): Observable<*> = qksms.clicks() - override fun launchQksmsClicked(): Observable<*> = qksms.launch.clicks() override fun callControlClicked(): Observable<*> = callControl.clicks() - override fun launchCallControlClicked(): Observable<*> = callControl.launch.clicks() override fun siaClicked(): Observable<*> = shouldIAnswer.clicks() - override fun launchSiaClicked(): Observable<*> = shouldIAnswer.launch.clicks() override fun showCopyDialog(manager: String): Single = Single.create { emitter -> AlertDialog.Builder(activity) @@ -77,10 +66,4 @@ class BlockingManagerController : QkController callControl.openSettings() - false -> navigator.installCallControl() - } - } - view.siaClicked() .filter { val installed = shouldIAnswer.isAvailable() @@ -129,15 +113,6 @@ class BlockingManagerPresenter @Inject constructor( analytics.setUserProperty("Blocking Manager", "SIA") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA) } - - view.launchSiaClicked() - .autoDisposable(view.scope()) - .subscribe { - when (shouldIAnswer.isAvailable()) { - true -> shouldIAnswer.openSettings() - false -> navigator.installSia() - } - } } private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt index f3731cfe..7318e53a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt @@ -8,13 +8,9 @@ interface BlockingManagerView : QkViewContract { fun activityResumed(): Observable<*> fun qksmsClicked(): Observable<*> - fun launchQksmsClicked(): Observable<*> fun callControlClicked(): Observable<*> - fun launchCallControlClicked(): Observable<*> fun siaClicked(): Observable<*> - fun launchSiaClicked(): Observable<*> fun showCopyDialog(manager: String): Single - fun openBlockedNumbers() } diff --git a/presentation/src/main/res/layout/blocking_controller.xml b/presentation/src/main/res/layout/blocking_controller.xml index f2162309..5602fc9d 100644 --- a/presentation/src/main/res/layout/blocking_controller.xml +++ b/presentation/src/main/res/layout/blocking_controller.xml @@ -44,7 +44,7 @@ android:id="@+id/blockedNumbers" android:layout_width="match_parent" android:layout_height="wrap_content" - app:title="@string/blocked_messages_title" /> + app:title="@string/blocked_numbers_title" /> + + diff --git a/presentation/src/main/res/layout/blocking_manager_controller.xml b/presentation/src/main/res/layout/blocking_manager_controller.xml index 83cccd0d..03575c7b 100644 --- a/presentation/src/main/res/layout/blocking_manager_controller.xml +++ b/presentation/src/main/res/layout/blocking_manager_controller.xml @@ -35,8 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:summary="@string/blocking_manager_qksms_summary" - app:title="@string/blocking_manager_qksms_title" - app:widget="@layout/blocking_manager_list_option" /> + app:title="@string/blocking_manager_qksms_title" /> . -->