diff --git a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt index 2e10071e..de3e6bce 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt @@ -34,4 +34,6 @@ class BlockingManager @Inject constructor( override fun unblock(addresses: List): Completable = client.unblock(addresses) + override fun openSettings() = client.openSettings() + } diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt index 2c8dfeb1..2fa39ac3 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt @@ -66,4 +66,8 @@ class CallControlBlockingClient @Inject constructor( CallControl.openBlockedList(context, address) } + override fun openSettings() { + CallControl.openBlockedList(context) + } + } diff --git a/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt index b1c1c728..8b20e7fa 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/QkBlockingClient.kt @@ -19,8 +19,10 @@ package com.moez.QKSMS.blocking import android.content.Context +import android.content.Intent import android.os.Build import android.provider.BlockedNumberContract +import android.telecom.TelecomManager import android.telephony.PhoneNumberUtils import androidx.core.content.contentValuesOf import com.moez.QKSMS.extensions.anyOf @@ -89,4 +91,16 @@ class QkBlockingClient @Inject constructor(private val context: Context) : Block } } + override fun openSettings() = when { + Build.VERSION.SDK_INT >= 24 -> { + val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager + val intent = telecomManager.createManageBlockedNumbersIntent() + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + + context.startActivity(intent) + } + + else -> {} // TODO + } + } diff --git a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt index b7119841..d803d0da 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt @@ -54,16 +54,17 @@ class ShouldIAnswerBlockingClient @Inject constructor( return Binder(context, address).isBlocked() } - override fun block(addresses: List): Completable = Completable.fromCallable { showSia() } + override fun block(addresses: List): Completable = Completable.fromCallable { openSettings() } - override fun unblock(addresses: List): Completable = Completable.fromCallable { showSia() } + override fun unblock(addresses: List): Completable = Completable.fromCallable { openSettings() } - private fun showSia() { + override fun openSettings() { val pm = context.packageManager - pm.getLaunchIntentForPackage("org.mistergroup.shouldianswer") + val intent = pm.getLaunchIntentForPackage("org.mistergroup.shouldianswer") ?: pm.getLaunchIntentForPackage("org.mistergroup.shouldianswerpersonal") ?: pm.getLaunchIntentForPackage("org.mistergroup.muzutozvednout") - ?.run(context::startActivity) + + intent?.run(context::startActivity) } private class Binder( diff --git a/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt b/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt index b7d2b5d3..c1c584ee 100644 --- a/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt +++ b/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt @@ -50,4 +50,9 @@ interface BlockingClient { */ fun unblock(addresses: List): Completable + /** + * Opens the settings page for the blocking manager + */ + fun openSettings() + } \ No newline at end of file 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 bd2c2eab..69283645 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 @@ -7,8 +7,11 @@ 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.common.util.Colors +import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController import com.moez.QKSMS.injection.appComponent +import io.reactivex.Observable import kotlinx.android.synthetic.main.blocking_controller.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import javax.inject.Inject @@ -16,10 +19,12 @@ import javax.inject.Inject class BlockingController : QkController(), 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 } @Inject lateinit var blockingAdapter: BlockingAdapter + @Inject lateinit var colors: Colors @Inject override lateinit var presenter: BlockingPresenter init { @@ -31,6 +36,7 @@ class BlockingController : QkController { val blockingManagerIntent: Observable<*> + val settingsClicks: Observable<*> val dropClickedIntent: Observable<*> val conversationClicks: Observable diff --git a/presentation/src/main/res/layout/blocking_controller.xml b/presentation/src/main/res/layout/blocking_controller.xml index a0540da3..5dd076de 100644 --- a/presentation/src/main/res/layout/blocking_controller.xml +++ b/presentation/src/main/res/layout/blocking_controller.xml @@ -17,80 +17,105 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:background="?android:attr/windowBackground" + android:paddingTop="8dp" + android:paddingBottom="8dp"> - + android:layout_height="wrap_content" + android:animateLayoutChanges="true"> - + - + + + + + android:paddingTop="8dp" + android:paddingBottom="8dp" + app:layout_constraintTop_toBottomOf="@id/blockingManager" + app:summary="@string/blocking_drop_summary" + app:title="@string/blocking_drop_title" + app:widget="@layout/settings_switch_widget" /> - + - + - + - + - + - - - - - +