From 67eb42591f7dc33db1d13ff81b1b7d9383737132 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Sun, 24 May 2020 23:51:27 +0200
Subject: [PATCH] Implemented displaying 'Hinweis Ihrer Bank:' in an extra line

---
 .../src/main/res/layout/dialog_enter_tan.xml               | 6 ++++++
 ui/BankingAndroidApp/src/main/res/values-de/strings.xml    | 2 +-
 ui/BankingAndroidApp/src/main/res/values/strings.xml       | 2 +-
 ui/BankingJavaFxApp/src/main/resources/Messages.properties | 2 +-
 .../src/main/resources/Messages_de.properties              | 2 +-
 .../banking/ui/javafx/dialogs/tan/EnterTanDialog.kt        | 7 +++++++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml b/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
index e397850f..aece700f 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
@@ -87,6 +87,12 @@
         />
 
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_enter_tan_tan_description_label"
+            />
+
         <net.dankito.banking.ui.android.views.MaxHeightScrollView
             android:id="@+id/lytTanDescriptionToShowToUser"
             android:layout_width="match_parent"
diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
index e7a6086c..38d1b5b7 100644
--- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
@@ -70,7 +70,7 @@
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN Verfahren</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN Medium</string>
-    <string name="dialog_enter_tan_hint_from_bank">Hinweis Ihrer Bank: %s</string>
+    <string name="dialog_enter_tan_tan_description_label">Hinweis Ihrer Bank:</string>
     <string name="dialog_enter_tan_enter_tan">TAN eingeben:</string>
     <string name="dialog_enter_tan_error_could_not_decode_tan_image">Flicker code oder QR code / PhotoTan konnten nicht dekodiert werden. Sehr wahrscheinlich ein interner Fehler:\n%s.</string>
     <string name="dialog_enter_tan_tan_medium_successfully_changed">TAN Medium erfolgreich zu \'%s\' geändert.</string>
diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml
index 53af2e72..93ddf885 100644
--- a/ui/BankingAndroidApp/src/main/res/values/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN procedure</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN medium</string>
-    <string name="dialog_enter_tan_hint_from_bank">Hint from your bank: %s</string>
+    <string name="dialog_enter_tan_tan_description_label">Hint from your bank:</string>
     <string name="dialog_enter_tan_enter_tan">Enter TAN:</string>
     <string name="dialog_enter_tan_error_could_not_decode_tan_image">Could not decode flicker code or QR code / PhotoTan. Most likely an internal error:\n%s.</string>
     <string name="dialog_enter_tan_tan_medium_successfully_changed">TAN medium successfully changed to \'%s\'.</string>
diff --git a/ui/BankingJavaFxApp/src/main/resources/Messages.properties b/ui/BankingJavaFxApp/src/main/resources/Messages.properties
index a5436602..5d1ef885 100755
--- a/ui/BankingJavaFxApp/src/main/resources/Messages.properties
+++ b/ui/BankingJavaFxApp/src/main/resources/Messages.properties
@@ -49,7 +49,7 @@ enter.tan.dialog.select.tan.procedure=TAN procedure:
 enter.tan.dialog.select.tan.medium=TAN medium:
 enter.tan.dialog.size.label=Size:
 enter.tan.dialog.frequency.label=Speed:
-enter.tan.dialog.hint.from.bank=Hint from your bank: %s
+enter.tan.dialog.hint.from.bank=Hint from your bank:
 enter.tan.dialog.enter.tan.label=TAN:
 enter.tan.dialog.error.could.not.decode.tan.image=Could not decode flicker code or QR code / PhotoTan. Most likely an internal error:\n%s.
 enter.tan.dialog.tan.medium.successfully.changed=TAN medium successfully changed to \'%s\'.
diff --git a/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties b/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
index e53a9a05..627f2de4 100755
--- a/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
+++ b/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
@@ -49,7 +49,7 @@ enter.tan.dialog.select.tan.procedure=TAN Verfahren:
 enter.tan.dialog.select.tan.medium=TAN Medium:
 enter.tan.dialog.size.label=Größe:
 enter.tan.dialog.frequency.label=Geschwindigkeit:
-enter.tan.dialog.hint.from.bank=Hinweis Ihrer Bank: %s
+enter.tan.dialog.hint.from.bank=Hinweis Ihrer Bank:
 enter.tan.dialog.enter.tan.label=TAN:
 enter.tan.dialog.error.could.not.decode.tan.image=Flickercode bzw. QR-Code / PhotoTan konnte nicht dekodiert werden. Höchst wahrscheinlich ein interner Fehler:\n%s.
 enter.tan.dialog.tan.medium.successfully.changed=TAN Medium erfolgreich geändert zu \'%s\'.
diff --git a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
index c2792351..6edcaece 100644
--- a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
+++ b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/tan/EnterTanDialog.kt
@@ -127,6 +127,13 @@ open class EnterTanDialog(
             }
         }
 
+        label(messages["enter.tan.dialog.hint.from.bank"]) {
+
+            vboxConstraints {
+                marginTopBottom(6.0)
+            }
+        }
+
         hbox {
             maxWidth = 400.0