From 75f5a7b8134a409ca8d1f728d95ea5eee618a052 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Dec 2017 16:25:31 -0500 Subject: [PATCH] Show system notification settings for Android O --- .../QKSMS/common/util/NotificationManager.kt | 17 +++++++++-------- .../com/moez/QKSMS/presentation/Navigator.kt | 12 ++++++++++++ .../presentation/settings/SettingsActivity.kt | 2 ++ .../presentation/settings/SettingsViewModel.kt | 4 ++++ qksms/src/main/res/layout/settings_activity.xml | 6 ++++++ 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index 131a5953..9de2fb74 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -30,6 +30,8 @@ class NotificationManager @Inject constructor( ) { companion object { + val DEFAULT_CHANNEL_ID = "channel_1" + val VIBRATE_PATTERN = longArrayOf(0, 200, 0, 200) } @@ -40,16 +42,15 @@ class NotificationManager @Inject constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - val id = "channel_1" val name = "Message notifications" val importance = NotificationManager.IMPORTANCE_HIGH - val channel = NotificationChannel(id, name, importance) - - channel.description = "Message notifications description" - channel.enableLights(true) - channel.lightColor = Color.WHITE - channel.enableVibration(true) - channel.vibrationPattern = VIBRATE_PATTERN + val channel = NotificationChannel(DEFAULT_CHANNEL_ID, name, importance).apply { + description = "Message notifications description" + enableLights(true) + lightColor = Color.WHITE + enableVibration(true) + vibrationPattern = VIBRATE_PATTERN + } notificationManager.createNotificationChannel(channel) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index bafd4ec7..31da5c2f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -1,10 +1,14 @@ package com.moez.QKSMS.presentation +import android.annotation.TargetApi import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModelProvider import android.content.Context import android.content.Intent import android.net.Uri +import android.os.Build +import android.provider.Settings +import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.main.MainViewModel @@ -44,6 +48,14 @@ class Navigator @Inject constructor(val context: Context) { startActivity(intent) } + @TargetApi(Build.VERSION_CODES.O) + fun showNotificationSettings() { + val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) + intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationManager.DEFAULT_CHANNEL_ID) + intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName) + startActivity(intent) + } + class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index 4155ed17..a3dac9fd 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -72,6 +72,8 @@ class SettingsActivity : QkActivity(), SettingsView { 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) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index 059e257f..0874f5e5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -7,6 +7,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.Preferences import com.moez.QKSMS.domain.interactor.FullSync +import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.rxkotlin.plusAssign import timber.log.Timber @@ -15,6 +16,7 @@ import javax.inject.Inject class SettingsViewModel : QkViewModel(SettingsState()) { @Inject lateinit var context: Context + @Inject lateinit var navigator: Navigator @Inject lateinit var prefs: Preferences @Inject lateinit var fullSync: FullSync @@ -90,6 +92,8 @@ class SettingsViewModel : QkViewModel(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()) diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 8736e52e..c693c915 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -50,6 +50,12 @@ app:title="@string/settings_auto_emoji_title" app:widget="@layout/settings_switch_widget" /> + +