feat/style: include modify all records measure units and change icon …

…for release
cromega08 · Dec 20, 2024 · 7c81f33 · 7c81f33
1 parent b9d6cc5
commit 7c81f33
Show file tree

Hide file tree

Showing 45 changed files with 820 additions and 222 deletions.
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/cromega/studio/measurepedia/data/local/files/UserInfo.kt b/app/src/main/java/cromega/studio/measurepedia/data/local/files/UserInfo.kt
@@ -14,12 +14,15 @@ class UserInfo(
 
     var language: Languages
     var darkTheme: Boolean
+    var defaultMetricSystemUnitId: Int
 
     init {
         try { readJSONFile() }
-        catch (e: Exception) {
+        catch (e: Exception)
+        {
             Locale.getDefault()
-            updateUserInfo(jsonString = generateDefaultUserInfoJSON()) }
+            updateUserInfo(jsonString = generateDefaultUserInfoJSON())
+        }
         finally {
             val json: JSONObject = readJSONFile()
             language =
@@ -28,6 +31,7 @@ class UserInfo(
                         localeAcronym = json.get("language") as String
                     )
             darkTheme = json.get("dark_theme") as Boolean
+            defaultMetricSystemUnitId = json.get("default_metric_system_unit_id") as Int
         }
     }
 
@@ -40,7 +44,7 @@ class UserInfo(
         val selectedLanguage: Languages =
             Languages.findFromLocaleAcronym(localeAcronym = locale)
 
-        return """{"language":"${selectedLanguage.localeAcronym}","dark_theme":false}"""
+        return """{"language":"${selectedLanguage.localeAcronym}","dark_theme":false,"default_metric_system_unit_id":1}"""
     }
 
     private fun updateUserInfo(jsonString: String) =
@@ -57,5 +61,5 @@ class UserInfo(
     }
 
     override fun toString(): String =
-        """{"language":"${language.localeAcronym}","dark_theme":$darkTheme}"""
+        """{"language":"${language.localeAcronym}","dark_theme":$darkTheme,"default_metric_system_unit_id":$defaultMetricSystemUnitId}"""
 }
diff --git a/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/FieldsManager.kt b/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/FieldsManager.kt
@@ -5,7 +5,6 @@ import cromega.studio.measurepedia.data.database.tables.instances.MetricSystemsU
 import cromega.studio.measurepedia.data.database.tables.instances.PersonsTable
 import cromega.studio.measurepedia.data.database.tables.instances.RecordsTable
 import cromega.studio.measurepedia.data.models.instances.Field
-import cromega.studio.measurepedia.data.models.instances.MetricSystemUnit
 import cromega.studio.measurepedia.extensions.extractIds
 import cromega.studio.measurepedia.extensions.isNeitherNullOrEmpty
 import cromega.studio.measurepedia.extensions.isNotNull
@@ -42,7 +41,7 @@ class FieldsManager(
         }
     }
 
-    fun insert(name: String, bodyPartId: Int, active: Boolean? = null)
+    fun insert(name: String, bodyPartId: Int, active: Boolean? = null, defaultMetricSystemUnitId: Int)
     {
         val insertedFieldId: Long = fieldsTable
             .insert(
@@ -51,8 +50,6 @@ class FieldsManager(
                 active = active
             )
 
-        val defaultMetricSystemUnit: MetricSystemUnit = metricSystemsUnitsTable.readAll()[0]
-
         if (insertedFieldId > 0)
         {
             personsTable
@@ -62,7 +59,7 @@ class FieldsManager(
                         .insert(
                             personId = person.id,
                             fieldId = insertedFieldId.toInt(),
-                            metricSystemUnitId = defaultMetricSystemUnit.id
+                            metricSystemUnitId = defaultMetricSystemUnitId
                         )
                 }
         }

diff --git a/...ain/java/cromega/studio/measurepedia/data/managers/instances/MetricSystemsUnitsManager.kt b/...ain/java/cromega/studio/measurepedia/data/managers/instances/MetricSystemsUnitsManager.kt
@@ -26,17 +26,11 @@ class MetricSystemsUnitsManager(
                 abbreviation = abbreviation
             )
 
-    fun delete(id: Int)
+    fun delete(id: Int, defaultMetricSystemUnitId: Int)
     {
-        val metricSystemUnits: List<MetricSystemUnit> =
-            metricSystemsUnitsTable.readAll()
-
         val records: List<Record> =
             recordsTable.readAll()
 
-        val defaultMetricSystemUnit: MetricSystemUnit =
-            metricSystemUnits.find { it.id != id }!!
-
         records
             .forEach { record ->
                 if (record.metricSystemUnitId == id)
@@ -46,13 +40,13 @@ class MetricSystemsUnitsManager(
                             personId = record.personId,
                             fieldId = record.fieldId,
                             measure = record.measure,
-                            metricSystemUnitId = defaultMetricSystemUnit.id
+                            metricSystemUnitId = defaultMetricSystemUnitId
                         )
             }
 
         metricSystemsUnitsTable.delete(id = id)
     }
 
-    fun deleteByIds(ids: List<Int>) =
-        ids.forEach { metricSystemUnitIndex -> delete(id = metricSystemUnitIndex) }
+    fun deleteByIds(ids: List<Int>, defaultMetricSystemUnitId: Int) =
+        ids.forEach { metricSystemUnitIndex -> delete(id = metricSystemUnitIndex, defaultMetricSystemUnitId = defaultMetricSystemUnitId) }
 }
diff --git a/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/PersonsManager.kt b/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/PersonsManager.kt
@@ -4,8 +4,6 @@ import cromega.studio.measurepedia.data.database.tables.instances.FieldsTable
 import cromega.studio.measurepedia.data.database.tables.instances.MetricSystemsUnitsTable
 import cromega.studio.measurepedia.data.database.tables.instances.PersonsTable
 import cromega.studio.measurepedia.data.database.tables.instances.RecordsTable
-import cromega.studio.measurepedia.data.models.instances.Field
-import cromega.studio.measurepedia.data.models.instances.MetricSystemUnit
 import cromega.studio.measurepedia.data.models.instances.Person
 import cromega.studio.measurepedia.enums.DateOrder
 import cromega.studio.measurepedia.enums.MeasuredOrder
@@ -53,7 +51,7 @@ class PersonsManager(
                 }
             }
 
