forked from upstream-mirrors/quik
Move blocked numbers up a level
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
package com.moez.QKSMS.feature.blocking
|
package com.moez.QKSMS.feature.blocking
|
||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import androidx.core.view.isVisible
|
||||||
import com.bluelinelabs.conductor.RouterTransaction
|
import com.bluelinelabs.conductor.RouterTransaction
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
import com.moez.QKSMS.R
|
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.common.util.extensions.animateLayoutChanges
|
||||||
import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
|
import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
|
||||||
import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
|
import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
|
||||||
|
import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
|
||||||
import com.moez.QKSMS.injection.appComponent
|
import com.moez.QKSMS.injection.appComponent
|
||||||
import kotlinx.android.synthetic.main.blocking_controller.*
|
import kotlinx.android.synthetic.main.blocking_controller.*
|
||||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||||
@@ -36,7 +38,8 @@ import javax.inject.Inject
|
|||||||
class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
|
class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
|
||||||
|
|
||||||
override val blockingManagerIntent by lazy { blockingManager.clicks() }
|
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() }
|
override val dropClickedIntent by lazy { drop.clicks() }
|
||||||
|
|
||||||
@Inject lateinit var colors: Colors
|
@Inject lateinit var colors: Colors
|
||||||
@@ -63,6 +66,13 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
|||||||
override fun render(state: BlockingState) {
|
override fun render(state: BlockingState) {
|
||||||
blockingManager.summary = state.blockingManager
|
blockingManager.summary = state.blockingManager
|
||||||
drop.checkbox.isChecked = state.dropEnabled
|
drop.checkbox.isChecked = state.dropEnabled
|
||||||
|
blockedMessages.isVisible = !state.dropEnabled
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun openBlockedNumbers() {
|
||||||
|
router.pushController(RouterTransaction.with(BlockedNumbersController())
|
||||||
|
.pushChangeHandler(QkChangeHandler())
|
||||||
|
.popChangeHandler(QkChangeHandler()))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun openBlockedMessages() {
|
override fun openBlockedMessages() {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ package com.moez.QKSMS.feature.blocking
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
|
import com.moez.QKSMS.blocking.BlockingClient
|
||||||
import com.moez.QKSMS.common.base.QkPresenter
|
import com.moez.QKSMS.common.base.QkPresenter
|
||||||
import com.moez.QKSMS.util.Preferences
|
import com.moez.QKSMS.util.Preferences
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
@@ -29,6 +30,7 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class BlockingPresenter @Inject constructor(
|
class BlockingPresenter @Inject constructor(
|
||||||
context: Context,
|
context: Context,
|
||||||
|
private val blockingClient: BlockingClient,
|
||||||
private val prefs: Preferences
|
private val prefs: Preferences
|
||||||
) : QkPresenter<BlockingView, BlockingState>(BlockingState()) {
|
) : QkPresenter<BlockingView, BlockingState>(BlockingState()) {
|
||||||
|
|
||||||
@@ -55,6 +57,17 @@ class BlockingPresenter @Inject constructor(
|
|||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { view.openBlockingManager() }
|
.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
|
view.blockedMessagesIntent
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { view.openBlockedMessages() }
|
.subscribe { view.openBlockedMessages() }
|
||||||
|
|||||||
@@ -24,9 +24,11 @@ import io.reactivex.Observable
|
|||||||
interface BlockingView : QkViewContract<BlockingState> {
|
interface BlockingView : QkViewContract<BlockingState> {
|
||||||
|
|
||||||
val blockingManagerIntent: Observable<*>
|
val blockingManagerIntent: Observable<*>
|
||||||
|
val blockedNumbersIntent: Observable<*>
|
||||||
val blockedMessagesIntent: Observable<*>
|
val blockedMessagesIntent: Observable<*>
|
||||||
val dropClickedIntent: Observable<*>
|
val dropClickedIntent: Observable<*>
|
||||||
|
|
||||||
fun openBlockingManager()
|
fun openBlockingManager()
|
||||||
|
fun openBlockedNumbers()
|
||||||
fun openBlockedMessages()
|
fun openBlockedMessages()
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-20
@@ -3,12 +3,10 @@ package com.moez.QKSMS.feature.blocking.manager
|
|||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.AlertDialog
|
import android.app.AlertDialog
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import com.bluelinelabs.conductor.RouterTransaction
|
import androidx.core.view.isVisible
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.QkChangeHandler
|
|
||||||
import com.moez.QKSMS.common.base.QkController
|
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.injection.appComponent
|
||||||
import com.moez.QKSMS.util.Preferences
|
import com.moez.QKSMS.util.Preferences
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
@@ -47,25 +45,16 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
|||||||
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
||||||
|
|
||||||
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
||||||
callControl.launch.setImageResource(when (state.callControlInstalled) {
|
callControl.install.isVisible = !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.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
|
||||||
shouldIAnswer.launch.setImageResource(when (state.siaInstalled) {
|
shouldIAnswer.install.isVisible = !state.siaInstalled
|
||||||
true -> R.drawable.ic_chevron_right_black_24dp
|
|
||||||
false -> R.drawable.ic_info_black_24dp
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun activityResumed(): Observable<*> = activityResumedSubject
|
override fun activityResumed(): Observable<*> = activityResumedSubject
|
||||||
override fun qksmsClicked(): Observable<*> = qksms.clicks()
|
override fun qksmsClicked(): Observable<*> = qksms.clicks()
|
||||||
override fun launchQksmsClicked(): Observable<*> = qksms.launch.clicks()
|
|
||||||
override fun callControlClicked(): Observable<*> = callControl.clicks()
|
override fun callControlClicked(): Observable<*> = callControl.clicks()
|
||||||
override fun launchCallControlClicked(): Observable<*> = callControl.launch.clicks()
|
|
||||||
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
|
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
|
||||||
override fun launchSiaClicked(): Observable<*> = shouldIAnswer.launch.clicks()
|
|
||||||
|
|
||||||
override fun showCopyDialog(manager: String): Single<Boolean> = Single.create { emitter ->
|
override fun showCopyDialog(manager: String): Single<Boolean> = Single.create { emitter ->
|
||||||
AlertDialog.Builder(activity)
|
AlertDialog.Builder(activity)
|
||||||
@@ -77,10 +66,4 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
|||||||
.show()
|
.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun openBlockedNumbers() {
|
|
||||||
router.pushController(RouterTransaction.with(BlockedNumbersController())
|
|
||||||
.pushChangeHandler(QkChangeHandler())
|
|
||||||
.popChangeHandler(QkChangeHandler()))
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
-25
@@ -64,13 +64,6 @@ class BlockingManagerPresenter @Inject constructor(
|
|||||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
|
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
|
|
||||||
view.openBlockedNumbers()
|
|
||||||
}
|
|
||||||
|
|
||||||
view.callControlClicked()
|
view.callControlClicked()
|
||||||
.filter {
|
.filter {
|
||||||
val installed = callControl.isAvailable()
|
val installed = callControl.isAvailable()
|
||||||
@@ -104,15 +97,6 @@ class BlockingManagerPresenter @Inject constructor(
|
|||||||
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
|
prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
|
||||||
}
|
}
|
||||||
|
|
||||||
view.launchCallControlClicked()
|
|
||||||
.autoDisposable(view.scope())
|
|
||||||
.subscribe {
|
|
||||||
when (callControl.isAvailable()) {
|
|
||||||
true -> callControl.openSettings()
|
|
||||||
false -> navigator.installCallControl()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
view.siaClicked()
|
view.siaClicked()
|
||||||
.filter {
|
.filter {
|
||||||
val installed = shouldIAnswer.isAvailable()
|
val installed = shouldIAnswer.isAvailable()
|
||||||
@@ -129,15 +113,6 @@ class BlockingManagerPresenter @Inject constructor(
|
|||||||
analytics.setUserProperty("Blocking Manager", "SIA")
|
analytics.setUserProperty("Blocking Manager", "SIA")
|
||||||
prefs.blockingManager.set(Preferences.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()
|
private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations()
|
||||||
|
|||||||
-4
@@ -8,13 +8,9 @@ interface BlockingManagerView : QkViewContract<BlockingManagerState> {
|
|||||||
|
|
||||||
fun activityResumed(): Observable<*>
|
fun activityResumed(): Observable<*>
|
||||||
fun qksmsClicked(): Observable<*>
|
fun qksmsClicked(): Observable<*>
|
||||||
fun launchQksmsClicked(): Observable<*>
|
|
||||||
fun callControlClicked(): Observable<*>
|
fun callControlClicked(): Observable<*>
|
||||||
fun launchCallControlClicked(): Observable<*>
|
|
||||||
fun siaClicked(): Observable<*>
|
fun siaClicked(): Observable<*>
|
||||||
fun launchSiaClicked(): Observable<*>
|
|
||||||
|
|
||||||
fun showCopyDialog(manager: String): Single<Boolean>
|
fun showCopyDialog(manager: String): Single<Boolean>
|
||||||
fun openBlockedNumbers()
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
android:id="@+id/blockedNumbers"
|
android:id="@+id/blockedNumbers"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:title="@string/blocked_messages_title" />
|
app:title="@string/blocked_numbers_title" />
|
||||||
|
|
||||||
<com.moez.QKSMS.common.widget.PreferenceView
|
<com.moez.QKSMS.common.widget.PreferenceView
|
||||||
android:id="@+id/drop"
|
android:id="@+id/drop"
|
||||||
@@ -54,6 +54,12 @@
|
|||||||
app:title="@string/blocking_drop_title"
|
app:title="@string/blocking_drop_title"
|
||||||
app:widget="@layout/settings_switch_widget" />
|
app:widget="@layout/settings_switch_widget" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.common.widget.PreferenceView
|
||||||
|
android:id="@+id/blockedMessages"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:title="@string/blocked_messages_title" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|||||||
@@ -35,8 +35,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:summary="@string/blocking_manager_qksms_summary"
|
app:summary="@string/blocking_manager_qksms_summary"
|
||||||
app:title="@string/blocking_manager_qksms_title"
|
app:title="@string/blocking_manager_qksms_title" />
|
||||||
app:widget="@layout/blocking_manager_list_option" />
|
|
||||||
|
|
||||||
<com.moez.QKSMS.common.widget.RadioPreferenceView
|
<com.moez.QKSMS.common.widget.RadioPreferenceView
|
||||||
android:id="@+id/callControl"
|
android:id="@+id/callControl"
|
||||||
|
|||||||
@@ -18,11 +18,11 @@
|
|||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/launch"
|
android:id="@+id/install"
|
||||||
android:layout_width="56dp"
|
android:layout_width="56dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="?attr/selectableItemBackground"
|
android:background="?attr/selectableItemBackground"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="16dp"
|
android:padding="16dp"
|
||||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
android:src="@drawable/ic_info_black_24dp"
|
||||||
android:tint="?android:attr/textColorTertiary" />
|
android:tint="?android:attr/textColorTertiary" />
|
||||||
|
|||||||
Reference in New Issue
Block a user