feat: added sync with WearOS on card delete

mobile/build.gradle.kts

@@ -23,7 +23,7 @@ android {
         minSdk = 30
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "4.2.1"
+        versionName = "4.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt

@@ -63,6 +63,7 @@ class MainActivity : ComponentActivity() {
                     MainPage(innerPadding, cards, onDeleteCard = { cardId ->
                         db.removeCard(cardId)
                         cards.removeIf { it.id == cardId }
+                        syncCardsWithWatch(this, db.getCards())
                     }, getDbFun = {
                         return@MainPage db
                     })
@@ -76,6 +77,8 @@ class MainActivity : ComponentActivity() {
 
         cards.clear()
         cards.addAll(db.getCards())
+
+        syncCardsWithWatch(this, db.getCards())
     }
 }
 
@@ -114,12 +117,13 @@ fun MainPage(
                         NavigationPageData(stringResource(R.string.do_add_card), Icons.Outlined.Add, EditCardActivity::class.java),
                         NavigationPageData(stringResource(R.string.do_sync), Icons.Outlined.Sync) {
                             Toast.makeText(context, context.getString(R.string.sync_in_progress), Toast.LENGTH_SHORT).show()
-                            sendToWatch(context, "/updateCards", Json.encodeToString(getDbFun().getCards())) { isSuccess ->
+
-                                if (isSuccess) {
+                            val isSuccess = syncCardsWithWatch(context, getDbFun().getCards())
-                                    Toast.makeText(context, context.getString(R.string.sync_is_successful), Toast.LENGTH_SHORT).show()
+
-                                } else {
+                            if (isSuccess) {
-                                    Toast.makeText(context, context.getString(R.string.sync_is_fail), Toast.LENGTH_LONG).show()
+                                Toast.makeText(context, context.getString(R.string.sync_is_successful), Toast.LENGTH_SHORT).show()
-                                }
+                            } else {
+                                Toast.makeText(context, context.getString(R.string.sync_is_fail), Toast.LENGTH_LONG).show()
                             }
                         },
                         NavigationPageData(stringResource(R.string.open_backup_menu), Icons.Outlined.Backup, BackupActivity::class.java),

mobile/src/main/java/ru/omni_devel/cards/Utils.kt

@@ -14,7 +14,9 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
 import org.json.JSONObject
 import java.io.ByteArrayOutputStream
 import android.util.Base64
+import android.widget.Toast
 import androidx.compose.ui.graphics.asImageBitmap
+import kotlinx.serialization.json.Json
 
 fun generateCode(value: String, format: BarcodeFormat): Bitmap {
     val writer = MultiFormatWriter()
@@ -33,12 +35,14 @@ fun generateCode(value: String, format: BarcodeFormat): Bitmap {
     return BarcodeEncoder().createBitmap(matrix)
 }
 
-fun sendToWatch(context: Context, path: String, message: String, onResult: (Boolean) -> Unit) {
+fun sendToWatch(context: Context, path: String, message: String): Boolean {
     val nodeClient = Wearable.getNodeClient(context)
 
+    var isSuccess = false
+
     nodeClient.connectedNodes.addOnSuccessListener { nodes ->
         if (nodes.isEmpty()) {
-            onResult(false)
+            isSuccess = false
 
             return@addOnSuccessListener
         }
@@ -59,13 +63,19 @@ fun sendToWatch(context: Context, path: String, message: String, onResult: (Bool
                 }
 
                 if (completedCount == nodes.size) {
-                    onResult(isAnySuccess)
+                    isSuccess = isAnySuccess
                 }
             }.addOnFailureListener(context.mainExecutor) {
-                onResult(false)
+                isSuccess = false
             }
         }
     }
+
+    return isSuccess
+}
+
+fun syncCardsWithWatch(context: Context, cards: List<CardInfo>): Boolean {
+    return sendToWatch(context, "/updateCards", Json.encodeToString(cards))
 }
 
 fun checkCardData(name: String, value: String): Int? {

wear/build.gradle.kts

@@ -23,7 +23,7 @@ android {
         minSdk = 30
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "3.2.0"
+        versionName = "3.3.0"
     }
 
     buildTypes {
@@ -72,4 +72,5 @@ dependencies {
     implementation(libs.material)
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
     implementation("androidx.compose.material:material-icons-extended")
+    implementation("androidx.lifecycle:lifecycle-process:2.8.7")
 }

wear/src/main/java/ru/omni_devel/cards/presentation/MainActivity.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -22,16 +23,25 @@ import ru.omni_devel.cards.R
 
 class MainActivity : ComponentActivity() {
     private lateinit var db: DbHelper
+    private val cardsState = mutableStateOf<List<CardInfo>>(emptyList())
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         db = DbHelper(this, null)
 
+        cardsState.value = db.getCards()
+
         setContent {
-            App(db.getCards())
+            App(cardsState.value)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        cardsState.value = db.getCards()
+    }
 }
 
 @SuppressLint("UnusedBoxWithConstraintsScope")

wear/src/main/java/ru/omni_devel/cards/presentation/MessagesReciever.kt

@@ -8,6 +8,8 @@ import com.google.android.gms.wearable.MessageEvent
 import com.google.android.gms.wearable.WearableListenerService
 import kotlinx.serialization.json.Json
 import ru.omni_devel.cards.R
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.Lifecycle
 
 class MessagesReceiver : WearableListenerService() {
     private lateinit var db: DbHelper
@@ -28,13 +30,23 @@ class MessagesReceiver : WearableListenerService() {
                 db.clearDatabase()
                 db.addCards(cards)
 
-                Handler(Looper.getMainLooper()).post {
+                val isAppInForeground = ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(
-                    Toast.makeText(this, this.getString(R.string.sync_is_successful), Toast.LENGTH_SHORT).show()
+                    Lifecycle.State.STARTED
+                )
 
-                    val intent = Intent(this, MainActivity::class.java).apply {
+                if (isAppInForeground) {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                    Handler(Looper.getMainLooper()).post {
+                        Toast.makeText(
+                            this,
+                            this.getString(R.string.sync_is_successful),
+                            Toast.LENGTH_SHORT
+                        ).show()
+
+                        val intent = Intent(this, MainActivity::class.java).apply {
+                            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                        }
+                        startActivity(intent)
                     }
-                    startActivity(intent)
                 }
             }
         }