-    fun insert(name: String, alias: String? = null, updated: Date? = null)
+    fun insert(name: String, alias: String? = null, updated: Date? = null, defaultMetricSystemUnitId: Int)
     {
         val personInsertResult: Int =
             personsTable
@@ -64,21 +62,16 @@ class PersonsManager(
                 )
                 .toInt()
 
-        val personInsertedCorrectly: Boolean = personInsertResult > 0
-
-        if (personInsertedCorrectly)
-        {
-            val metricSystemUnitDefault: MetricSystemUnit = metricSystemsUnitsTable.readAll()[0]
-            val fields: List<Field> = fieldsTable.readAll()
-
-            fields.forEach { field ->
-                recordsTable.insert(
-                    personId = personInsertResult,
-                    fieldId = field.id,
-                    metricSystemUnitId = metricSystemUnitDefault.id
-                )
-            }
-        }
+        if (personInsertResult > 0)
+            fieldsTable
+                .readAll()
+                .forEach { field ->
+                    recordsTable.insert(
+                        personId = personInsertResult,
+                        fieldId = field.id,
+                        metricSystemUnitId = defaultMetricSystemUnitId
+                    )
+                }
     }
 
     fun update(id: Int, name: String, alias: String? = null, updated: Date? = null, measured: Boolean? = null) =

diff --git a/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/RecordsManager.kt b/app/src/main/java/cromega/studio/measurepedia/data/managers/instances/RecordsManager.kt
@@ -63,6 +63,45 @@ class RecordsManager(
                 metricSystemUnitId = metricSystemUnitId
             )
 
+    fun updateRecordsRequiringDefaultMetricSystemUnitId(metricSystemUnitId: Int)
+    {
+        val records: List<Record> = recordsTable.readAll()
+
+        records
+            .forEach { record ->
+                if (record.metricSystemUnitId == 0)
+                {
+                    record.metricSystemUnitId = metricSystemUnitId
+
+                    update(
+                        id = record.id,
+                        personId = record.personId,
+                        fieldId = record.fieldId,
+                        measure = record.measure,
+                        metricSystemUnitId = record.metricSystemUnitId
+                    )
+                }
+            }
+    }
+
+    fun updateAllRecordsMetricSystemUnitId(metricSystemUnitId: Int)
+    {
+        val records: List<Record> = recordsTable.readAll()
+
+        records
+            .forEach { record ->
+                record.metricSystemUnitId = metricSystemUnitId
+
+                update(
+                    id = record.id,
+                    personId = record.personId,
+                    fieldId = record.fieldId,
+                    measure = record.measure,
+                    metricSystemUnitId = record.metricSystemUnitId
+                )
+            }
+    }
+
     fun delete(id: Int) = recordsTable.delete(id = id)
 
     fun deleteByFieldsIds(fieldIds: List<Int>) =

diff --git a/app/src/main/java/cromega/studio/measurepedia/ui/activities/fields/FieldsActivity.kt b/app/src/main/java/cromega/studio/measurepedia/ui/activities/fields/FieldsActivity.kt
@@ -24,6 +24,7 @@ class FieldsActivity : Activity<FieldsViewModel, FieldsScreen>()
             FieldsScreen(
                 viewModel = viewModel,
                 resources = resources,
+                darkTheme = userInfo.darkTheme,
                 showToastFunction = ::showInsufficientToast
             )
     }