Merge pull request #661 from Futsch1/arabic

Arabic

Author: Futsch1

app/build.gradle.kts

@@ -23,12 +23,12 @@ android {
         minSdk = 28
         multiDexEnabled = true
         targetSdk = 36
-        versionCode = 119
-        versionName = "1.17.2"
+        versionCode = 120
+        versionName = "1.17.3"
         base.archivesName = "MedTimer"
         // Use this deprecated setting because Android Lint will not pick up androidResources.localeFilters correctly
         @Suppress("DEPRECATION")
-        resConfigs("en,de,es,fr,it,nl,pl,pt,ru,sv,ta,tr,uk,zh-rCN")
+        resConfigs("en,ar,de,es,fr,it,nl,pl,pt,ru,sv,ta,tr,uk,zh-rCN")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments.putAll(
@@ -62,7 +62,7 @@ android {
     @Suppress("UnstableApiUsage")
     androidResources {
         generateLocaleConfig = true
-        localeFilters += listOf("en", "de", "es", "fr", "it", "nl", "pl", "pt-rBR", "ru", "sv", "ta", "tr", "uk", "zh-rCN")
+        localeFilters += listOf("en", "ar", "de", "es", "fr", "it", "nl", "pl", "pt-rBR", "ru", "sv", "ta", "tr", "uk", "zh-rCN")
     }
     testOptions {
         unitTests {

app/src/main/java/com/futsch1/medtimer/MainActivity.java

@@ -155,8 +155,12 @@ protected void onNewIntent(Intent intent) {
 
     @Override
     public boolean onSupportNavigateUp() {
-        NavController navController = findNavController(this, R.id.navHost);
-        return NavigationUI.navigateUp(navController, appBarConfiguration)
-                || super.onSupportNavigateUp();
+        try {
+            NavController navController = findNavController(this, R.id.navHost);
+            return NavigationUI.navigateUp(navController, appBarConfiguration)
+                    || super.onSupportNavigateUp();
+        } catch (IllegalStateException e) {
+            return false;
+        }
     }
 }

app/src/main/java/com/futsch1/medtimer/OptionsMenu.java

@@ -105,8 +105,12 @@ private static void enableOptionalIcons(@NonNull Menu menu) {
     private void setupSettings() {
         MenuItem item = menu.findItem(R.id.settings);
         item.setOnMenuItemClickListener(menuItem -> {
-            Navigation.findNavController(view).navigate(R.id.action_global_preferencesFragment);
-            return true;
+            try {
+                Navigation.findNavController(view).navigate(R.id.action_global_preferencesFragment);
+                return true;
+            } catch (IllegalStateException e) {
+                return false;
+            }
         });
     }
 

app/src/main/res/drawable-ar/intro_analysis.png

@@ -258,7 +258,8 @@
         android:id="@+id/addLinkedReminder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="7dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:clickable="true"
         android:text="@string/add_linked_reminder"
         app:icon="@android:drawable/ic_menu_add"

app/src/main/res/drawable-ar/intro_medicine.png

@@ -9,7 +9,7 @@ do
   cp -f -r ./fastlane/metadata/android/en-US/images/phoneScreenshots/${screenshots[$i]}.png ./app/src/main/res/drawable/intro_${names[$i]}.png
 done
 
-locales=('es-ES' 'de-DE' 'fr-FR' 'it-IT' 'nl-NL' 'pl-PL' 'pt-BR' 'ru-RU' 'sv-SV' 'ta-IN' 'tr-TR' 'zh-CN')
+locales=('es-ES' 'ar' 'de-DE' 'fr-FR' 'it-IT' 'nl-NL' 'pl-PL' 'pt-BR' 'ru-RU' 'sv-SE' 'ta-IN' 'tr-TR' 'uk' 'zh-CN')
 
 for l in "${locales[@]}"
 do

app/src/main/res/drawable-ar/intro_notification.png

@@ -1 +0,0 @@
-video.txt:1

app/src/main/res/drawable-ar/intro_overview.png

@@ -0,0 +1 @@
+MedTimer

app/src/main/res/drawable-ar/intro_reminder.png

@@ -0,0 +1,35 @@
+Med reminders and history with full offline privacy
+
+Stay In Control of Your Medications with MedTimer
+
+MedTimer is an open-source medication reminder app designed to help you manage your medications and pills effectively and with full control of your sensitive data.
+
+Flexible & Personalized Reminders:
+
+- Manage unlimited medications with customizable reminders per medication (including simple defaults
+  for daily reminders).
+- Create flexible reminders with breaks and specific days (e.g. for birth control pills).
+- Weekend mode: Delay reminders to a defined time on chosen days.
+- Snooze notifications for later reminders or be reminded repeatedly.
+- Add extra doses on the fly.
+- Create interval based reminders or reminders following each other in intervals.
+
+Simple & Secure Data Management:
+
+- Confirm or dismiss reminders to record medication adherence accurately.
+- Get an overview of past doses in a chart and a tabular view.
+- Export your medication history as a CSV file for easy record-keeping or sharing with healthcare professionals.
+- Backup and restore your medication list as JSON file.
+- Medication stock tracking and out of stock reminders.
+- Tag and filter your medication.
+
+Privacy & Offline Accessibility:
+
+- All data is stored securely on your device, ensuring complete privacy and offline accessibility.
+- No internet connection required – your medication reminders are always available.
+
+MedTimer is a free app without adds.
+
+See the project page on GitHub: https://github.com/Futsch1/medTimer
+
+Feature graphic was created with https://hotpot.ai

fastlane/metadata/android/uk-UK/images/phoneScreenshots/6.png renamed to app/src/main/res/drawable-uk/intro_analysis.png

@@ -0,0 +1 @@
+Med reminders and history with full offline privacy

fastlane/metadata/android/uk-UK/images/phoneScreenshots/2.png renamed to app/src/main/res/drawable-uk/intro_medicine.png

@@ -0,0 +1 @@
+MedTimer

fastlane/metadata/android/uk-UK/images/phoneScreenshots/5.png renamed to app/src/main/res/drawable-uk/intro_notification.png

@@ -0,0 +1,35 @@
+Med reminders and history with full offline privacy
+
+Stay In Control of Your Medications with MedTimer
+
+MedTimer is an open-source medication reminder app designed to help you manage your medications and pills effectively and with full control of your sensitive data.
+
+Flexible & Personalized Reminders:
+
+- Manage unlimited medications with customizable reminders per medication (including simple defaults
+  for daily reminders).
+- Create flexible reminders with breaks and specific days (e.g. for birth control pills).
+- Weekend mode: Delay reminders to a defined time on chosen days.
+- Snooze notifications for later reminders or be reminded repeatedly.
+- Add extra doses on the fly.
+- Create interval based reminders or reminders following each other in intervals.
+
+Simple & Secure Data Management:
+
+- Confirm or dismiss reminders to record medication adherence accurately.
+- Get an overview of past doses in a chart and a tabular view.
+- Export your medication history as a CSV file for easy record-keeping or sharing with healthcare professionals.
+- Backup and restore your medication list as JSON file.
+- Medication stock tracking and out of stock reminders.
+- Tag and filter your medication.
+
+Privacy & Offline Accessibility:
+
+- All data is stored securely on your device, ensuring complete privacy and offline accessibility.
+- No internet connection required – your medication reminders are always available.
+
+MedTimer is a free app without adds.
+
+See the project page on GitHub: https://github.com/Futsch1/medTimer
+
+Feature graphic was created with https://hotpot.ai

fastlane/metadata/android/uk-UK/images/phoneScreenshots/1.png renamed to app/src/main/res/drawable-uk/intro_overview.png

@@ -0,0 +1 @@
+Med reminders and history with full offline privacy

fastlane/metadata/android/uk-UK/images/phoneScreenshots/3.png renamed to app/src/main/res/drawable-uk/intro_reminder.png

@@ -0,0 +1 @@
+MedTimer

app/src/main/res/layout/fragment_advanced_reminder_settings.xml

@@ -20,8 +20,8 @@ function stop_clean_status_bar {
     adb shell am broadcast -a com.android.systemui.demo -e command exit
 }
 
-locales=('de-DE' 'en-US' 'es-ES' 'fr-FR' 'it-IT' 'nl-NL' 'pl-PL' 'pt-BR' 'ru-RU' 'sv-SV' 'ta-IN' 'tr-TR' 'uk-UK' 'zh-CN')
-#locales=('en-US')
+locales=('en-US' 'ar-AE' 'de-DE' 'es-ES' 'fr-FR' 'it-IT' 'nl-NL' 'pl-PL' 'pt-BR' 'ru-RU' 'sv-SE' 'ta-IN' 'tr-TR' 'uk' 'zh-CN')
+#locales=('ar')
 tests_apk_path="app/build/outputs/apk/debug/MedTimer-debug.apk"
 app_apk_path="app/build/outputs/apk/androidTest/debug/MedTimer-debug-androidTest.apk"