Move all notification related prefs to separate activity for all API versions

This commit is contained in:
Moez Bhatti
2018-04-18 23:32:12 -04:00
parent 8cb733c013
commit 0027dfd8e0
12 changed files with 173 additions and 136 deletions
@@ -178,6 +178,12 @@ class Navigator @Inject constructor(private val context: Context, private val no
} }
fun showNotificationSettings(threadId: Long = 0) { fun showNotificationSettings(threadId: Long = 0) {
val intent = Intent(context, NotificationPrefsActivity::class.java)
intent.putExtra("threadId", threadId)
startActivity(intent)
}
fun showNotificationChannel(threadId: Long = 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (threadId != 0L) { if (threadId != 0L) {
notificationManager.createNotificationChannel(threadId) notificationManager.createNotificationChannel(threadId)
@@ -188,10 +194,6 @@ class Navigator @Inject constructor(private val context: Context, private val no
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId) intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName) intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
startActivity(intent) startActivity(intent)
} else {
val intent = Intent(context, NotificationPrefsActivity::class.java)
intent.putExtra("threadId", threadId)
startActivity(intent)
} }
} }
@@ -19,16 +19,22 @@
package feature.notificationprefs package feature.notificationprefs
import android.app.Activity import android.app.Activity
import android.app.AlertDialog
import android.content.Intent import android.content.Intent
import android.media.RingtoneManager import android.media.RingtoneManager
import android.net.Uri import android.net.Uri
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import common.MenuItemAdapter import common.MenuItemAdapter
import common.base.QkThemedActivity import common.base.QkThemedActivity
import common.util.extensions.dpToPx
import common.util.extensions.setVisible
import common.widget.PreferenceView import common.widget.PreferenceView
import injection.appComponent import injection.appComponent
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
@@ -39,11 +45,11 @@ import javax.inject.Inject
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView { class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
@Inject lateinit var nightModeAdapter: MenuItemAdapter @Inject lateinit var notificationPreviewModeAdapter: MenuItemAdapter
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter
override val viewModelClass = NotificationPrefsViewModel::class override val viewModelClass = NotificationPrefsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create() override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val notificationPreviewModeSelectedIntent by lazy { notificationPreviewModeAdapter.menuItemClicks }
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create() override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
init { init {
@@ -57,8 +63,14 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
showBackButton(true) showBackButton(true)
viewModel.bindView(this) viewModel.bindView(this)
nightModeAdapter.setData(R.array.night_modes) val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
notificationsO.setVisible(hasOreo)
notifications.setVisible(!hasOreo)
vibration.setVisible(!hasOreo)
ringtone.setVisible(!hasOreo)
notificationPreviewModeAdapter.setData(R.array.notification_preview_options)
colors.background colors.background
.autoDisposable(scope()) .autoDisposable(scope())
@@ -81,8 +93,28 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
} }
notifications.checkbox.isChecked = state.notificationsEnabled notifications.checkbox.isChecked = state.notificationsEnabled
notificationPreviews.summary = state.notificationPreviewSummary
vibration.checkbox.isChecked = state.vibrationEnabled vibration.checkbox.isChecked = state.vibrationEnabled
ringtone.summary = state.ringtoneName ringtone.summary = state.ringtoneName
qkreply.checkbox.isChecked = state.qkReplyEnabled
qkreplyTapDismiss.setVisible(state.qkReplyEnabled)
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
}
override fun showNotificationPreviewModeDialog() {
val recyclerView = RecyclerView(this)
recyclerView.layoutManager = LinearLayoutManager(this)
recyclerView.adapter = notificationPreviewModeAdapter
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
val dialog = AlertDialog.Builder(this)
.setView(recyclerView)
.create()
.apply { show() }
notificationPreviewModeAdapter.menuItemClicks
.autoDisposable(scope())
.subscribe { dialog.dismiss() }
} }
override fun showRingtonePicker(default: Uri) { override fun showRingtonePicker(default: Uri) {
@@ -18,9 +18,13 @@
*/ */
package feature.notificationprefs package feature.notificationprefs
import android.os.Build
data class NotificationPrefsState( data class NotificationPrefsState(
val conversationTitle: String = "", val conversationTitle: String = "",
val notificationsEnabled: Boolean = true, val notificationsEnabled: Boolean = true,
val notificationPreviewSummary: String = "",
val vibrationEnabled: Boolean = true, val vibrationEnabled: Boolean = true,
val ringtoneName: String = "" val ringtoneName: String = "",
) val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
val qkReplyTapDismiss: Boolean = true)
@@ -19,15 +19,17 @@
package feature.notificationprefs package feature.notificationprefs
import android.net.Uri import android.net.Uri
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import common.base.QkView import common.base.QkView
import common.widget.PreferenceView import common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
interface NotificationPrefsView : QkView<NotificationPrefsState> { interface NotificationPrefsView : QkView<NotificationPrefsState> {
val preferenceClickIntent: Subject<PreferenceView> val preferenceClickIntent: Subject<PreferenceView>
val notificationPreviewModeSelectedIntent: Subject<Int>
val ringtoneSelectedIntent: Observable<String> val ringtoneSelectedIntent: Observable<String>
fun showNotificationPreviewModeDialog()
fun showRingtonePicker(default: Uri) fun showRingtonePicker(default: Uri)
} }
@@ -27,15 +27,14 @@ import com.f2prateek.rx.preferences2.Preference
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent import injection.appComponent
import util.Preferences
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import common.Navigator
import common.base.QkViewModel
import repository.MessageRepository import repository.MessageRepository
import timber.log.Timber import util.Preferences
import util.extensions.mapNotNull import util.extensions.mapNotNull
import javax.inject.Inject import javax.inject.Inject
@@ -68,6 +67,10 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
disposables += notifications.asObservable() disposables += notifications.asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } } .subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
val notificationPreviewLabels = context.resources.getStringArray(R.array.notification_preview_options)
disposables += prefs.notificationPreviews().asObservable()
.subscribe { nightMode -> newState { it.copy(notificationPreviewSummary = notificationPreviewLabels[nightMode]) } }
disposables += vibration.asObservable() disposables += vibration.asObservable()
.subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } } .subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } }
@@ -75,6 +78,12 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
.map { uri -> uri.toUri() } .map { uri -> uri.toUri() }
.map { uri -> RingtoneManager.getRingtone(context, uri).getTitle(context) } .map { uri -> RingtoneManager.getRingtone(context, uri).getTitle(context) }
.subscribe { title -> newState { it.copy(ringtoneName = title) } } .subscribe { title -> newState { it.copy(ringtoneName = title) } }
disposables += prefs.qkreply.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyEnabled = enabled) } }
disposables += prefs.qkreplyTapDismiss.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyTapDismiss = enabled) } }
} }
override fun bindView(view: NotificationPrefsView) { override fun bindView(view: NotificationPrefsView) {
@@ -83,17 +92,27 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
view.preferenceClickIntent view.preferenceClickIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe {
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
when (it.id) { when (it.id) {
R.id.notificationsO -> navigator.showNotificationChannel(threadId)
R.id.notifications -> notifications.set(!notifications.get()) R.id.notifications -> notifications.set(!notifications.get())
R.id.notificationPreviews -> view.showNotificationPreviewModeDialog()
R.id.vibration -> vibration.set(!vibration.get()) R.id.vibration -> vibration.set(!vibration.get())
R.id.ringtone -> view.showRingtonePicker(Uri.parse(ringtone.get())) R.id.ringtone -> view.showRingtonePicker(Uri.parse(ringtone.get()))
R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
} }
} }
view.notificationPreviewModeSelectedIntent
.autoDisposable(view.scope())
.subscribe { prefs.notificationPreviews().set(it) }
view.ringtoneSelectedIntent view.ringtoneSelectedIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { ringtone -> this.ringtone.set(ringtone) } .subscribe { ringtone -> this.ringtone.set(ringtone) }
@@ -49,7 +49,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
@Inject lateinit var nightModeAdapter: MenuItemAdapter @Inject lateinit var nightModeAdapter: MenuItemAdapter
@Inject lateinit var textSizeAdapter: MenuItemAdapter @Inject lateinit var textSizeAdapter: MenuItemAdapter
@Inject lateinit var notificationPreviewModeAdapter: MenuItemAdapter
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter @Inject lateinit var mmsSizeAdapter: MenuItemAdapter
override val viewModelClass = SettingsViewModel::class override val viewModelClass = SettingsViewModel::class
@@ -59,7 +58,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create() override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create() override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val textSizeSelectedIntent by lazy { textSizeAdapter.menuItemClicks } override val textSizeSelectedIntent by lazy { textSizeAdapter.menuItemClicks }
override val notificationPreviewModeSelectedIntent by lazy { notificationPreviewModeAdapter.menuItemClicks }
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeAdapter.menuItemClicks } override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeAdapter.menuItemClicks }
// TODO remove this // TODO remove this
@@ -88,7 +86,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
nightModeAdapter.setData(R.array.night_modes) nightModeAdapter.setData(R.array.night_modes)
textSizeAdapter.setData(R.array.text_sizes) textSizeAdapter.setData(R.array.text_sizes)
notificationPreviewModeAdapter.setData(R.array.notification_preview_options)
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids) mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
version.text = getString(R.string.settings_version, BuildConfig.VERSION_NAME) version.text = getString(R.string.settings_version, BuildConfig.VERSION_NAME)
@@ -127,12 +124,8 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF) black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF)
black.checkbox.isChecked = state.black black.checkbox.isChecked = state.black
notificationPreviews.summary = state.notificationPreviewSummary
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
delivery.checkbox.isChecked = state.deliveryEnabled delivery.checkbox.isChecked = state.deliveryEnabled
qkreply.checkbox.isChecked = state.qkReplyEnabled
qkreplyTapDismiss.setVisible(state.qkReplyEnabled)
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
textSize.summary = state.textSizeSummary textSize.summary = state.textSizeSummary
systemFont.checkbox.isChecked = state.systemFontEnabled systemFont.checkbox.isChecked = state.systemFontEnabled
@@ -195,22 +188,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
textSizeDialog = null textSizeDialog = null
} }
override fun showNotificationPreviewModeDialog() {
val recyclerView = RecyclerView(this)
recyclerView.layoutManager = LinearLayoutManager(this)
recyclerView.adapter = notificationPreviewModeAdapter
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
val dialog = AlertDialog.Builder(this)
.setView(recyclerView)
.create()
.apply { show() }
notificationPreviewModeAdapter.menuItemClicks
.autoDisposable(scope())
.subscribe { dialog.dismiss() }
}
override fun showMmsSizePicker() { override fun showMmsSizePicker() {
val recyclerView = RecyclerView(this) val recyclerView = RecyclerView(this)
recyclerView.layoutManager = LinearLayoutManager(this) recyclerView.layoutManager = LinearLayoutManager(this)
@@ -18,12 +18,10 @@
*/ */
package feature.settings package feature.settings
import android.os.Build
import util.Preferences import util.Preferences
data class SettingsState( data class SettingsState(
val syncing: Boolean = false, val syncing: Boolean = false,
val isDefaultSmsApp: Boolean = false, val isDefaultSmsApp: Boolean = false,
val theme: Int = 0, val theme: Int = 0,
val nightModeSummary: String = "", val nightModeSummary: String = "",
@@ -33,10 +31,7 @@ data class SettingsState(
val black: Boolean = false, val black: Boolean = false,
val autoEmojiEnabled: Boolean = true, val autoEmojiEnabled: Boolean = true,
val notificationsEnabled: Boolean = true, val notificationsEnabled: Boolean = true,
val notificationPreviewSummary: String = "",
val deliveryEnabled: Boolean = false, val deliveryEnabled: Boolean = false,
val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
val qkReplyTapDismiss: Boolean = true,
val textSizeSummary: String = "", val textSizeSummary: String = "",
val systemFontEnabled: Boolean = false, val systemFontEnabled: Boolean = false,
val splitSmsEnabled: Boolean = false, val splitSmsEnabled: Boolean = false,
@@ -31,7 +31,6 @@ interface SettingsView : QkView<SettingsState> {
val startTimeSelectedIntent: Subject<Pair<Int, Int>> val startTimeSelectedIntent: Subject<Pair<Int, Int>>
val endTimeSelectedIntent: Subject<Pair<Int, Int>> val endTimeSelectedIntent: Subject<Pair<Int, Int>>
val textSizeSelectedIntent: Subject<Int> val textSizeSelectedIntent: Subject<Int>
val notificationPreviewModeSelectedIntent: Subject<Int>
val mmsSizeSelectedIntent: Observable<Int> val mmsSizeSelectedIntent: Observable<Int>
fun showNightModeDialog() fun showNightModeDialog()
@@ -40,7 +39,6 @@ interface SettingsView : QkView<SettingsState> {
fun showStartTimePicker(hour: Int, minute: Int) fun showStartTimePicker(hour: Int, minute: Int)
fun showEndTimePicker(hour: Int, minute: Int) fun showEndTimePicker(hour: Int, minute: Int)
fun showTextSizePicker() fun showTextSizePicker()
fun showNotificationPreviewModeDialog()
fun dismissTextSizePicker() fun dismissTextSizePicker()
fun showMmsSizePicker() fun showMmsSizePicker()
fun dismissMmsSizePicker() fun dismissMmsSizePicker()
@@ -81,19 +81,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
disposables += prefs.notifications().asObservable() disposables += prefs.notifications().asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } } .subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
val notificationPreviewLabels = context.resources.getStringArray(R.array.notification_preview_options)
disposables += prefs.notificationPreviews().asObservable()
.subscribe { nightMode -> newState { it.copy(notificationPreviewSummary = notificationPreviewLabels[nightMode]) } }
disposables += prefs.delivery.asObservable() disposables += prefs.delivery.asObservable()
.subscribe { enabled -> newState { it.copy(deliveryEnabled = enabled) } } .subscribe { enabled -> newState { it.copy(deliveryEnabled = enabled) } }
disposables += prefs.qkreply.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyEnabled = enabled) } }
disposables += prefs.qkreplyTapDismiss.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyTapDismiss = enabled) } }
val textSizeLabels = context.resources.getStringArray(R.array.text_sizes) val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
disposables += prefs.textSize.asObservable() disposables += prefs.textSize.asObservable()
.subscribe { textSize -> newState { it.copy(textSizeSummary = textSizeLabels[textSize]) } } .subscribe { textSize -> newState { it.copy(textSizeSummary = textSizeLabels[textSize]) } }
@@ -146,16 +136,10 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
R.id.notifications -> navigator.showNotificationSettings() R.id.notifications -> navigator.showNotificationSettings()
R.id.notificationPreviews -> view.showNotificationPreviewModeDialog()
R.id.blocked -> navigator.showBlockedConversations() R.id.blocked -> navigator.showBlockedConversations()
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get()) R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
R.id.textSize -> view.showTextSizePicker() R.id.textSize -> view.showTextSizePicker()
R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get()) R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get())
@@ -206,10 +190,6 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { prefs.textSize.set(it) } .subscribe { prefs.textSize.set(it) }
view.notificationPreviewModeSelectedIntent
.autoDisposable(view.scope())
.subscribe { prefs.notificationPreviews().set(it) }
view.mmsSizeSelectedIntent view.mmsSizeSelectedIntent
.doOnNext { view.dismissMmsSizePicker() } .doOnNext { view.dismissMmsSizePicker() }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com> ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~ ~
~ This file is part of QKSMS. ~ This file is part of QKSMS.
@@ -17,67 +16,118 @@
~ You should have received a copy of the GNU General Public License ~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>. ~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar" /> <android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/white">
<FrameLayout <common.widget.QkTextView
android:id="@+id/content" android:id="@+id/toolbarTitle"
style="@style/ToolbarText"
tools:text="Notifications" />
</android.support.v7.widget.Toolbar>
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar">
<ScrollView <LinearLayout
android:id="@+id/preferences"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp">
<LinearLayout <common.widget.PreferenceView
android:id="@+id/preferences" android:id="@+id/notificationsO"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" app:icon="@drawable/ic_notifications_black_24dp"
android:orientation="vertical" app:title="@string/settings_notifications_title"
android:paddingBottom="8dp" tools:visibility="gone" />
android:paddingTop="8dp">
<common.widget.PreferenceView <common.widget.PreferenceView
android:id="@+id/notifications" android:id="@+id/notifications"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/settings_notifications_title" app:icon="@drawable/ic_notifications_black_24dp"
app:widget="@layout/settings_switch_widget" /> app:title="@string/settings_notifications_title"
app:widget="@layout/settings_switch_widget" />
<common.widget.PreferenceView <common.widget.PreferenceView
android:id="@+id/vibration" android:id="@+id/notificationPreviews"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/settings_vibration_title" app:title="@string/settings_notification_previews_title"
app:widget="@layout/settings_switch_widget" /> tools:summary="Show name and message" />
<common.widget.PreferenceView <common.widget.PreferenceView
android:id="@+id/ringtone" android:id="@+id/vibration"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/settings_ringtone_title" /> app:title="@string/settings_vibration_title"
app:widget="@layout/settings_switch_widget" />
</LinearLayout> <common.widget.PreferenceView
android:id="@+id/ringtone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_ringtone_title" />
</ScrollView> <common.widget.Separator
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" />
<View <common.widget.QkTextView
android:layout_width="match_parent" style="@style/PreferenceCategory"
android:layout_height="8dp" android:text="@string/settings_category_qkreply" />
android:background="@drawable/ab_shadow" />
<common.widget.Separator <common.widget.PreferenceView
android:layout_width="match_parent" android:id="@+id/qkreply"
android:layout_height="1dp" android:layout_width="match_parent"
android:layout_gravity="bottom" /> android:layout_height="wrap_content"
app:icon="@drawable/ic_reply_white_24dp"
app:summary="@string/settings_qkreply_summary"
app:title="@string/settings_qkreply_title"
app:widget="@layout/settings_switch_widget" />
</FrameLayout> <common.widget.PreferenceView
android:id="@+id/qkreplyTapDismiss"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:summary="@string/settings_qkreply_tap_dismiss_summary"
app:title="@string/settings_qkreply_tap_dismiss_title"
app:widget="@layout/settings_switch_widget" />
</LinearLayout> </LinearLayout>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@drawable/ab_shadow"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<common.widget.Separator
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
@@ -144,13 +144,6 @@
app:icon="@drawable/ic_notifications_black_24dp" app:icon="@drawable/ic_notifications_black_24dp"
app:title="@string/settings_notifications_title" /> app:title="@string/settings_notifications_title" />
<common.widget.PreferenceView
android:id="@+id/notificationPreviews"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_previews_title"
tools:summary="Show name and message" />
<common.widget.PreferenceView <common.widget.PreferenceView
android:id="@+id/autoEmoji" android:id="@+id/autoEmoji"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -175,23 +168,6 @@
app:title="@string/settings_delivery_title" app:title="@string/settings_delivery_title"
app:widget="@layout/settings_switch_widget" /> app:widget="@layout/settings_switch_widget" />
<common.widget.PreferenceView
android:id="@+id/qkreply"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_reply_white_24dp"
app:summary="@string/settings_qkreply_summary"
app:title="@string/settings_qkreply_title"
app:widget="@layout/settings_switch_widget" />
<common.widget.PreferenceView
android:id="@+id/qkreplyTapDismiss"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:summary="@string/settings_qkreply_tap_dismiss_summary"
app:title="@string/settings_qkreply_tap_dismiss_title"
app:widget="@layout/settings_switch_widget" />
<common.widget.PreferenceView <common.widget.PreferenceView
android:id="@+id/unicode" android:id="@+id/unicode"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -91,6 +91,8 @@
<string name="settings_category_appearance">Appearance</string> <string name="settings_category_appearance">Appearance</string>
<string name="settings_category_general">General</string> <string name="settings_category_general">General</string>
<string name="settings_category_qkreply">QK Reply</string>
<string name="settings_default_sms_title">Default SMS app</string> <string name="settings_default_sms_title">Default SMS app</string>
<string name="settings_default_sms_summary_true">QKSMS is your default SMS app</string> <string name="settings_default_sms_summary_true">QKSMS is your default SMS app</string>
<string name="settings_default_sms_summary_false">Set QKSMS as your default SMS app</string> <string name="settings_default_sms_summary_false">Set QKSMS as your default SMS app</string>