Show correct notification preferneces activity based on api level

This commit is contained in:
Moez Bhatti
2018-02-27 20:45:19 -05:00
parent 0a06244b6a
commit 59a40c5372
3 changed files with 20 additions and 12 deletions
@@ -18,7 +18,6 @@
*/
package presentation.common
import android.annotation.TargetApi
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.Context
@@ -36,6 +35,8 @@ import presentation.feature.conversationinfo.ConversationInfoViewModel
import presentation.feature.gallery.GalleryActivity
import presentation.feature.gallery.GalleryViewModel
import presentation.feature.main.MainViewModel
import presentation.feature.notificationprefs.NotificationPrefsActivity
import presentation.feature.notificationprefs.NotificationPrefsViewModel
import presentation.feature.plus.PlusActivity
import presentation.feature.plus.PlusViewModel
import presentation.feature.settings.SettingsActivity
@@ -133,17 +134,22 @@ class Navigator @Inject constructor(private val context: Context, private val no
startActivityExternal(intent)
}
@TargetApi(Build.VERSION_CODES.O)
fun showNotificationSettings(threadId: Long = 0) {
if (threadId != 0L) {
notificationManager.createNotificationChannel(threadId)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (threadId != 0L) {
notificationManager.createNotificationChannel(threadId)
}
val channelId = notificationManager.buildNotificationChannelId(threadId)
val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
startActivity(intent)
val channelId = notificationManager.buildNotificationChannelId(threadId)
val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
startActivity(intent)
} else {
val intent = Intent(context, NotificationPrefsActivity::class.java)
intent.putExtra("threadId", threadId)
startActivity(intent)
}
}
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
@@ -157,6 +163,7 @@ class Navigator @Inject constructor(private val context: Context, private val no
ComposeViewModel::class.java -> ComposeViewModel(intent)
ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent)
GalleryViewModel::class.java -> GalleryViewModel(intent)
NotificationPrefsViewModel::class.java -> NotificationPrefsViewModel(intent)
SettingsViewModel::class.java -> SettingsViewModel()
ThemePickerViewModel::class.java -> ThemePickerViewModel()
else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt")
@@ -19,6 +19,7 @@
package presentation.feature.notificationprefs
import android.content.Context
import android.content.Intent
import android.net.Uri
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
@@ -31,7 +32,7 @@ import presentation.common.base.QkViewModel
import timber.log.Timber
import javax.inject.Inject
class NotificationPrefsViewModel : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) {
class NotificationPrefsViewModel(private val intent: Intent) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) {
@Inject lateinit var context: Context
@Inject lateinit var navigator: Navigator
+1 -1
View File
@@ -79,7 +79,7 @@
<string name="settings_night_end_title">End time</string>
<string name="settings_auto_emoji_title">Automatic emoji</string>
<string name="settings_auto_emoji_summary">Convert text like :) to an emoji like 🙂</string>
<string name="settings_notifications_title">Notifications</string>
<string name="settings_notifications_title">Message notifications</string>
<string name="settings_vibration_title">Vibration</string>
<string name="settings_ringtone_title">Ringtone</string>
<string name="settings_delivery_title">Delivery confirmations</string>