login: smoother sync status updating (fixes #13543) (#13544)

Co-authored-by: dogi <dogi@users.noreply.github.com>

Author: Okuro3499

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 5584
-        versionName = "0.55.84"
+        versionCode = 5585
+        versionName = "0.55.85"
         ndkVersion = '26.3.11579264'
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt

@@ -121,6 +121,8 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
         btnLang = binding.btnLang
         inputName = binding.inputName
         inputPassword = binding.inputPassword
+        dotSync = binding.dotSync
+        txtSyncState = binding.txtSyncState
     }
 
     private fun setupAvailableSpace() {
@@ -164,8 +166,10 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
             binding.openCommunity.setOnClickListener {
                 HomeCommunityDialogFragment().show(supportFragmentManager, "")
             }
+            syncIcon.visibility = View.VISIBLE
         } else {
             binding.openCommunity.visibility = View.GONE
+            syncIcon.visibility = View.GONE
         }
         binding.btnFeedback.setOnClickListener {
             if (getUrl() != "/db") {
@@ -561,6 +565,10 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
         val savedUsers = withContext(dispatcherProvider.io) { prefData.getSavedUsers().toMutableList() }
         mAdapter?.submitList(savedUsers)
 
+        val hasUsers = savedUsers.isNotEmpty()
+        binding.tvWelcome.setText(if (hasUsers) R.string.welcome_back else R.string.welcome_new)
+        binding.tvSubtitle.setText(if (hasUsers) R.string.sign_in_to_continue else R.string.sign_in_to_get_started)
+
         binding.recyclerView.isNestedScrollingEnabled = true
         binding.recyclerView.scrollBarStyle = View.SCROLLBARS_INSIDE_OVERLAY
         binding.recyclerView.isVerticalScrollBarEnabled = true

app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt

@@ -99,6 +99,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
     private var syncTimeInterval = intArrayOf(60 * 60, 3 * 60 * 60)
     lateinit var syncIcon: ImageView
     lateinit var syncIconDrawable: AnimationDrawable
+    protected var dotSync: View? = null
+    protected var txtSyncState: TextView? = null
     @Inject
     lateinit var profileDbHandler: UserSessionManager
     lateinit var spnCloud: Spinner
@@ -465,6 +467,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
             customProgressDialog.setText(getString(R.string.syncing_data_please_wait))
             customProgressDialog.show()
             isProgressDialogShowing = true
+            txtSyncState?.text = getString(R.string.sync_chip_syncing)
+            dotSync?.backgroundTintList = android.content.res.ColorStateList.valueOf(0xFFF59E0B.toInt())
         }
     }
 
@@ -479,6 +483,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
                 syncIconDrawable.selectDrawable(0)
                 syncIcon.invalidateDrawable(syncIconDrawable)
             }
+            txtSyncState?.text = getString(R.string.sync_chip_offline)
+            dotSync?.backgroundTintList = android.content.res.ColorStateList.valueOf(0xFFEF4444.toInt())
             showAlert(this@SyncActivity, getString(R.string.sync_failed), msg)
             showWifiSettingDialog(this@SyncActivity)
         }
@@ -592,6 +598,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
         if (::lblLastSyncDate.isInitialized) {
             if (prefData.getLastSync() <= 0) {
                 lblLastSyncDate.text = getString(R.string.last_synced_never)
+                txtSyncState?.text = getString(R.string.sync_chip_offline)
+                dotSync?.backgroundTintList = android.content.res.ColorStateList.valueOf(0xFFEF4444.toInt())
             } else {
                 val lastSyncMillis = prefData.getLastSync()
                 var relativeTime = TimeUtils.getRelativeTime(lastSyncMillis)
@@ -601,6 +609,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), ConfigurationsRepositor
                 }
 
                 lblLastSyncDate.text = getString(R.string.last_sync, relativeTime)
+                txtSyncState?.text = getString(R.string.sync_chip_synced)
+                dotSync?.backgroundTintList = android.content.res.ColorStateList.valueOf(0xFF22C55E.toInt())
             }
         }
         if (autoSynFeature(Constants.KEY_AUTOSYNC_, applicationContext) && autoSynFeature(Constants.KEY_AUTOSYNC_WEEKLY, applicationContext)) {

app/src/main/res/drawable/bg_lang_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="#66FFFFFF" />
+    <corners android:radius="999dp" />
+</shape>

app/src/main/res/drawable/bg_sync_chip.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/field_fill" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/md_blue_100" />
+    <corners android:radius="999dp" />
+</shape>

app/src/main/res/drawable/dot_sync_ok.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#22C55E" />
+    <size
+        android:width="8dp"
+        android:height="8dp" />
+</shape>