From b247745093199565e6fd7fdfb419a4e6f706d992 Mon Sep 17 00:00:00 2001
From: Werner Kapferer <werner.kapferer@chello.at>
Date: Fri, 26 Apr 2024 20:05:40 +0200
Subject: [PATCH] Add profile name in addition to holder

Also other minor improvements
---
 app/build.gradle.kts                          |  4 ++--
 .../woernsn/openepcqrgen/GenerateActivity.kt  |  6 ++---
 .../woernsn/openepcqrgen/SettingsActivity.kt  |  2 +-
 app/src/main/res/values/strings.xml           |  5 ++--
 app/src/main/res/xml/profiles_preferences.xml | 24 ++++++++++++++++---
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fef68bd..0f95fa6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "net.woernsn.openepcqrgen"
         minSdk = 29
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/net/woernsn/openepcqrgen/GenerateActivity.kt b/app/src/main/java/net/woernsn/openepcqrgen/GenerateActivity.kt
index 71a1f31..c1dbce6 100644
--- a/app/src/main/java/net/woernsn/openepcqrgen/GenerateActivity.kt
+++ b/app/src/main/java/net/woernsn/openepcqrgen/GenerateActivity.kt
@@ -111,7 +111,7 @@ class GenerateActivity : AppCompatActivity() {
                 val activeProfile = getActiveProfile()
                 val defaultPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
 
-                val name = defaultPreferences.getString("profile${activeProfile}_name", null)
+                val holder = defaultPreferences.getString("profile${activeProfile}_holder", null)
                 val iban = defaultPreferences.getString("profile${activeProfile}_iban", null)
                 val bic = defaultPreferences.getString("profile${activeProfile}_bic", "")
                 val amount = amountInput.editText!!.text.toString().toDouble()
@@ -120,7 +120,7 @@ class GenerateActivity : AppCompatActivity() {
                 val epcData = EPCData(
                     amount = amount,
                     text = text,
-                    name = name!!,
+                    name = holder!!,
                     iban = iban!!,
                     bic = bic!!
                 )
@@ -185,7 +185,7 @@ class GenerateActivity : AppCompatActivity() {
 
         try {
             EPCData(
-                name = defaultPreferences.getString("profile1_name", null)!!,
+                name = defaultPreferences.getString("profile1_holder", null)!!,
                 iban = defaultPreferences.getString("profile1_iban", null)!!,
                 bic = defaultPreferences.getString("profile1_bic", "")!!,
                 text = "init",
diff --git a/app/src/main/java/net/woernsn/openepcqrgen/SettingsActivity.kt b/app/src/main/java/net/woernsn/openepcqrgen/SettingsActivity.kt
index d3efb33..ca7b1d8 100644
--- a/app/src/main/java/net/woernsn/openepcqrgen/SettingsActivity.kt
+++ b/app/src/main/java/net/woernsn/openepcqrgen/SettingsActivity.kt
@@ -138,7 +138,7 @@ class SettingsActivity : AppCompatActivity(),
             profileNumber: Number,
             enable: Boolean
         ) {
-            arrayOf("name", "iban", "bic").forEach { setting ->
+            arrayOf("name", "holder", "iban", "bic").forEach { setting ->
                 val pref =
                     context.findPreference<EditTextPreference>("profile${profileNumber}_${setting}")
                 pref?.isEnabled = enable
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 28a6aa5..96ba6c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">openEpcQrGen</string>
-    <string name="title_activity_settings">SettingsActivity</string>
+    <string name="title_activity_settings">Settings</string>
 
     <string name="light">Light</string>
     <string name="dark">Dark</string>
@@ -22,7 +22,8 @@
     <string name="settings">Settings</string>
     <string name="profiles">Profiles</string>
     <string name="general">General</string>
-    <string name="account_name">Account Name *</string>
+    <string name="profile_name">Profile Name *</string>
+    <string name="account_holder">Account Holder *</string>
     <string name="account_iban">Account IBAN *</string>
     <string name="account_bic">Account BIC</string>
     <string name="enable">Enable</string>
diff --git a/app/src/main/res/xml/profiles_preferences.xml b/app/src/main/res/xml/profiles_preferences.xml
index ea2bec4..6d796a3 100644
--- a/app/src/main/res/xml/profiles_preferences.xml
+++ b/app/src/main/res/xml/profiles_preferences.xml
@@ -5,7 +5,13 @@
     <PreferenceCategory android:title="Profile 1" app:iconSpaceReserved="false">
         <EditTextPreference
             app:key="profile1_name"
-            app:title="@string/account_name"
+            app:defaultValue="@string/profile_1"
+            app:title="@string/profile_name"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:key="profile1_holder"
+            app:title="@string/account_holder"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
         <EditTextPreference
@@ -28,7 +34,13 @@
             app:iconSpaceReserved="false" />
         <EditTextPreference
             app:key="profile2_name"
-            app:title="@string/account_name"
+            app:defaultValue="@string/profile_2"
+            app:title="@string/profile_name"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:key="profile2_holder"
+            app:title="@string/account_holder"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
         <EditTextPreference
@@ -51,7 +63,13 @@
             app:iconSpaceReserved="false" />
         <EditTextPreference
             app:key="profile3_name"
-            app:title="@string/account_name"
+            app:defaultValue="@string/profile_3"
+            app:title="@string/profile_name"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:key="profile3_holder"
+            app:title="@string/account_holder"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
         <EditTextPreference