From e0ea54f1f4810ca1536035c3328389af03e1f8bb Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Nov 2017 18:12:36 -0700 Subject: [PATCH] Allow changing page via navigation menu --- .../moez/QKSMS/common/util/ThemeManager.kt | 4 +++ .../QKSMS/presentation/main/MainActivity.kt | 25 +++++++++++++-- .../moez/QKSMS/presentation/main/MainState.kt | 5 ++- .../moez/QKSMS/presentation/main/MainView.kt | 1 + .../QKSMS/presentation/main/MainViewModel.kt | 32 ++++++++++++++++--- .../main/res/drawable/ic_inbox_black_24dp.xml | 9 ++++++ qksms/src/main/res/drawable/ripple.xml | 10 ++++++ qksms/src/main/res/layout/drawer_view.xml | 18 +++++++++++ ...on_list_activity.xml => main_activity.xml} | 0 qksms/src/main/res/values/colors.xml | 1 + qksms/src/main/res/values/strings.xml | 1 + 11 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 qksms/src/main/res/drawable/ic_inbox_black_24dp.xml create mode 100644 qksms/src/main/res/drawable/ripple.xml rename qksms/src/main/res/layout/{conversation_list_activity.xml => main_activity.xml} (100%) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt index 8ba44f83..8b9ca012 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/ThemeManager.kt @@ -9,4 +9,8 @@ class ThemeManager @Inject constructor() { val color = 0xFF008389.toInt() val bubbleColor = 0xFFF4F4F4.toInt() + val textPrimary = 0xFF49555F.toInt() + val textSecondary = 0xFF70808D.toInt() + val textTertiary = 0xFFB7B9C0.toInt() + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index a4635035..e23682ba 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -15,10 +15,12 @@ import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.common.di.AppComponentManager +import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkActivity -import kotlinx.android.synthetic.main.conversation_list_activity.* import kotlinx.android.synthetic.main.drawer_view.* +import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.toolbar.* import timber.log.Timber import javax.inject.Inject @@ -26,10 +28,12 @@ import javax.inject.Inject class MainActivity : QkActivity(), MainView { @Inject lateinit var navigator: Navigator + @Inject lateinit var themeManager: ThemeManager override val viewModelClass = MainViewModel::class override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } + override val inboxIntent by lazy { inbox.clicks() } override val archivedIntent by lazy { archived.clicks() } override val scheduledIntent by lazy { scheduled.clicks() } override val blockedIntent by lazy { blocked.clicks() } @@ -38,7 +42,7 @@ class MainActivity : QkActivity(), MainView { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) AppComponentManager.appComponent.inject(this) - setContentView(R.layout.conversation_list_activity) + setContentView(R.layout.main_activity) ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0).syncState() requestPermissions() viewModel.setView(this) @@ -61,10 +65,27 @@ class MainActivity : QkActivity(), MainView { conversationList.adapter = state.adapter } + inbox.setBackgroundResource(getRowBackground(state.page == MainPage.INBOX)) + inboxIcon.setTint(getIconColor(state.page == MainPage.INBOX)) + archived.setBackgroundResource(getRowBackground(state.page == MainPage.ARCHIVED)) + archivedIcon.setTint(getIconColor(state.page == MainPage.ARCHIVED)) + scheduled.setBackgroundResource(getRowBackground(state.page == MainPage.SCHEDULED)) + scheduledIcon.setTint(getIconColor(state.page == MainPage.SCHEDULED)) + blocked.setBackgroundResource(getRowBackground(state.page == MainPage.BLOCKED)) + blockedIcon.setTint(getIconColor(state.page == MainPage.BLOCKED)) + if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) } + private fun getIconColor(selected: Boolean): Int { + return if (selected) themeManager.color else themeManager.textSecondary + } + + private fun getRowBackground(selected: Boolean): Int { + return if (selected) R.color.row_selected else R.drawable.ripple + } + private fun requestPermissions() { Dexter.withActivity(this) .withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS)) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index fec748f5..5adfc7d5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -3,7 +3,10 @@ package com.moez.QKSMS.presentation.main import android.support.v7.widget.RecyclerView data class MainState( + val page: MainPage = MainPage.INBOX, val adapter: RecyclerView.Adapter<*>? = null, val refreshing: Boolean = false, val drawerOpen: Boolean = false -) \ No newline at end of file +) + +enum class MainPage { INBOX, ARCHIVED, SCHEDULED, BLOCKED } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index d5e095c2..7571a7e1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -7,6 +7,7 @@ interface MainView : QkView { val composeIntent: Observable val drawerOpenIntent: Observable + val inboxIntent: Observable val archivedIntent: Observable val scheduledIntent: Observable val blockedIntent: Observable diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 7852f99d..618521ef 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -19,7 +19,7 @@ class MainViewModel : QkViewModel(MainState()) { disposables += markAllSeen - newState { it.copy(adapter = ConversationsAdapter(messageRepo.getConversationMessagesAsync())) } + newState { it.copy(page = MainPage.INBOX, adapter = ConversationsAdapter(messageRepo.getConversationMessagesAsync())) } markAllSeen.execute(Unit) } @@ -35,16 +35,40 @@ class MainViewModel : QkViewModel(MainState()) { newState { it.copy(drawerOpen = true) } } + intents += view.inboxIntent.subscribe { + newState { + it.copy( + page = MainPage.INBOX, + adapter = ConversationsAdapter(messageRepo.getConversationMessagesAsync()), + drawerOpen = false) + } + } + intents += view.archivedIntent.subscribe { - newState { it.copy(drawerOpen = false) } + newState { + it.copy( + page = MainPage.ARCHIVED, + adapter = null, + drawerOpen = false) + } } intents += view.scheduledIntent.subscribe { - newState { it.copy(drawerOpen = false) } + newState { + it.copy( + page = MainPage.SCHEDULED, + adapter = null, + drawerOpen = false) + } } intents += view.blockedIntent.subscribe { - newState { it.copy(drawerOpen = false) } + newState { + it.copy( + page = MainPage.BLOCKED, + adapter = null, + drawerOpen = false) + } } intents += view.settingsIntent.subscribe { diff --git a/qksms/src/main/res/drawable/ic_inbox_black_24dp.xml b/qksms/src/main/res/drawable/ic_inbox_black_24dp.xml new file mode 100644 index 00000000..de5c746a --- /dev/null +++ b/qksms/src/main/res/drawable/ic_inbox_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/drawable/ripple.xml b/qksms/src/main/res/drawable/ripple.xml new file mode 100644 index 00000000..71cf5093 --- /dev/null +++ b/qksms/src/main/res/drawable/ripple.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index 16fc71af..c0ea70aa 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -6,11 +6,27 @@ android:paddingBottom="8dp" android:paddingTop="8dp"> + + + + + + + + @@ -25,6 +41,7 @@ style="@style/DrawerRow"> @@ -39,6 +56,7 @@ style="@style/DrawerRow"> diff --git a/qksms/src/main/res/layout/conversation_list_activity.xml b/qksms/src/main/res/layout/main_activity.xml similarity index 100% rename from qksms/src/main/res/layout/conversation_list_activity.xml rename to qksms/src/main/res/layout/main_activity.xml diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 5ababeeb..de3cdd9a 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -16,4 +16,5 @@ #F1F1F1 #F2F2F2 + #F5F5F5 diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index f7580fac..3b4d9c7f 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ Write a message + Inbox Archived Scheduled Blocked