diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 13d2c34f..486a1f24 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -81,6 +81,7 @@ class MainActivity : QkThemedActivity(), MainView { inbox.clicks().map { DrawerItem.INBOX }, archived.clicks().map { DrawerItem.ARCHIVED }, scheduled.clicks().map { DrawerItem.SCHEDULED }, + blocking.clicks().map { DrawerItem.BLOCKING }, settings.clicks().map { DrawerItem.SETTINGS }, plus.clicks().map { DrawerItem.PLUS }, help.clicks().map { DrawerItem.HELP })) @@ -133,10 +134,6 @@ class MainActivity : QkThemedActivity(), MainView { .let { tintList -> inboxIcon.imageTintList = tintList archivedIcon.imageTintList = tintList - scheduledIcon.imageTintList = tintList - settingsIcon.imageTintList = tintList - plusIcon.imageTintList = tintList - helpIcon.imageTintList = tintList } } .doOnNext { theme -> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index 3efccd44..01ebb3c3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -46,4 +46,4 @@ interface MainView : QkView { } -enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKED, SETTINGS, PLUS, HELP } \ No newline at end of file +enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 9aa8f068..60b7b11a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -181,6 +181,7 @@ class MainViewModel @Inject constructor( view.drawerItemIntent .doOnNext { newState { copy(drawerOpen = false) } } .doOnNext { if (it == DrawerItem.SCHEDULED) navigator.showScheduled() } + .doOnNext { if (it == DrawerItem.BLOCKING) navigator.showBlockedConversations() } .doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() } .doOnNext { if (it == DrawerItem.PLUS) navigator.showQksmsPlusActivity() } .doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() } diff --git a/presentation/src/main/res/layout/blocked_activity.xml b/presentation/src/main/res/layout/blocked_activity.xml index 4116f734..784ff271 100644 --- a/presentation/src/main/res/layout/blocked_activity.xml +++ b/presentation/src/main/res/layout/blocked_activity.xml @@ -91,4 +91,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index d419b497..44556dc6 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -58,15 +58,21 @@ + + + android:tint="?android:attr/textColorSecondary" /> + + + + + + + + - - + android:tint="?android:attr/textColorSecondary" /> + android:tint="?android:attr/textColorSecondary" /> + android:tint="?android:attr/textColorSecondary" /> Inbox Archived Scheduled + Blocking More Settings QKSMS+