From ef9a490d0b297539dd7431bad01a403ee9ef5e0f Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 11 Oct 2023 14:40:15 +0200
Subject: [PATCH] Make app title translatable

---
 .gitignore                                    | 26 ++++++++++++++-----
 app/build.gradle.kts                          |  2 --
 app/src/debug/res/values/strings.xml          |  4 +++
 app/src/main/AndroidManifest.xml              |  1 -
 .../protect/card_locker/MainActivity.java     |  1 -
 app/src/main/res/values/strings.xml           |  3 ++-
 6 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 app/src/debug/res/values/strings.xml

diff --git a/.gitignore b/.gitignore
index ecff8abd0..78b6b76bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,25 @@
+# Android Studio generated (superseded/unused rules commented out)
 *.iml
 .gradle
-local.properties
-.idea/
+/local.properties
+#/.idea/caches
+#/.idea/libraries
+#/.idea/modules.xml
+#/.idea/workspace.xml
+#/.idea/navEditor.xml
+#/.idea/assetWizardSettings.xml
 .DS_Store
-build/
-captures/
-**/release
-**/debug
-app/*.log
+/build
+/captures
+.externalNativeBuild
+.cxx
+#local.properties
+
+# Android extras
+/app/*.log
+/app/build
+/app/release
+/.idea
 
 # Bundle
 /.bundle/
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1234ea300..0a9dc01f8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,11 +37,9 @@ android {
                 getDefaultProguardFile("proguard-android.txt"),
                 "proguard-rules.pro"
             )
-            resValue("string", "app_name", "Catima")
         }
         debug {
             applicationIdSuffix = ".debug"
-            resValue("string", "app_name", "Catima Debug")
         }
     }
 
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..04a6d7b4b
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Catima Debug</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 353b1a1d1..bf6981ec9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.App.Starting">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 196a4d33a..539c9c78c 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -229,7 +229,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onCreate(inputSavedInstanceState);
 
         binding = MainActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.app_name);
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         groupsTabLayout = binding.groups;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 28e031bc7..75eed4af3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Catima</string>
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
     <plurals name="selectedCardCount">
@@ -336,4 +337,4 @@
     <string name="add_a_card_in_a_different_way">Add a card in a different way</string>
     <string name="field_must_not_be_empty">Field must not be empty</string>
     <string name="manually_enter_barcode_instructions">Enter the ID number or text on your card and press the barcode that looks like the one on your card.</string>
-</resources>
\ No newline at end of file
+</resources>