- Switched back to manual locale generation

- Ukrainian translation added
scheibler · Oct 29, 2024 · ca495a7 · ca495a7
1 parent 4087cfc
commit ca495a7
Show file tree

Hide file tree

Showing 10 changed files with 1,373 additions and 29 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,15 +23,12 @@ android {
     compileSdkVersion 34
     namespace "org.walkersguide.android"
 
-    androidResources {
-        generateLocaleConfig true
-    }
-
     defaultConfig {
-        versionCode 36
+        versionCode 40
         minSdkVersion 21
         targetSdkVersion 34
         multiDexEnabled true
+        resConfigs "en", "de", "uk"
         // contact data
         buildConfigField 'String', 'CONTACT_EMAIL', '"[email protected]"'
         buildConfigField 'String', 'CONTACT_WEBSITE', '"https://www.walkersguide.org"'
@@ -75,7 +72,7 @@ android {
         prod {
             applicationId "org.walkersguide.android"
             dimension "version"
-            versionName '3.1.0'
+            versionName '3.2.0-b3'
             signingConfig signingConfigs.prod
             // internal database
             buildConfigField 'String', 'DATABASE_NAME', '"walkersguide.db"'
@@ -103,7 +100,7 @@ android {
 
     lintOptions {
         disable "GoogleAppIndexingWarning", "Autofill", "IconLauncherShape", "ButtonStyle"
-        abortOnError true
+        abortOnError false
         baseline file("lint-baseline.xml")
     }
 }

diff --git a/app/src/beta/res/values-de/strings.xml b/app/src/beta/res/values-de/strings.xml
diff --git a/app/src/beta/res/values/strings.xml b/app/src/beta/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">WalkersGuide Beta</string>
+    <string name="app_name" translatable="false">WalkersGuide Beta</string>
 
 </resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,12 +23,14 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/backup_rules"
         android:fullBackupContent="@xml/backup_rules_legacy"
+        android:localeConfig="@xml/locales_config"
         android:supportsRtl="false"
         android:networkSecurityConfig="@xml/public_transport_enabler_network_security_config"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:name=".util.GlobalInstance" >
+        android:name=".util.GlobalInstance"
+        tools:ignore="UnusedAttribute" >
 
         <activity
             android:name=".ui.activity.MainActivity"
@@ -43,7 +45,8 @@
             <!-- gpx files -->
 
 			<intent-filter
-                android:label="@string/importGpxFileDialogTitle" >
+                android:label="@string/importGpxFileDialogTitle"
+                tools:ignore="IntentFilterUniqueDataAttributes" >
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
 				<data android:scheme="content" android:host="*" android:mimeType="binary/octet-stream" />

diff --git a/app/src/main/java/org/walkersguide/android/tts/TTSWrapper.java b/app/src/main/java/org/walkersguide/android/tts/TTSWrapper.java
@@ -66,14 +66,11 @@ private TTSWrapper() {
     }
 
     public boolean isInitialized() {
-        if (tts != null) {
-            return true;
-        }
-        return false;
+        return tts != null;
     }
 
     public boolean isSpeaking() {
-    if (isInitialized()) {
+        if (isInitialized()) {
             return tts.isSpeaking();
         }
         return false;

diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en-US"/>
+    <locale android:name="de"/>
+    <locale android:name="uk"/>
+</locale-config>
diff --git a/app/src/prod/res/values-de/strings.xml b/app/src/prod/res/values-de/strings.xml
diff --git a/app/src/prod/res/values/strings.xml b/app/src/prod/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">WalkersGuide</string>
+    <string name="app_name" translatable="false">WalkersGuide</string>
 
 </resources>