Merge pull request #93 from mubeen1519/work

added version number and name on wear os build and bug fix
Crazy-Marvin · Aug 26, 2024 · 2690793 · 2690793
2 parents 23b6438 + e61976a
commit 2690793
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 8 deletions.
diff --git a/android/app/release/app-release.aab b/android/app/release/app-release.aab
diff --git a/android/app/release/baselineProfiles/0/FucksGiven-1.0.0-release.dm b/android/app/release/baselineProfiles/0/FucksGiven-1.0.0-release.dm
diff --git a/android/app/release/baselineProfiles/1/FucksGiven-1.0.0-release.dm b/android/app/release/baselineProfiles/1/FucksGiven-1.0.0-release.dm
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "rocks.poopjournal.fucksgiven",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0.0",
+      "outputFile": "FucksGiven-1.0.0-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/FucksGiven-1.0.0-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/FucksGiven-1.0.0-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 26
+}
diff --git a/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt b/android/app/src/main/java/rocks/poopjournal/fucksgiven/data/DatabaseBackup.kt
@@ -17,7 +17,7 @@ class DatabaseBackupManager @Inject constructor(
     private val context: Context,
     private val fuckDatabase: FuckDatabase
 ) {
-    fun backupDatabase(): Int {
+    fun backupDatabase(message : String): Int {
         var result = -99
         val dbFile = context.getDatabasePath(THEDATABASE_DATABASE_NAME)
         val dbWalFile = File(dbFile.path + SQLITE_WALFILE_SUFFIX)
@@ -34,7 +34,7 @@ class DatabaseBackupManager @Inject constructor(
             if (dbWalFile.exists()) dbWalFile.copyTo(bkpWalFile, true)
             if (dbShmFile.exists()) dbShmFile.copyTo(bkpShmFile, true)
             result = 0
-            Toast.makeText(context, "Database backed up Successfully", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
         } catch (e: IOException) {
             e.printStackTrace()
         }

diff --git a/...oid/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt b/...oid/app/src/main/java/rocks/poopjournal/fucksgiven/presentation/screens/SettingsScreen.kt
@@ -47,7 +47,7 @@ import rocks.poopjournal.fucksgiven.presentation.viewmodel.SettingsViewModel
 @Composable
 fun SettingScreen(navController: NavHostController, viewModel: SettingsViewModel) {
     var showDialog by remember { mutableStateOf(false) }
-
+    val toastMessage = stringResource(id = R.string.backup_success)
     Scaffold(
         topBar = {
             TopAppBar(
@@ -127,7 +127,7 @@ fun SettingScreen(navController: NavHostController, viewModel: SettingsViewModel
                         .height(50.dp)
                         .padding(11.dp)
                         .clickable {
-                            viewModel.backupDatabase()
+                            viewModel.backupDatabase(toastMessage)
                         },
                     verticalAlignment = Alignment.CenterVertically
                 ) {

diff --git a/...pp/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt b/...pp/src/main/java/rocks/poopjournal/fucksgiven/presentation/viewmodel/SettingsViewModel.kt
@@ -18,9 +18,9 @@ class SettingsViewModel @Inject constructor(
     lateinit var themeSetting: ThemeSetting
 
 
-    fun backupDatabase() {
+    fun backupDatabase(message : String) {
         viewModelScope.launch {
-            val result = databaseBackupManager.backupDatabase()
+            val result = databaseBackupManager.backupDatabase(message)
             // Handle the result
         }
     }

diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
@@ -14,6 +14,7 @@
     <string name="apperance">Erscheinungsbild</string>
     <string name="data">Daten</string>
     <string name="backup">Sicherung</string>
+    <string name="backup_success">Datenbanksicherung erfolgreich</string>
     <string name="restore">Wiederherstellen</string>
     <string name="select_theme">Thema wählen</string>
     <string name="stats">Statistiken</string>

diff --git a/android/app/src/main/res/values-eo/strings.xml b/android/app/src/main/res/values-eo/strings.xml
@@ -14,6 +14,7 @@
     <string name="apperance">Aspekto</string>
     <string name="data">Datumoj</string>
     <string name="backup">Rezervo</string>
+    <string name="backup_success">Sekurkopio de datumbazo sukcese</string>
     <string name="restore">Restaŭri</string>
     <string name="select_theme">Elektu Temon</string>
     <string name="stats">Statoj</string>

diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
@@ -14,6 +14,7 @@
     <string name="apperance">Apparence</string>
     <string name="data">Données</string>
     <string name="backup">Sauvegarde</string>
+    <string name="backup_success">Sauvegarde de la base de données réussie</string>
     <string name="restore">Restaurer</string>
     <string name="select_theme">Sélectionne un thème</string>
     <string name="stats">Statistiques</string>

diff --git a/android/app/src/main/res/values-ur/strings.xml b/android/app/src/main/res/values-ur/strings.xml
@@ -14,6 +14,7 @@
     <string name="apperance">ظہور</string>
     <string name="data">ڈیٹا</string>
     <string name="backup">بیک اپ</string>
+    <string name="backup_success">ڈیٹا بیس کا بیک اپ کامیابی کے ساتھ</string>
     <string name="restore">بحال کریں۔</string>
     <string name="select_theme">تھیم منتخب کریں۔</string>
     <string name="stats">اعدادوشمار</string>

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="apperance">Appearance</string>
     <string name="data">Data</string>
     <string name="backup">Backup</string>
+    <string name="backup_success">Database backup successfully</string>
     <string name="restore">Restore</string>
     <string name="select_theme">Select Theme</string>
     <string name="stats">Stats</string>
@@ -90,4 +91,5 @@
     <string name="mit_license" translatable="false">MIT License</string>
     <string name="android_jetpack" translatable="false">Android Jetpack</string>
     <string name="apache_license" translatable="false">Apache License 2.0</string>
+
 </resources>
diff --git a/wear/app/build.gradle.kts b/wear/app/build.gradle.kts
@@ -14,11 +14,12 @@ android {
         minSdk = 30
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0"
         vectorDrawables {
             useSupportLibrary = true
         }
-
+        setProperty("archivesBaseName", "FucksGivenWear-$versionName")
+        aaptOptions.cruncherEnabled = false
     }
 
     buildTypes {

diff --git a/wear/app/release/FucksGivenWear-1.0.0-release.aab b/wear/app/release/FucksGivenWear-1.0.0-release.aab
diff --git a/wear/app/release/baselineProfiles/0/FucksGivenWear-1.0.0-release.dm b/wear/app/release/baselineProfiles/0/FucksGivenWear-1.0.0-release.dm
diff --git a/wear/app/release/baselineProfiles/1/FucksGivenWear-1.0.0-release.dm b/wear/app/release/baselineProfiles/1/FucksGivenWear-1.0.0-release.dm
diff --git a/wear/app/release/output-metadata.json b/wear/app/release/output-metadata.json
@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "rocks.poopjournal.fucksgivenwatch",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0.0",
+      "outputFile": "FucksGivenWear-1.0.0-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/FucksGivenWear-1.0.0-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/FucksGivenWear-1.0.0-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 30
+}