From d2e9c5a6b9e7ee70aca3cf3556af5167e9f8f486 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 25 Dec 2017 16:44:29 -0500 Subject: [PATCH] Show indicator while messages are syncing --- .../moez/QKSMS/presentation/main/MainActivity.kt | 4 ++++ .../com/moez/QKSMS/presentation/main/MainState.kt | 3 ++- .../moez/QKSMS/presentation/main/MainViewModel.kt | 13 +++++++++++++ qksms/src/main/res/layout/main_activity.xml | 10 ++++++++++ qksms/src/main/res/values/strings.xml | 2 ++ 5 files changed, 31 insertions(+), 1 deletion(-) 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 3e4b9ec6..07b9cb12 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 @@ -25,6 +25,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.MenuItemAdapter import com.moez.QKSMS.presentation.common.base.QkActivity @@ -167,6 +168,9 @@ class MainActivity : QkActivity(), MainView { toolbarSearch.isEnabled = state.page is Inbox toolbarSearch.textSize = if (state.page is Inbox) 16f else 20f + syncing.setVisible(state.syncing) + recyclerView.setVisible(!state.syncing) + when (state.page) { is Inbox -> { if (toolbarSearch.text.toString() != state.page.query.toString()) toolbarSearch.setText(state.page.query) 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 81f3f46c..34204a46 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 @@ -6,7 +6,8 @@ import io.reactivex.Flowable data class MainState( val page: MainPage = Inbox(), - val drawerOpen: Boolean = false + val drawerOpen: Boolean = false, + val syncing: Boolean = false ) sealed class MainPage 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 7f5c9bc5..979f77fa 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 @@ -6,6 +6,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.filter.ConversationFilter import com.moez.QKSMS.data.model.MenuItem +import com.moez.QKSMS.data.model.SyncLog import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.* import com.moez.QKSMS.presentation.Navigator @@ -13,6 +14,7 @@ import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import io.realm.Realm import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -43,6 +45,17 @@ class MainViewModel : QkViewModel(MainState()) { disposables += deleteConversation disposables += partialSync + // If it's the first sync, reflect that in the ViewState + disposables += Realm.getDefaultInstance() + .where(SyncLog::class.java) + .findAll() + .asFlowable() + .filter { it.isLoaded } + .map { it.size == 0 } + .doOnNext { if (it) partialSync.execute(Unit) } + .distinctUntilChanged() + .subscribe { syncing -> newState { it.copy(syncing = syncing) } } + newState { it.copy(page = Inbox(data = messageRepo.getConversations())) } if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) { diff --git a/qksms/src/main/res/layout/main_activity.xml b/qksms/src/main/res/layout/main_activity.xml index abf33040..3191fcba 100644 --- a/qksms/src/main/res/layout/main_activity.xml +++ b/qksms/src/main/res/layout/main_activity.xml @@ -19,6 +19,16 @@ android:layout_height="0dp" android:layout_weight="1"> + + Remove from archive Delete + Optimizing database, this might take a minute… + Write a message… Sending…