Merge pull request #108 from AdamGuidarini/vc26

Vc26
AdamGuidarini · Jun 14, 2024 · 1fa817d · 1fa817d
2 parents 6467cdc + b852ae2
commit 1fa817d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         targetSdkVersion 33
         compileSdk 34
 
-        versionCode 25
-        versionName "0.12.6"
+        versionCode 26
+        versionName "0.12.7"
         resourceConfigurations += ['en', 'de', 'es']
 
 

diff --git a/app/src/main/java/projects/medicationtracker/Dialogs/DoseInfoDialog.java b/app/src/main/java/projects/medicationtracker/Dialogs/DoseInfoDialog.java
@@ -83,7 +83,7 @@ public Dialog onCreateDialog(Bundle savedInstances) {
 
         infoDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
 
-        thisDose = nativeDb.getDoseById(doseId);
+        thisDose = doseId != -1 ? nativeDb.getDoseById(doseId) : new Dose();
 
         timeTaken = infoDialog.findViewById(R.id.dose_time_taken);
         dateTaken = infoDialog.findViewById(R.id.dose_date_taken);

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -102,7 +102,7 @@
     <string name="medication_dosage">Dosierung</string>
     <string name="medication_frequency">Häufigkeit</string>
     <string name="taken_every">Eingenommen jeden</string>
-    <string name="units">Einheiten</string>
+    <string name="units">Dosierungseinheit</string>
     <string name="taken">Eingenommen</string>
     <string name="frequency">Häufigkeit</string>
     <string name="multiple_times_per_day">Mehrmals pro Tag</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -100,18 +100,18 @@
     <string name="medication_dosage">Dosis</string>
     <string name="medication_frequency">Frecuencia</string>
     <string name="taken_every">Tomado cada</string>
-    <string name="units">Unidades</string>
+    <string name="units">Unidad de Dosis</string>
     <string name="taken">Tomado</string>
     <string name="frequency">Frecuencia</string>
     <string name="multiple_times_per_day">Varias veces por día</string>
     <string name="as_needed">Según necesidad</string>
     <string name="daily">Diario</string>
     <string name="weekly">Semanal</string>
     <string name="monthly">Mensual</string>
-    <string name="medication_name_amp_dosage"><![CDATA[Medication Name & Dosage]]></string>
+    <string name="medication_name_amp_dosage"><![CDATA[Nombre del medicamento y dosis]]></string>
     <string name="who_takes_this_medication">¿Quién toma este medicamento?</string>
     <string name="someone_else">Alguien más</string>
-    <string name="what_is_the_medication_s_name_amp_how_much_is_taken"><![CDATA[What is the medication\'s name & how much is taken?]]></string>
+    <string name="what_is_the_medication_s_name_amp_how_much_is_taken"><![CDATA[¿Cuál es el nombre del medicamento y cuánto se toma?]]></string>
     <string name="alias_for_notifications">Alias para notificaciones</string>
     <string name="how_often_is_the_medication_taken">¿Cada cuánto se toma el medicamento?</string>
     <string name="start_date">Fecha de inicio</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -100,7 +100,7 @@
     <string name="medication_dosage">Dosage</string>
     <string name="medication_frequency">Frequency</string>
     <string name="taken_every">Taken Every</string>
-    <string name="units">Units</string>
+    <string name="units">Dosage Unit</string>
     <string name="taken">Taken</string>
     <string name="frequency">Frequency</string>
     <string name="multiple_times_per_day">Multiple Times per Day</string>