Fix #2792 (add little ui indicator to toolbar about cloud sync)

AndBible · Sep 14, 2023 · 9287309 · 9287309
1 parent 62b2d53
commit 9287309
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt b/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
@@ -126,6 +126,7 @@ import net.bible.service.device.ScreenSettings
 import net.bible.service.device.speak.event.SpeakEvent
 import net.bible.service.download.DownloadManager
 import net.bible.service.cloudsync.CloudSync
+import net.bible.service.cloudsync.CloudSyncEvent
 import net.bible.service.download.FakeBookFactory
 import net.bible.service.sword.BookAndKey
 import net.bible.service.sword.BookAndKeySerialized
@@ -1064,6 +1065,10 @@ class MainBibleActivity : CustomTitlebarActivityBase() {
         updateTitle()
     }
 
+    fun onEventMainThread(event: CloudSyncEvent) {
+        binding.syncIcon.visibility = if(event.running) View.VISIBLE else View.INVISIBLE
+    }
+
     private fun openLink(uri: Uri) {
         when (uri.host) {
             "read.andbible.org" -> {

diff --git a/app/src/main/java/net/bible/service/cloudsync/SyncService.kt b/app/src/main/java/net/bible/service/cloudsync/SyncService.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.bible.android.activity.R
+import net.bible.android.control.event.ABEventBus
 import net.bible.service.common.BuildVariant
 import net.bible.service.common.CALC_NOTIFICATION_CHANNEL
 import net.bible.service.common.CommonUtils
@@ -38,6 +39,8 @@ private const val SYNC_NOTIFICATION_ID=2
 const val SYNC_NOTIFICATION_CHANNEL="sync-notifications"
 private const val WAKELOCK_TAG = "andbible:sync-wakelock"
 
+class CloudSyncEvent(val running: Boolean = false)
+
 class SyncService: Service() {
     companion object {
         const val START_SERVICE="action_start_service"
@@ -92,12 +95,14 @@ class SyncService: Service() {
         wakeLock.acquire(5*60*1000) // 5 minutes
 
         scope.launch {
+            ABEventBus.post(CloudSyncEvent(true))
             CloudSync.synchronize()
             CloudSync.waitUntilFinished(true)
             Log.i(TAG, "Synchronize finished")
             if(wakeLock.isHeld) {
                 wakeLock.release()
             }
+            ABEventBus.post(CloudSyncEvent(false))
             stop()
         }
     }

diff --git a/app/src/main/res/layout/main_bible_view.xml b/app/src/main/res/layout/main_bible_view.xml
@@ -144,6 +144,18 @@
                     />
 
             </LinearLayout>
+
+            <ImageView
+                android:id="@+id/syncIcon"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_backup_restore_24dp"
+                app:tint="?attr/toolbarTextColor"
+                android:visibility="invisible"
+                />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout