diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index fb26caf5..7efd4070 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -82,6 +82,13 @@ class Navigator @Inject constructor(val context: Context) { startActivity(intent) } + fun showSupport() { + val intent = Intent(Intent.ACTION_SENDTO) + intent.data = Uri.parse("mailto:") + intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("team@qklabs.com")) + startActivity(intent) + } + @TargetApi(Build.VERSION_CODES.O) fun showNotificationSettings() { val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) @@ -95,23 +102,10 @@ class Navigator @Inject constructor(val context: Context) { @Suppress("UNCHECKED_CAST") override fun create(modelClass: Class): T { return when (modelClass) { - - MainViewModel::class.java -> { - MainViewModel() - } - - SetupViewModel::class.java -> { - SetupViewModel() - } - - ComposeViewModel::class.java -> { - ComposeViewModel(intent) - } - - SettingsViewModel::class.java -> { - SettingsViewModel() - } - + MainViewModel::class.java -> MainViewModel() + SetupViewModel::class.java -> SetupViewModel() + ComposeViewModel::class.java -> ComposeViewModel(intent) + SettingsViewModel::class.java -> SettingsViewModel() else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt") } as T } diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 237fb8d0..45c780b0 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -72,7 +72,8 @@ class MainActivity : QkActivity(), MainView { archived.clicks().map { DrawerItem.ARCHIVED }, scheduled.clicks().map { DrawerItem.SCHEDULED }, blocked.clicks().map { DrawerItem.BLOCKED }, - settings.clicks().map { DrawerItem.SETTINGS })) + settings.clicks().map { DrawerItem.SETTINGS }, + help.clicks().map { DrawerItem.HELP })) } override val conversationClickIntent by lazy { conversationsAdapter.clicks } override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } @@ -134,14 +135,17 @@ class MainActivity : QkActivity(), MainView { } } + // Set the theme color tint to the progressbar and FAB disposables += colors.theme .doOnNext { color -> syncingProgress.indeterminateTintList = ColorStateList.valueOf(color) } .doOnNext { color -> compose.setBackgroundTint(color) } .subscribe() + // Set the hamburger icon color disposables += colors.textSecondary .subscribe { color -> toggle.drawerArrowDrawable.color = color } + // Set the color for the drawer icons disposables += Observables .combineLatest(colors.theme, colors.textSecondary, { theme, textSecondary -> ColorStateList(states, intArrayOf(theme, textSecondary)) @@ -151,8 +155,10 @@ class MainActivity : QkActivity(), MainView { .doOnNext { tintList -> scheduledIcon.imageTintList = tintList } .doOnNext { tintList -> blockedIcon.imageTintList = tintList } .doOnNext { tintList -> settingsIcon.imageTintList = tintList } + .doOnNext { tintList -> helpIcon.imageTintList = tintList } .subscribe() + // Set the background highlight for the drawer options disposables += colors.separator .doOnNext { color -> inbox.background = rowBackground(color) } .doOnNext { color -> archived.background = rowBackground(color) } diff --git a/qksms/src/main/java/presentation/feature/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt index 6a10ca01..8823c047 100644 --- a/qksms/src/main/java/presentation/feature/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.kt @@ -18,9 +18,9 @@ */ package presentation.feature.main -import presentation.common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject +import presentation.common.base.QkView interface MainView : QkView { @@ -39,4 +39,4 @@ interface MainView : QkView { } -enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKED, SETTINGS } \ No newline at end of file +enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKED, SETTINGS, HELP } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index 2e6b2c8f..c3821718 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -125,6 +125,7 @@ class MainViewModel : QkViewModel(MainState()) { intents += view.drawerItemIntent .doOnNext { newState { it.copy(drawerOpen = false) } } .doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() } + .doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() } .distinctUntilChanged() .doOnNext { when (it) { diff --git a/qksms/src/main/res/drawable/ic_help_black_24dp.xml b/qksms/src/main/res/drawable/ic_help_black_24dp.xml new file mode 100644 index 00000000..37600c05 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_help_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index 4e7f36d3..3c7beea3 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -89,9 +89,15 @@ + + @@ -107,4 +113,19 @@ + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 63e3081c..3fd6ed01 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -51,7 +51,9 @@ Archived Scheduled Blocked + More Settings + Help & support Default SMS app QKSMS is your default SMS app