Move option to edit blocking manager settings to selection screen

This commit is contained in:
moezbhatti
2019-07-30 12:09:37 -04:00
parent 816a355d13
commit 9ebf4bfd4b
23 changed files with 214 additions and 95 deletions
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com> * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
* *
* This file is part of QKSMS. * This file is part of QKSMS.
* *
@@ -18,11 +18,9 @@
*/ */
package com.moez.QKSMS.common.util.extensions package com.moez.QKSMS.common.util.extensions
import android.app.Activity
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.util.TypedValue import android.util.TypedValue
import android.view.inputmethod.InputMethodManager
import android.widget.Toast import android.widget.Toast
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
@@ -65,15 +63,6 @@ fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) {
Toast.makeText(this, text, duration).show() Toast.makeText(this, text, duration).show()
} }
fun Activity.dismissKeyboard() {
window.currentFocus?.let { focus ->
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
imm.hideSoftInputFromWindow(focus.windowToken, 0)
focus.clearFocus()
}
}
fun Context.isInstalled(packageName: String): Boolean { fun Context.isInstalled(packageName: String): Boolean {
return tryOrNull(false) { packageManager.getApplicationInfo(packageName, 0).enabled } ?: false return tryOrNull(false) { packageManager.getApplicationInfo(packageName, 0).enabled } ?: false
} }
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com> * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
* *
* This file is part of QKSMS. * This file is part of QKSMS.
* *
@@ -30,4 +30,4 @@ fun <T> tryOrNull(logOnError: Boolean = true, body: () -> T?): T? {
null null
} }
} }
@@ -32,6 +32,8 @@ class BlockingManager @Inject constructor(
} }
} }
override fun isAvailable(): Boolean = client.isAvailable()
override fun isBlocked(address: String): Single<Boolean> = client.isBlocked(address) override fun isBlocked(address: String): Single<Boolean> = client.isBlocked(address)
override fun canBlock(): Boolean = client.canBlock() override fun canBlock(): Boolean = client.canBlock()
@@ -24,6 +24,7 @@ import android.database.Cursor
import android.net.Uri import android.net.Uri
import androidx.core.database.getStringOrNull import androidx.core.database.getStringOrNull
import com.callcontrol.datashare.CallControl import com.callcontrol.datashare.CallControl
import com.moez.QKSMS.common.util.extensions.isInstalled
import com.moez.QKSMS.extensions.map import com.moez.QKSMS.extensions.map
import com.moez.QKSMS.util.tryOrNull import com.moez.QKSMS.util.tryOrNull
import io.reactivex.Completable import io.reactivex.Completable
@@ -43,6 +44,8 @@ class CallControlBlockingClient @Inject constructor(
val blockReason: String? = cursor.getStringOrNull(0) val blockReason: String? = cursor.getStringOrNull(0)
} }
override fun isAvailable(): Boolean = context.isInstalled("com.flexaspect.android.everycallcontrol")
override fun isBlocked(address: String): Single<Boolean> { override fun isBlocked(address: String): Single<Boolean> {
val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address) val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address)
return Single.fromCallable { return Single.fromCallable {
@@ -34,6 +34,8 @@ class QkBlockingClient @Inject constructor(
private val blockingRepo: BlockingRepository private val blockingRepo: BlockingRepository
) : BlockingClient { ) : BlockingClient {
override fun isAvailable(): Boolean = true
override fun isBlocked(address: String): Single<Boolean> = Single.fromCallable { override fun isBlocked(address: String): Single<Boolean> = Single.fromCallable {
when { when {
Build.VERSION.SDK_INT >= 24 -> BlockedNumberContract.isBlocked(context, address) Build.VERSION.SDK_INT >= 24 -> BlockedNumberContract.isBlocked(context, address)
@@ -28,6 +28,7 @@ import android.os.IBinder
import android.os.Message import android.os.Message
import android.os.Messenger import android.os.Messenger
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import com.moez.QKSMS.common.util.extensions.isInstalled
import com.moez.QKSMS.util.tryOrNull import com.moez.QKSMS.util.tryOrNull
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Single import io.reactivex.Single
@@ -47,6 +48,11 @@ class ShouldIAnswerBlockingClient @Inject constructor(
const val GET_NUMBER_RATING = 1 const val GET_NUMBER_RATING = 1
} }
override fun isAvailable(): Boolean = listOf("org.mistergroup.shouldianswer",
"org.mistergroup.shouldianswerpersonal",
"org.mistergroup.muzutozvednout")
.any(context::isInstalled)
/** /**
* Return a Single<Boolean> which emits whether or not the given [address] should be blocked * Return a Single<Boolean> which emits whether or not the given [address] should be blocked
*/ */
@@ -23,6 +23,11 @@ import io.reactivex.Single
interface BlockingClient { interface BlockingClient {
/**
* Returns true if the target blocking client is available for use, ie. it is installed
*/
fun isAvailable(): Boolean
/** /**
* Return a Single<Boolean> which emits whether or not the given [address] should be blocked * Return a Single<Boolean> which emits whether or not the given [address] should be blocked
*/ */
@@ -183,7 +183,7 @@ class Navigator @Inject constructor(
/** /**
* Launch the Play Store and display the Call Control listing * Launch the Play Store and display the Call Control listing
*/ */
fun showCallControl() { fun installCallControl() {
val url = "https://play.google.com/store/apps/details?id=com.flexaspect.android.everycallcontrol" val url = "https://play.google.com/store/apps/details?id=com.flexaspect.android.everycallcontrol"
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
startActivity(intent) startActivity(intent)
@@ -192,7 +192,7 @@ class Navigator @Inject constructor(
/** /**
* Launch the Play Store and display the Should I Answer? listing * Launch the Play Store and display the Should I Answer? listing
*/ */
fun showSia() { fun installSia() {
val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswer" val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswer"
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
startActivity(intent) startActivity(intent)
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.common.util.extensions
import android.app.Activity
import android.content.Context
import android.view.inputmethod.InputMethodManager
fun Activity.dismissKeyboard() {
window.currentFocus?.let { focus ->
val imm = getSystemService(
Context.INPUT_METHOD_SERVICE) as InputMethodManager
imm.hideSoftInputFromWindow(focus.windowToken, 0)
focus.clearFocus()
}
}
@@ -88,6 +88,12 @@ class RadioPreferenceView @JvmOverloads constructor(
context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run { context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run {
title = getString(R.styleable.RadioPreferenceView_title) title = getString(R.styleable.RadioPreferenceView_title)
summary = getString(R.styleable.RadioPreferenceView_summary) summary = getString(R.styleable.RadioPreferenceView_summary)
// If there's a custom view used for the preference's widget, inflate it
getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
View.inflate(context, id, widgetFrame)
}
recycle() recycle()
} }
} }
@@ -27,9 +27,7 @@ import com.moez.QKSMS.common.QkChangeHandler
import com.moez.QKSMS.common.base.QkController import com.moez.QKSMS.common.base.QkController
import com.moez.QKSMS.common.util.Colors 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.common.util.extensions.setTint
import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
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.*
@@ -38,7 +36,6 @@ 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 settingsClicks by lazy { settings.clicks() }
override val dropClickedIntent by lazy { drop.clicks() } override val dropClickedIntent by lazy { drop.clicks() }
override val conversationClicks by lazy { blockingAdapter.clicks } override val conversationClicks by lazy { blockingAdapter.clicks }
@@ -55,7 +52,6 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
override fun onViewCreated() { override fun onViewCreated() {
super.onViewCreated() super.onViewCreated()
settings.setTint(colors.theme().theme)
blockingAdapter.emptyView = empty blockingAdapter.emptyView = empty
conversations.adapter = blockingAdapter conversations.adapter = blockingAdapter
@@ -82,10 +78,4 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
.popChangeHandler(QkChangeHandler())) .popChangeHandler(QkChangeHandler()))
} }
override fun openBlockedNumbers() {
router.pushController(RouterTransaction.with(BlockedNumbersController())
.pushChangeHandler(QkChangeHandler())
.popChangeHandler(QkChangeHandler()))
}
} }
@@ -19,9 +19,7 @@
package com.moez.QKSMS.feature.blocking package com.moez.QKSMS.feature.blocking
import android.content.Context import android.content.Context
import android.os.Build
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.blocking.BlockingManager
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.repository.ConversationRepository
@@ -32,7 +30,6 @@ import javax.inject.Inject
class BlockingPresenter @Inject constructor( class BlockingPresenter @Inject constructor(
context: Context, context: Context,
private val blockingManager: BlockingManager,
private val conversationRepo: ConversationRepository, private val conversationRepo: ConversationRepository,
private val navigator: Navigator, private val navigator: Navigator,
private val prefs: Preferences private val prefs: Preferences
@@ -63,18 +60,6 @@ class BlockingPresenter @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.openBlockingManager() } .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 view.dropClickedIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { prefs.drop.set(!prefs.drop.get()) } .subscribe { prefs.drop.set(!prefs.drop.get()) }
@@ -24,10 +24,8 @@ import io.reactivex.Observable
interface BlockingView : QkViewContract<BlockingState> { interface BlockingView : QkViewContract<BlockingState> {
val blockingManagerIntent: Observable<*> val blockingManagerIntent: Observable<*>
val settingsClicks: Observable<*>
val dropClickedIntent: Observable<*> val dropClickedIntent: Observable<*>
val conversationClicks: Observable<Long> val conversationClicks: Observable<Long>
fun openBlockingManager() fun openBlockingManager()
fun openBlockedNumbers()
} }
@@ -1,13 +1,19 @@
package com.moez.QKSMS.feature.blocking.manager package com.moez.QKSMS.feature.blocking.manager
import android.app.Activity
import android.view.View import android.view.View
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
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
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.blocking_manager_controller.* 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 kotlinx.android.synthetic.main.radio_preference_view.view.*
import javax.inject.Inject import javax.inject.Inject
@@ -16,6 +22,8 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
@Inject override lateinit var presenter: BlockingManagerPresenter @Inject override lateinit var presenter: BlockingManagerPresenter
private val activityResumedSubject: PublishSubject<Unit> = PublishSubject.create()
init { init {
appComponent.inject(this) appComponent.inject(this)
retainViewMode = RetainViewMode.RETAIN_DETACH retainViewMode = RetainViewMode.RETAIN_DETACH
@@ -29,14 +37,38 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
showBackButton(true) showBackButton(true)
} }
override fun render(state: BlockingManagerState) { override fun onActivityResumed(activity: Activity) {
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS activityResumedSubject.onNext(Unit)
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
} }
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 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 openBlockedNumbers() {
router.pushController(RouterTransaction.with(BlockedNumbersController())
.pushChangeHandler(QkChangeHandler())
.popChangeHandler(QkChangeHandler()))
}
} }
@@ -1,10 +1,11 @@
package com.moez.QKSMS.feature.blocking.manager 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.CallControlBlockingClient
import com.moez.QKSMS.blocking.QkBlockingClient
import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter 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.manager.AnalyticsManager
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
@@ -14,10 +15,15 @@ import javax.inject.Inject
class BlockingManagerPresenter @Inject constructor( class BlockingManagerPresenter @Inject constructor(
private val analytics: AnalyticsManager, private val analytics: AnalyticsManager,
private val callControl: CallControlBlockingClient, private val callControl: CallControlBlockingClient,
private val context: Context,
private val navigator: Navigator, private val navigator: Navigator,
private val prefs: Preferences private val prefs: Preferences,
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState()) { private val qksms: QkBlockingClient,
private val shouldIAnswer: ShouldIAnswerBlockingClient
) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
blockingManager = prefs.blockingManager.get(),
callControlInstalled = callControl.isAvailable(),
siaInstalled = shouldIAnswer.isAvailable()
)) {
init { init {
disposables += prefs.blockingManager.asObservable() disposables += prefs.blockingManager.asObservable()
@@ -27,6 +33,18 @@ class BlockingManagerPresenter @Inject constructor(
override fun bindIntents(view: BlockingManagerView) { override fun bindIntents(view: BlockingManagerView) {
super.bindIntents(view) 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() view.qksmsClicked()
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe {
@@ -34,12 +52,23 @@ 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
if (Build.VERSION.SDK_INT < 24) {
view.openBlockedNumbers()
} else {
qksms.openSettings()
}
}
view.callControlClicked() view.callControlClicked()
.filter { .filter {
val installed = context.isInstalled("com.flexaspect.android.everycallcontrol") val installed = callControl.isAvailable()
if (!installed) { if (!installed) {
analytics.track("Install Call Control") analytics.track("Install Call Control")
navigator.showCallControl() navigator.installCallControl()
} }
val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC
@@ -52,16 +81,21 @@ 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 = listOf("org.mistergroup.shouldianswer", val installed = shouldIAnswer.isAvailable()
"org.mistergroup.shouldianswerpersonal",
"org.mistergroup.muzutozvednout")
.any(context::isInstalled)
if (!installed) { if (!installed) {
analytics.track("Install SIA") analytics.track("Install SIA")
navigator.showSia() navigator.installSia()
} }
val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_SIA val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_SIA
@@ -72,6 +106,15 @@ 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()
}
}
} }
} }
@@ -1,5 +1,7 @@
package com.moez.QKSMS.feature.blocking.manager package com.moez.QKSMS.feature.blocking.manager
data class BlockingManagerState( data class BlockingManagerState(
val blockingManager: Int = 0 val blockingManager: Int = 0,
val callControlInstalled: Boolean = false,
val siaInstalled: Boolean = false
) )
@@ -5,8 +5,14 @@ import io.reactivex.Observable
interface BlockingManagerView : QkViewContract<BlockingManagerState> { interface BlockingManagerView : QkViewContract<BlockingManagerState> {
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 openBlockedNumbers()
} }
@@ -34,39 +34,13 @@
<com.moez.QKSMS.common.widget.PreferenceView <com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/blockingManager" android:id="@+id/blockingManager"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/settingsDivider"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/blocking_manager_title" app:title="@string/blocking_manager_title"
tools:summary="@string/app_name" /> tools:summary="@string/app_name" />
<View
android:id="@+id/settingsDivider"
android:layout_width="1dp"
android:layout_height="38dp"
android:background="?android:attr/divider"
app:layout_constraintBottom_toBottomOf="@id/blockingManager"
app:layout_constraintEnd_toStartOf="@id/settings"
app:layout_constraintStart_toEndOf="@id/blockingManager"
app:layout_constraintTop_toTopOf="@id/blockingManager" />
<ImageView
android:id="@+id/settings"
android:layout_width="72dp"
android:layout_height="72dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/blocking_manager_settings_cd"
android:padding="24dp"
android:src="@drawable/ic_settings_black_24dp"
app:layout_constraintBottom_toBottomOf="@id/blockingManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/settingsDivider"
app:layout_constraintTop_toTopOf="@id/blockingManager"
tools:tint="@color/tools_theme" />
<com.moez.QKSMS.common.widget.PreferenceView <com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/drop" android:id="@+id/drop"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -35,21 +35,24 @@
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/app_name" /> app:title="@string/app_name"
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"
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_call_control_summary" app:summary="@string/blocking_manager_call_control_summary"
app:title="@string/blocking_manager_call_control_title" /> app:title="@string/blocking_manager_call_control_title"
app:widget="@layout/blocking_manager_list_option" />
<com.moez.QKSMS.common.widget.RadioPreferenceView <com.moez.QKSMS.common.widget.RadioPreferenceView
android:id="@+id/shouldIAnswer" android:id="@+id/shouldIAnswer"
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_sia_summary" app:summary="@string/blocking_manager_sia_summary"
app:title="@string/blocking_manager_sia_title" /> app:title="@string/blocking_manager_sia_title"
app:widget="@layout/blocking_manager_list_option" />
</LinearLayout> </LinearLayout>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/launch"
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
android:padding="16dp"
android:src="@drawable/ic_chevron_right_black_24dp"
android:tint="?android:attr/textColorTertiary" />
@@ -39,11 +39,12 @@
<com.moez.QKSMS.common.widget.QkTextView <com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/titleView" android:id="@+id/titleView"
style="@style/TextPrimary" style="@style/TextPrimary"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="72dp" android:layout_marginStart="72dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="24dp" app:layout_constraintEnd_toStartOf="@id/widgetFrame"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="Default SMS App" /> tools:text="Default SMS App" />
@@ -60,4 +61,14 @@
app:layout_constraintTop_toBottomOf="@id/titleView" app:layout_constraintTop_toBottomOf="@id/titleView"
tools:text="QKSMS is your default SMS app" /> tools:text="QKSMS is your default SMS app" />
<FrameLayout
android:id="@+id/widgetFrame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="24dp" />
</merge> </merge>
+3 -1
View File
@@ -21,6 +21,7 @@
<attr name="title" format="string" /> <attr name="title" format="string" />
<attr name="summary" format="string" /> <attr name="summary" format="string" />
<attr name="widget" format="reference" />
<attr name="textColor" format="enum"> <attr name="textColor" format="enum">
<enum name="theme" value="0" /> <enum name="theme" value="0" />
@@ -50,13 +51,14 @@
<declare-styleable name="PreferenceView"> <declare-styleable name="PreferenceView">
<attr name="title" /> <attr name="title" />
<attr name="summary" /> <attr name="summary" />
<attr name="widget" format="reference" /> <attr name="widget" />
<attr name="icon" format="reference" /> <attr name="icon" format="reference" />
</declare-styleable> </declare-styleable>
<declare-styleable name="RadioPreferenceView"> <declare-styleable name="RadioPreferenceView">
<attr name="title" /> <attr name="title" />
<attr name="summary" /> <attr name="summary" />
<attr name="widget" />
</declare-styleable> </declare-styleable>
</resources> </resources>
@@ -252,7 +252,6 @@
<string name="settings_delay_duration_hint">Enter duration (seconds)</string> <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
<string name="blocking_title">Blocking</string> <string name="blocking_title">Blocking</string>
<string name="blocking_manager_settings_cd">Open settings for selected blocking manager</string>
<string name="blocking_drop_title">Drop messages</string> <string name="blocking_drop_title">Drop messages</string>
<string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string> <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
<string name="blocking_conversations">Blocked conversations</string> <string name="blocking_conversations">Blocked conversations</string>