Create separate activity to change notification prefs for pre-oreo

This commit is contained in:
Moez Bhatti
2018-02-27 16:19:16 -05:00
parent 648f2327f8
commit 0a06244b6a
12 changed files with 311 additions and 67 deletions
+1
View File
@@ -66,6 +66,7 @@
android:name="presentation.feature.gallery.GalleryActivity"
android:theme="@style/AppThemeBlack" />
<activity android:name="presentation.feature.conversationinfo.ConversationInfoActivity" />
<activity android:name="presentation.feature.notificationprefs.NotificationPrefsActivity" />
<receiver android:name="presentation.receiver.DefaultSmsChangedReceiver">
<intent-filter>
@@ -33,6 +33,8 @@ import presentation.feature.main.MainActivity
import presentation.feature.main.MainViewModel
import presentation.feature.plus.PlusActivity
import presentation.feature.plus.PlusViewModel
import presentation.feature.notificationprefs.NotificationPrefsActivity
import presentation.feature.notificationprefs.NotificationPrefsViewModel
import presentation.feature.settings.SettingsActivity
import presentation.feature.settings.SettingsViewModel
import presentation.feature.setup.SetupActivity
@@ -53,6 +55,7 @@ interface AppComponent {
fun inject(activity: ComposeActivity)
fun inject(activity: ConversationInfoActivity)
fun inject(activity: GalleryActivity)
fun inject(activity: NotificationPrefsActivity)
fun inject(activity: PlusActivity)
fun inject(activity: SettingsActivity)
fun inject(activity: ThemePickerActivity)
@@ -84,6 +87,7 @@ interface AppComponent {
fun inject(viewModel: ComposeViewModel)
fun inject(viewModel: ConversationInfoViewModel)
fun inject(viewModel: GalleryViewModel)
fun inject(viewModel: NotificationPrefsViewModel)
fun inject(viewModel: PlusViewModel)
fun inject(viewModel: SettingsViewModel)
fun inject(viewModel: ThemePickerViewModel)
@@ -0,0 +1,97 @@
/*
* Copyright (C) 2017 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 presentation.feature.notificationprefs
import android.app.Activity
import android.content.Intent
import android.media.RingtoneManager
import android.net.Uri
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.di.appComponent
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.notification_prefs_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import presentation.common.MenuItemAdapter
import presentation.common.base.QkThemedActivity
import presentation.common.widget.PreferenceView
import javax.inject.Inject
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
@Inject lateinit var nightModeAdapter: MenuItemAdapter
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter
override val viewModelClass = NotificationPrefsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
override fun onCreate(savedInstanceState: Bundle?) {
appComponent.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.notification_prefs_activity)
setTitle(R.string.title_notification_prefs)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.bindView(this)
nightModeAdapter.setData(R.array.night_modes)
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
colors.background
.autoDisposable(scope())
.subscribe { color -> window.decorView.setBackgroundColor(color) }
// Listen to clicks for all of the preferences
(0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) }
.filter { view -> view is PreferenceView }
.forEach { preference ->
preference.clicks().subscribe {
preferenceClickIntent.onNext(preference as PreferenceView)
}
}
}
override fun render(state: NotificationPrefsState) {
notifications.checkbox.isChecked = state.notificationsEnabled
vibration.checkbox.isChecked = state.vibrationEnabled
}
override fun showRingtonePicker(default: Uri) {
val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, default)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
startActivityForResult(intent, 123)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
val uri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
uri?.let { ringtoneSelectedIntent.onNext(uri.toString()) }
}
}
}
@@ -0,0 +1,24 @@
/*
* Copyright (C) 2017 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 presentation.feature.notificationprefs
data class NotificationPrefsState(
val notificationsEnabled: Boolean = true,
val vibrationEnabled: Boolean = true
)
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2017 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 presentation.feature.notificationprefs
import android.net.Uri
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import presentation.common.base.QkView
import presentation.common.widget.PreferenceView
interface NotificationPrefsView : QkView<NotificationPrefsState> {
val preferenceClickIntent: Subject<PreferenceView>
val ringtoneSelectedIntent: Observable<String>
fun showRingtonePicker(default: Uri)
}
@@ -0,0 +1,71 @@
/*
* Copyright (C) 2017 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 presentation.feature.notificationprefs
import android.content.Context
import android.net.Uri
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.di.appComponent
import common.util.Preferences
import io.reactivex.rxkotlin.plusAssign
import presentation.common.Navigator
import presentation.common.base.QkViewModel
import timber.log.Timber
import javax.inject.Inject
class NotificationPrefsViewModel : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) {
@Inject lateinit var context: Context
@Inject lateinit var navigator: Navigator
@Inject lateinit var prefs: Preferences
init {
appComponent.inject(this)
disposables += prefs.notifications.asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
disposables += prefs.vibration.asObservable()
.subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } }
}
override fun bindView(view: NotificationPrefsView) {
super.bindView(view)
view.preferenceClickIntent
.autoDisposable(view.scope())
.subscribe {
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
when (it.id) {
R.id.notifications -> prefs.notifications.set(!prefs.notifications.get())
R.id.vibration -> prefs.vibration.set(!prefs.vibration.get())
R.id.ringtone -> view.showRingtonePicker(Uri.parse(prefs.ringtone.get()))
}
}
view.ringtoneSelectedIntent
.autoDisposable(view.scope())
.subscribe { ringtone -> prefs.ringtone.set(ringtone) }
}
}
@@ -18,14 +18,9 @@
*/
package presentation.feature.settings
import android.app.Activity
import android.app.AlertDialog
import android.app.ProgressDialog
import android.app.TimePickerDialog
import android.content.Intent
import android.media.RingtoneManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.design.widget.Snackbar
import android.support.v7.widget.LinearLayoutManager
@@ -58,7 +53,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeAdapter.menuItemClicks }
// TODO remove this
@@ -81,12 +75,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.bindView(this)
val supportsNotificationChannels = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
notificationsO.setVisible(supportsNotificationChannels)
notifications.setVisible(!supportsNotificationChannels)
vibration.setVisible(!supportsNotificationChannels)
ringtone.setVisible(!supportsNotificationChannels)
nightModeAdapter.setData(R.array.night_modes)
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
@@ -121,8 +109,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
nightEnd.summary = state.nightEnd
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
notifications.checkbox.isChecked = state.notificationsEnabled
vibration.checkbox.isChecked = state.vibrationEnabled
delivery.checkbox.isChecked = state.deliveryEnabled
unicode.checkbox.isChecked = state.stripUnicodeEnabled
mms.checkbox.isChecked = state.mmsEnabled
@@ -167,15 +153,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
}, hour, minute, false).show()
}
override fun showRingtonePicker(default: Uri) {
val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, default)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
startActivityForResult(intent, 123)
}
override fun showMmsSizePicker() {
val recyclerView = RecyclerView(this)
recyclerView.layoutManager = LinearLayoutManager(this)
@@ -193,12 +170,4 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
mmsSizeDialog = null
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
val uri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
uri?.let { ringtoneSelectedIntent.onNext(uri.toString()) }
}
}
}
@@ -18,7 +18,6 @@
*/
package presentation.feature.settings
import android.net.Uri
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import presentation.common.base.QkView
@@ -31,7 +30,6 @@ interface SettingsView : QkView<SettingsState> {
val viewQksmsPlusIntent: Subject<Unit>
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
val ringtoneSelectedIntent: Observable<String>
val mmsSizeSelectedIntent: Observable<Int>
fun showNightModeDialog()
@@ -39,7 +37,6 @@ interface SettingsView : QkView<SettingsState> {
fun showQksmsPlusSnackbar()
fun showStartTimePicker(hour: Int, minute: Int)
fun showEndTimePicker(hour: Int, minute: Int)
fun showRingtonePicker(default: Uri)
fun showMmsSizePicker()
fun dismissMmsSizePicker()
}
@@ -19,7 +19,6 @@
package presentation.feature.settings
import android.content.Context
import android.net.Uri
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
@@ -124,13 +123,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get())
R.id.notificationsO -> navigator.showNotificationSettings()
R.id.notifications -> prefs.notifications.set(!prefs.notifications.get())
R.id.vibration -> prefs.vibration.set(!prefs.vibration.get())
R.id.ringtone -> view.showRingtonePicker(Uri.parse(prefs.ringtone.get()))
R.id.notifications -> navigator.showNotificationSettings()
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
@@ -177,10 +170,6 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
.autoDisposable(view.scope())
.subscribe { prefs.nightEnd.set(it) }
view.ringtoneSelectedIntent
.autoDisposable(view.scope())
.subscribe { ringtone -> prefs.ringtone.set(ringtone) }
view.mmsSizeSelectedIntent
.doOnNext { view.dismissMmsSizePicker() }
.autoDisposable(view.scope())
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 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/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/toolbar" />
<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/preferences"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp">
<presentation.common.widget.PreferenceView
android:id="@+id/notifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notifications_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/vibration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_vibration_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/ringtone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_ringtone_title" />
</LinearLayout>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@drawable/ab_shadow" />
</FrameLayout>
</LinearLayout>
@@ -89,31 +89,11 @@
app:title="@string/settings_auto_emoji_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/notificationsO"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notifications_title" />
<presentation.common.widget.PreferenceView
android:id="@+id/notifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notifications_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/vibration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_vibration_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/ringtone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_ringtone_title" />
app:title="@string/settings_notifications_title" />
<presentation.common.widget.PreferenceView
android:id="@+id/delivery"
+1
View File
@@ -24,6 +24,7 @@
<string name="title_scheduled">Scheduled</string>
<string name="title_blocked">Blocked</string>
<string name="title_settings">Settings</string>
<string name="title_notification_prefs">Notifications</string>
<string name="title_theme">Theme</string>
<string name="title_conversations">Search inbox…</string>
<string name="title_compose">Type a name or number</string>