diff --git a/qksms/src/main/java/common/util/extensions/RxExtensions.kt b/qksms/src/main/java/common/util/extensions/RxExtensions.kt index 6fec7092..04bd6697 100644 --- a/qksms/src/main/java/common/util/extensions/RxExtensions.kt +++ b/qksms/src/main/java/common/util/extensions/RxExtensions.kt @@ -21,8 +21,11 @@ package common.util.extensions import common.util.Optional import io.reactivex.Flowable +import io.reactivex.Observable fun Flowable.mapNotNull(mapper: (T) -> R?): Flowable = map { input -> Optional(mapper(input)) } .filter { optional -> optional.notNull() } - .map { optional -> optional.value } \ No newline at end of file + .map { optional -> optional.value } + +fun Observable.toFlowable(): Flowable = this.toFlowable(io.reactivex.BackpressureStrategy.BUFFER) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index bb563843..0e9bb88b 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -206,6 +206,8 @@ class MainActivity : QkActivity(), MainView { if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) menuItemAdapter.data = state.page.menu + empty.setText(R.string.inbox_empty_text) + empty.setVisible(state.page.empty) } is Archived -> { @@ -214,6 +216,8 @@ class MainActivity : QkActivity(), MainView { if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = state.page.menu + empty.setText(R.string.archived_empty_text) + empty.setVisible(state.page.empty) } is Scheduled -> { @@ -221,6 +225,8 @@ class MainActivity : QkActivity(), MainView { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = ArrayList() + empty.setText(R.string.scheduled_empty_text) + empty.setVisible(state.page.empty) } is Blocked -> { @@ -228,6 +234,8 @@ class MainActivity : QkActivity(), MainView { recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = ArrayList() + empty.setText(R.string.blocked_empty_text) + empty.setVisible(state.page.empty) } } diff --git a/qksms/src/main/java/presentation/feature/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt index b6a20a11..0cc58854 100644 --- a/qksms/src/main/java/presentation/feature/main/MainState.kt +++ b/qksms/src/main/java/presentation/feature/main/MainState.kt @@ -33,15 +33,19 @@ sealed class MainPage data class Inbox( val showClearButton: Boolean = false, val data: Flowable>? = null, + val empty: Boolean = false, val menu: List = ArrayList(), val showArchivedSnackbar: Boolean = false) : MainPage() data class Archived( val data: Flowable>?, + val empty: Boolean = false, val menu: List = ArrayList()) : MainPage() data class Scheduled( - val data: Any? = null) : MainPage() + val data: Any? = null, + val empty: Boolean = false) : MainPage() data class Blocked( - val data: Any? = null) : MainPage() \ No newline at end of file + val data: Any? = null, + val empty: Boolean = false) : MainPage() \ 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 5d2069e9..c64e8983 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -28,6 +28,7 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.BillingManager +import common.util.extensions.toFlowable import common.util.filter.ConversationFilter import data.model.MenuItem import data.model.SyncLog @@ -56,7 +57,25 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var markUnarchived: MarkUnarchived @Inject lateinit var partialSync: PartialSync - private val conversations by lazy { messageRepo.getConversations() } + private val conversations by lazy { + messageRepo.getConversations() + .withLatestFrom(state.toFlowable(), { conversations, state -> + (state.page as? Inbox)?.let { page -> + newState { it.copy(page = page.copy(empty = conversations.isEmpty())) } + } + conversations + }) + } + + private val archivedConversations by lazy { + messageRepo.getConversations(true) + .withLatestFrom(state.toFlowable(), { conversations, state -> + (state.page as? Archived)?.let { page -> + newState { it.copy(page = page.copy(empty = conversations.isEmpty())) } + } + conversations + }) + } private val menuArchive = MenuItem(R.string.menu_archive, 0) private val menuUnarchive = MenuItem(R.string.menu_unarchive, 1) @@ -143,7 +162,7 @@ class MainViewModel : QkViewModel(MainState()) { .doOnNext { when (it) { DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = conversations)) } - DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(messageRepo.getConversations(true))) } + DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(archivedConversations)) } DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } DrawerItem.BLOCKED -> newState { it.copy(page = Blocked()) } else -> { diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index 370a4977..f3b62735 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -61,6 +61,15 @@ + + Settings Help & feedback + Your conversations will appear here + Your archived conversations will appear here + Your scheduled messages will appear here + Your blocked senders will appear here + Default SMS app QKSMS is your default SMS app Set QKSMS as your default SMS app