forked from upstream-mirrors/quik
Move option to edit blocking manager settings to selection screen
This commit is contained in:
@@ -27,9 +27,7 @@ import com.moez.QKSMS.common.QkChangeHandler
|
||||
import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
|
||||
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.*
|
||||
@@ -38,7 +36,6 @@ import javax.inject.Inject
|
||||
class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
|
||||
|
||||
override val blockingManagerIntent by lazy { blockingManager.clicks() }
|
||||
override val settingsClicks by lazy { settings.clicks() }
|
||||
override val dropClickedIntent by lazy { drop.clicks() }
|
||||
override val conversationClicks by lazy { blockingAdapter.clicks }
|
||||
|
||||
@@ -55,7 +52,6 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
override fun onViewCreated() {
|
||||
super.onViewCreated()
|
||||
|
||||
settings.setTint(colors.theme().theme)
|
||||
blockingAdapter.emptyView = empty
|
||||
conversations.adapter = blockingAdapter
|
||||
|
||||
@@ -82,10 +78,4 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
.popChangeHandler(QkChangeHandler()))
|
||||
}
|
||||
|
||||
override fun openBlockedNumbers() {
|
||||
router.pushController(RouterTransaction.with(BlockedNumbersController())
|
||||
.pushChangeHandler(QkChangeHandler())
|
||||
.popChangeHandler(QkChangeHandler()))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,9 +19,7 @@
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.blocking.BlockingManager
|
||||
import com.moez.QKSMS.common.Navigator
|
||||
import com.moez.QKSMS.common.base.QkPresenter
|
||||
import com.moez.QKSMS.repository.ConversationRepository
|
||||
@@ -32,7 +30,6 @@ import javax.inject.Inject
|
||||
|
||||
class BlockingPresenter @Inject constructor(
|
||||
context: Context,
|
||||
private val blockingManager: BlockingManager,
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val navigator: Navigator,
|
||||
private val prefs: Preferences
|
||||
@@ -63,18 +60,6 @@ class BlockingPresenter @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.openBlockingManager() }
|
||||
|
||||
view.settingsClicks
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
// TODO: This is a hack, get rid of it once we implement AndroidX navigation
|
||||
val client = prefs.blockingManager.get()
|
||||
if (client == Preferences.BLOCKING_MANAGER_QKSMS && Build.VERSION.SDK_INT < 24) {
|
||||
view.openBlockedNumbers()
|
||||
} else {
|
||||
blockingManager.openSettings()
|
||||
}
|
||||
}
|
||||
|
||||
view.dropClickedIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.drop.set(!prefs.drop.get()) }
|
||||
|
||||
@@ -24,10 +24,8 @@ import io.reactivex.Observable
|
||||
interface BlockingView : QkViewContract<BlockingState> {
|
||||
|
||||
val blockingManagerIntent: Observable<*>
|
||||
val settingsClicks: Observable<*>
|
||||
val dropClickedIntent: Observable<*>
|
||||
val conversationClicks: Observable<Long>
|
||||
|
||||
fun openBlockingManager()
|
||||
fun openBlockedNumbers()
|
||||
}
|
||||
|
||||
+36
-4
@@ -1,13 +1,19 @@
|
||||
package com.moez.QKSMS.feature.blocking.manager
|
||||
|
||||
import android.app.Activity
|
||||
import android.view.View
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
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
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.blocking_manager_controller.*
|
||||
import kotlinx.android.synthetic.main.blocking_manager_list_option.view.*
|
||||
import kotlinx.android.synthetic.main.radio_preference_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -16,6 +22,8 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
||||
|
||||
@Inject override lateinit var presenter: BlockingManagerPresenter
|
||||
|
||||
private val activityResumedSubject: PublishSubject<Unit> = PublishSubject.create()
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
@@ -29,14 +37,38 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
||||
showBackButton(true)
|
||||
}
|
||||
|
||||
override fun render(state: BlockingManagerState) {
|
||||
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
||||
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
||||
shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
|
||||
override fun onActivityResumed(activity: Activity) {
|
||||
activityResumedSubject.onNext(Unit)
|
||||
}
|
||||
|
||||
override fun render(state: BlockingManagerState) {
|
||||
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
||||
|
||||
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
||||
callControl.launch.setImageResource(when (state.callControlInstalled) {
|
||||
true -> R.drawable.ic_chevron_right_black_24dp
|
||||
false -> R.drawable.ic_info_black_24dp
|
||||
})
|
||||
|
||||
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
|
||||
})
|
||||
}
|
||||
|
||||
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 openBlockedNumbers() {
|
||||
router.pushController(RouterTransaction.with(BlockedNumbersController())
|
||||
.pushChangeHandler(QkChangeHandler())
|
||||
.popChangeHandler(QkChangeHandler()))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+56
-13
@@ -1,10 +1,11 @@
|
||||
package com.moez.QKSMS.feature.blocking.manager
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
import com.moez.QKSMS.blocking.CallControlBlockingClient
|
||||
import com.moez.QKSMS.blocking.QkBlockingClient
|
||||
import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient
|
||||
import com.moez.QKSMS.common.Navigator
|
||||
import com.moez.QKSMS.common.base.QkPresenter
|
||||
import com.moez.QKSMS.common.util.extensions.isInstalled
|
||||
import com.moez.QKSMS.manager.AnalyticsManager
|
||||
import com.moez.QKSMS.util.Preferences
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
@@ -14,10 +15,15 @@ import javax.inject.Inject
|
||||
class BlockingManagerPresenter @Inject constructor(
|
||||
private val analytics: AnalyticsManager,
|
||||
private val callControl: CallControlBlockingClient,
|
||||
private val context: Context,
|
||||
private val navigator: Navigator,
|
||||
private val prefs: Preferences
|
||||
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState()) {
|
||||
private val prefs: Preferences,
|
||||
private val qksms: QkBlockingClient,
|
||||
private val shouldIAnswer: ShouldIAnswerBlockingClient
|
||||
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
|
||||
blockingManager = prefs.blockingManager.get(),
|
||||
callControlInstalled = callControl.isAvailable(),
|
||||
siaInstalled = shouldIAnswer.isAvailable()
|
||||
)) {
|
||||
|
||||
init {
|
||||
disposables += prefs.blockingManager.asObservable()
|
||||
@@ -27,6 +33,18 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
override fun bindIntents(view: BlockingManagerView) {
|
||||
super.bindIntents(view)
|
||||
|
||||
view.activityResumed()
|
||||
.map { callControl.isAvailable() }
|
||||
.distinctUntilChanged()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { available -> newState { copy(callControlInstalled = available) } }
|
||||
|
||||
view.activityResumed()
|
||||
.map { shouldIAnswer.isAvailable() }
|
||||
.distinctUntilChanged()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { available -> newState { copy(siaInstalled = available) } }
|
||||
|
||||
view.qksmsClicked()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
@@ -34,12 +52,23 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
|
||||
}
|
||||
|
||||
view.launchQksmsClicked()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
// TODO: This is a hack, get rid of it once we implement AndroidX navigation
|
||||
if (Build.VERSION.SDK_INT < 24) {
|
||||
view.openBlockedNumbers()
|
||||
} else {
|
||||
qksms.openSettings()
|
||||
}
|
||||
}
|
||||
|
||||
view.callControlClicked()
|
||||
.filter {
|
||||
val installed = context.isInstalled("com.flexaspect.android.everycallcontrol")
|
||||
val installed = callControl.isAvailable()
|
||||
if (!installed) {
|
||||
analytics.track("Install Call Control")
|
||||
navigator.showCallControl()
|
||||
navigator.installCallControl()
|
||||
}
|
||||
|
||||
val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC
|
||||
@@ -52,16 +81,21 @@ class BlockingManagerPresenter @Inject constructor(
|
||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
|
||||
}
|
||||
|
||||
view.launchCallControlClicked()
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
when (callControl.isAvailable()) {
|
||||
true -> callControl.openSettings()
|
||||
false -> navigator.installCallControl()
|
||||
}
|
||||
}
|
||||
|
||||
view.siaClicked()
|
||||
.filter {
|
||||
val installed = listOf("org.mistergroup.shouldianswer",
|
||||
"org.mistergroup.shouldianswerpersonal",
|
||||
"org.mistergroup.muzutozvednout")
|
||||
.any(context::isInstalled)
|
||||
|
||||
val installed = shouldIAnswer.isAvailable()
|
||||
if (!installed) {
|
||||
analytics.track("Install SIA")
|
||||
navigator.showSia()
|
||||
navigator.installSia()
|
||||
}
|
||||
|
||||
val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_SIA
|
||||
@@ -72,6 +106,15 @@ 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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+3
-1
@@ -1,5 +1,7 @@
|
||||
package com.moez.QKSMS.feature.blocking.manager
|
||||
|
||||
data class BlockingManagerState(
|
||||
val blockingManager: Int = 0
|
||||
val blockingManager: Int = 0,
|
||||
val callControlInstalled: Boolean = false,
|
||||
val siaInstalled: Boolean = false
|
||||
)
|
||||
|
||||
+6
@@ -5,8 +5,14 @@ import io.reactivex.Observable
|
||||
|
||||
interface BlockingManagerView : QkViewContract<BlockingManagerState> {
|
||||
|
||||
fun activityResumed(): Observable<*>
|
||||
fun qksmsClicked(): Observable<*>
|
||||
fun launchQksmsClicked(): Observable<*>
|
||||
fun callControlClicked(): Observable<*>
|
||||
fun launchCallControlClicked(): Observable<*>
|
||||
fun siaClicked(): Observable<*>
|
||||
fun launchSiaClicked(): Observable<*>
|
||||
|
||||
fun openBlockedNumbers()
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user