mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 20:58:54 +01:00
Show system notification settings for Android O
This commit is contained in:
@@ -30,6 +30,8 @@ class NotificationManager @Inject constructor(
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
val DEFAULT_CHANNEL_ID = "channel_1"
|
||||||
|
|
||||||
val VIBRATE_PATTERN = longArrayOf(0, 200, 0, 200)
|
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) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||||
|
|
||||||
val id = "channel_1"
|
|
||||||
val name = "Message notifications"
|
val name = "Message notifications"
|
||||||
val importance = NotificationManager.IMPORTANCE_HIGH
|
val importance = NotificationManager.IMPORTANCE_HIGH
|
||||||
val channel = NotificationChannel(id, name, importance)
|
val channel = NotificationChannel(DEFAULT_CHANNEL_ID, name, importance).apply {
|
||||||
|
description = "Message notifications description"
|
||||||
channel.description = "Message notifications description"
|
enableLights(true)
|
||||||
channel.enableLights(true)
|
lightColor = Color.WHITE
|
||||||
channel.lightColor = Color.WHITE
|
enableVibration(true)
|
||||||
channel.enableVibration(true)
|
vibrationPattern = VIBRATE_PATTERN
|
||||||
channel.vibrationPattern = VIBRATE_PATTERN
|
}
|
||||||
|
|
||||||
notificationManager.createNotificationChannel(channel)
|
notificationManager.createNotificationChannel(channel)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
package com.moez.QKSMS.presentation
|
package com.moez.QKSMS.presentation
|
||||||
|
|
||||||
|
import android.annotation.TargetApi
|
||||||
import android.arch.lifecycle.ViewModel
|
import android.arch.lifecycle.ViewModel
|
||||||
import android.arch.lifecycle.ViewModelProvider
|
import android.arch.lifecycle.ViewModelProvider
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
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.ComposeActivity
|
||||||
import com.moez.QKSMS.presentation.compose.ComposeViewModel
|
import com.moez.QKSMS.presentation.compose.ComposeViewModel
|
||||||
import com.moez.QKSMS.presentation.main.MainViewModel
|
import com.moez.QKSMS.presentation.main.MainViewModel
|
||||||
@@ -44,6 +48,14 @@ class Navigator @Inject constructor(val context: Context) {
|
|||||||
startActivity(intent)
|
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 {
|
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
|||||||
@@ -72,6 +72,8 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
|||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
val supportsNotificationChannels = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
val supportsNotificationChannels = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
|
||||||
|
notificationsO.setVisible(supportsNotificationChannels)
|
||||||
|
notifications.setVisible(!supportsNotificationChannels)
|
||||||
vibration.setVisible(!supportsNotificationChannels)
|
vibration.setVisible(!supportsNotificationChannels)
|
||||||
ringtone.setVisible(!supportsNotificationChannels)
|
ringtone.setVisible(!supportsNotificationChannels)
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.moez.QKSMS.R
|
|||||||
import com.moez.QKSMS.common.di.appComponent
|
import com.moez.QKSMS.common.di.appComponent
|
||||||
import com.moez.QKSMS.common.util.Preferences
|
import com.moez.QKSMS.common.util.Preferences
|
||||||
import com.moez.QKSMS.domain.interactor.FullSync
|
import com.moez.QKSMS.domain.interactor.FullSync
|
||||||
|
import com.moez.QKSMS.presentation.Navigator
|
||||||
import com.moez.QKSMS.presentation.common.base.QkViewModel
|
import com.moez.QKSMS.presentation.common.base.QkViewModel
|
||||||
import io.reactivex.rxkotlin.plusAssign
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
@@ -15,6 +16,7 @@ import javax.inject.Inject
|
|||||||
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
||||||
|
|
||||||
@Inject lateinit var context: Context
|
@Inject lateinit var context: Context
|
||||||
|
@Inject lateinit var navigator: Navigator
|
||||||
@Inject lateinit var prefs: Preferences
|
@Inject lateinit var prefs: Preferences
|
||||||
@Inject lateinit var fullSync: FullSync
|
@Inject lateinit var fullSync: FullSync
|
||||||
|
|
||||||
@@ -90,6 +92,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
|||||||
|
|
||||||
R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get())
|
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.notifications -> prefs.notifications.set(!prefs.notifications.get())
|
||||||
|
|
||||||
R.id.vibration -> prefs.vibration.set(!prefs.vibration.get())
|
R.id.vibration -> prefs.vibration.set(!prefs.vibration.get())
|
||||||
|
|||||||
@@ -50,6 +50,12 @@
|
|||||||
app:title="@string/settings_auto_emoji_title"
|
app:title="@string/settings_auto_emoji_title"
|
||||||
app:widget="@layout/settings_switch_widget" />
|
app:widget="@layout/settings_switch_widget" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.presentation.common.widget.PreferenceView
|
||||||
|
android:id="@+id/notificationsO"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:title="@string/settings_notifications_title" />
|
||||||
|
|
||||||
<com.moez.QKSMS.presentation.common.widget.PreferenceView
|
<com.moez.QKSMS.presentation.common.widget.PreferenceView
|
||||||
android:id="@+id/notifications"
|
android:id="@+id/notifications"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
Reference in New Issue
Block a user