forked from upstream-mirrors/quik
Show indicator while messages are syncing
This commit is contained in:
@@ -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<MainViewModel>(), 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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<MainView, MainState>(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) {
|
||||
|
||||
@@ -19,6 +19,16 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<com.moez.QKSMS.presentation.common.widget.QkTextView
|
||||
android:id="@+id/syncing"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="32dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/main_syncing"
|
||||
app:textColor="secondary" />
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/recyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
<string name="menu_unarchive">Remove from archive</string>
|
||||
<string name="menu_delete">Delete</string>
|
||||
|
||||
<string name="main_syncing">Optimizing database, this might take a minute…</string>
|
||||
|
||||
<string name="compose_hint">Write a message…</string>
|
||||
|
||||
<string name="message_status_sending">Sending…</string>
|
||||
|
||||
Reference in New Issue
Block a user