From 9bb7c7e66f6c22bbe341ae88b853ffad40fcbe31 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 14 Mar 2022 18:37:37 +0100
Subject: [PATCH] Identify debug version in app name

Using the --product option of aapt.

Remove the app name from translations because it is never translated. It
is still possible to translate it by specifying 'product="default"'.
---
 Makefile                  | 8 ++++++--
 res/values-de/strings.xml | 1 -
 res/values-es/strings.xml | 1 -
 res/values-fr/strings.xml | 1 -
 res/values-lv/strings.xml | 1 -
 res/values-pt/strings.xml | 1 -
 res/values/strings.xml    | 3 ++-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 8054ee3..72edb5b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,11 @@ release: _build/$(PACKAGE_NAME).apk
 installd: _build/$(PACKAGE_NAME).debug.apk
 	adb install "$<"
 
-.PHONY: release debug installd
+clean:
+	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \
+		_build/*.idsig
+
+.PHONY: release debug installd clean
 
 $(shell mkdir -p _build)
 
@@ -60,7 +64,7 @@ _build/%.debug.apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
 
 # Debug apk
 
-_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug
+_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug --product debug
 
 # Release signing
 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 886af33..3ca39bc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Tastaturlayout ändern</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ea4ac67..1990be9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
   <string name="pref_category_layout">Formato</string>
   <string name="pref_layout_title">Cambiar formato de teclado</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 506b2ad..25f1b97 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard Paramètres</string>
   <string name="pref_category_layout">Disposition</string>
   <string name="pref_layout_title">Disposition des touches</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0e1c5cd..998f66f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard iestatījumi</string>
   <string name="pref_category_layout">Izkārtojums</string>
   <string name="pref_layout_title">Mainīt tastatūras izkārtojumu</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 82973ec..1facfbc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Configurações Unexpected Keyboard</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Mudar layout do teclado</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c3eb36..2aaeabd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard Settings</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Change keyboard layout</string>