update: updated versions

Reviewed-on: #1

mobile/build.gradle.kts

@@ -23,12 +23,15 @@ android {
         minSdk = 30
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "2.3.1"
+        versionName = "2.5.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(

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

@@ -131,7 +131,7 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
         )
     }
 
-    Page("Backup", innerPadding) {
+    Page(stringResource(R.string.backup), innerPadding) {
         FullWidthButton(
             onClick = {
                 createBackupLauncher.launch("omnicards-backup.json")

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

@@ -47,6 +47,7 @@ fun Page(name: String, innerPadding: PaddingValues, content: @Composable () -> U
                 .fillMaxSize()
                 .padding(horizontal = 16.dp)
                 .background(MaterialTheme.colorScheme.background)
+                .padding(top = 16.dp)
         ) {
             content()
         }

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

@@ -4,9 +4,19 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -28,15 +38,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import ru.omni_devel.cards.ui.theme.OmniCardsTheme
 
+private const val ANIMATION_DELAY = 300L
+
 class MainActivity : ComponentActivity() {
     private lateinit var db: DbHelper
 
@@ -81,18 +96,25 @@ fun MainPage(
 ) {
     val context = LocalContext.current
     val uriHandler = LocalUriHandler.current
+    val scope = rememberCoroutineScope()
 
     var isActionBarShowed by remember { mutableStateOf(false) }
 
     Box(
         modifier = Modifier.fillMaxSize()
     ) {
+        BackHandler(
+            enabled = isActionBarShowed,
+        ) {
+            isActionBarShowed = false
+        }
+
         Page(
             stringResource(R.string.app_name),
             innerPadding
         ) {
             Column(
-                modifier = Modifier.verticalScroll(rememberScrollState()).padding(bottom = 64.dp).background(Color.Transparent).padding(top = 16.dp),
+                modifier = Modifier.verticalScroll(rememberScrollState()).padding(bottom = 64.dp).background(Color.Transparent),
                 verticalArrangement = Arrangement.spacedBy(8.dp)
             ) {
                 if (cards.isEmpty()) {
@@ -108,11 +130,33 @@ fun MainPage(
         }
 
         if (isActionBarShowed) {
-            Column(
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null
+                    ) {
+                        isActionBarShowed = false
+                    }
+            ) { }
+        }
+
+        AnimatedVisibility(
             modifier = Modifier
                 .align(Alignment.BottomEnd)
                 .padding(innerPadding)
-                    .padding(16.dp)
+                .padding(16.dp),
+            visible = isActionBarShowed,
+            enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
+            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut()
+        ) {
+            Column(
+                modifier = Modifier
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null
+                    ) {}
                     .background(
                         MaterialTheme.colorScheme.inversePrimary,
                         RoundedCornerShape(24.dp)
@@ -124,10 +168,14 @@ fun MainPage(
                     onClick = {
                         isActionBarShowed = false
 
+                        scope.launch {
+                            delay(ANIMATION_DELAY)
+
                             val intent = Intent(context, EditCardActivity::class.java)
 
                             context.startActivity(intent)
                         }
+                    }
                 ) {
                     Text(stringResource(R.string.do_add_card))
                 }
@@ -150,11 +198,15 @@ fun MainPage(
                 }
                 FullWidthButton(
                     onClick = {
+                        isActionBarShowed = false
+
+                        scope.launch {
+                            delay(ANIMATION_DELAY)
+
                             val intent = Intent(context, BackupActivity::class.java)
 
                             context.startActivity(intent)
-
-                        isActionBarShowed = false
+                        }
                     }
                 ) {
                     Text(stringResource(R.string.open_backup_menu))
@@ -176,11 +228,19 @@ fun MainPage(
                     Text(">")
                 }
             }
-        } else {
-            Button(
+        }
+
+        AnimatedVisibility(
             modifier = Modifier
                 .align(Alignment.BottomEnd)
-                    .padding(innerPadding).padding(32.dp),
+                .padding(innerPadding)
+                .padding(32.dp),
+            visible = !isActionBarShowed,
+            enter = fadeIn() + scaleIn(),
+            exit = fadeOut() + scaleOut()
+        ){
+            Button(
+                modifier = Modifier,
                 onClick = {
                     isActionBarShowed = true
                 }

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

@@ -2,7 +2,6 @@ package ru.omni_devel.cards
 
 import android.content.Context
 import android.graphics.Bitmap
-import androidx.compose.ui.platform.LocalContext
 import com.google.android.gms.wearable.Wearable
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.MultiFormatWriter
@@ -10,7 +9,13 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
 
 fun generateCode(value: String, format: BarcodeFormat): Bitmap {
     val writer = MultiFormatWriter()
-    val matrix = writer.encode(value, format, 800, 400)
+
+    val (width, height) = when (format) {
+        BarcodeFormat.QR_CODE, BarcodeFormat.DATA_MATRIX, BarcodeFormat.AZTEC -> 800 to 800
+        else -> 800 to 400
+    }
+
+    val matrix = writer.encode(value, format, width, height)
 
     return BarcodeEncoder().createBitmap(matrix)
 }

mobile/src/main/res/values-ru/strings.xml

@@ -11,7 +11,8 @@
     <string name="sync_is_successful">Успешная синхронизация</string>
     <string name="sync_is_fail">Ошибка синхронизации. Проверьте подключение к часам</string>
 
-    <string name="open_backup_menu">Бэкап/восстановление</string>
+    <string name="backup">Резервное копирование</string>
+    <string name="open_backup_menu">Резервное копирование</string>
     <string name="do_backup">Сохранить данные</string>
     <string name="do_restore">Восстановить данные</string>
     <string name="ask_do_restore">Восстановить данные?</string>

mobile/src/main/res/values/strings.xml

@@ -16,7 +16,8 @@
     <string name="sync_is_successful">Sync successful</string>
     <string name="sync_is_fail">Sync failed. Check your watch connection</string>
 
-    <string name="open_backup_menu">Backup / Restore</string>
+    <string name="backup">Backup</string>
+    <string name="open_backup_menu">Backup</string>
     <string name="do_backup">Save data</string>
     <string name="do_restore">Restore data</string>
     <string name="ask_do_restore">Restore data?</string>

wear/build.gradle.kts

@@ -23,7 +23,7 @@ android {
         minSdk = 30
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "1.3.0"
+        versionName = "1.4.0"
     }
 
     buildTypes {