From 8268a8f2ddeef5a5c7e605811708d43a34d91abd Mon Sep 17 00:00:00 2001
From: dankl <dankito@users.noreply.github.com>
Date: Wed, 8 Jan 2020 23:56:36 +0100
Subject: [PATCH] Placed decrease buttons before increase buttons

---
 .../android/ui/views/ChipTanFlickerCodeView.kt     | 12 ++----------
 .../fints4java/android/ui/views/TanImageView.kt    | 10 +++++-----
 .../src/main/res/layout/view_flicker_code.xml      | 14 +++++++-------
 .../res/layout/view_tan_image_size_controls.xml    | 14 +++++++-------
 .../src/main/res/values/strings.xml                |  4 ++--
 5 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt
index 714f3579..fa725332 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt
@@ -63,11 +63,11 @@ open class ChipTanFlickerCodeView @JvmOverloads constructor(
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val rootView = inflater.inflate(R.layout.view_flicker_code, this, true)
 
-        rootView.btnIncreaseSize.setOnClickListener { increaseSize() }
         rootView.btnDecreaseSize.setOnClickListener { decreaseSize() }
+        rootView.btnIncreaseSize.setOnClickListener { increaseSize() }
 
-        rootView.btnIncreaseSpeed.setOnClickListener { increaseFrequency() }
         rootView.btnDecreaseSpeed.setOnClickListener { decreaseFrequency() }
+        rootView.btnIncreaseSpeed.setOnClickListener { increaseFrequency() }
 
         btnPauseFlickerCode = rootView.btnPauseFlickerCode
         btnPauseFlickerCode.setOnClickListener { togglePauseFlickerCode() }
@@ -99,14 +99,6 @@ open class ChipTanFlickerCodeView @JvmOverloads constructor(
 
 
 
-    open fun increaseSize() {
-        stripesHeight += StripesHeightStepSize
-        stripesWidth += StripesWidthStepSize
-        stripesMarginRight += StripesRightMarginStepSize
-
-        setWidth(context)
-    }
-
     open fun decreaseSize() {
         stripesHeight -= StripesHeightStepSize
         stripesWidth -= StripesWidthStepSize
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt
index 390bb021..7255bc64 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt
@@ -39,19 +39,19 @@ open class TanImageView @JvmOverloads constructor(
 
         imgTanImageView = rootView.imgTanImageView
 
-        rootView.btnIncreaseSize.setOnClickListener { increaseSize() }
         rootView.btnDecreaseSize.setOnClickListener { decreaseSize() }
+        rootView.btnIncreaseSize.setOnClickListener { increaseSize() }
     }
 
 
-    open fun increaseSize() {
-        changeSizeBy(ChangeSizeStepSizeDp)
-    }
-
     open fun decreaseSize() {
         changeSizeBy(ChangeSizeStepSizeDp * -1)
     }
 
+    open fun increaseSize() {
+        changeSizeBy(ChangeSizeStepSizeDp)
+    }
+
     protected open fun changeSizeBy(changeSizeBy: Float) {
         val params = imgTanImageView.layoutParams
         val newWidthAndHeight = params.height + convertDpToPx(context, changeSizeBy).toInt()
diff --git a/fints4javaAndroidApp/src/main/res/layout/view_flicker_code.xml b/fints4javaAndroidApp/src/main/res/layout/view_flicker_code.xml
index 6b77b2d8..9938c28c 100644
--- a/fints4javaAndroidApp/src/main/res/layout/view_flicker_code.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/view_flicker_code.xml
@@ -29,6 +29,13 @@
             android:text="@string/view_flicker_code_frequency"
         />
 
+        <Button
+                android:id="@+id/btnDecreaseSpeed"
+                android:layout_width="@dimen/view_tan_image_controls_buttons_width"
+                android:layout_height="@dimen/view_tan_image_controls_buttons_height"
+                android:text="@string/view_flicker_code_decrease_frequency"
+        />
+
         <Button
             android:id="@+id/btnIncreaseSpeed"
             android:layout_width="@dimen/view_tan_image_controls_buttons_width"
@@ -36,13 +43,6 @@
             android:text="@string/view_flicker_code_increase_frequency"
         />
 
-        <Button
-            android:id="@+id/btnDecreaseSpeed"
-            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
-            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-            android:text="@string/view_flicker_code_decrease_frequency"
-        />
-
         <ImageButton
             android:id="@+id/btnPauseFlickerCode"
             android:layout_width="@dimen/view_tan_image_controls_buttons_width"
diff --git a/fints4javaAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml b/fints4javaAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
index f7dda2f8..9a36bbcc 100644
--- a/fints4javaAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
@@ -15,13 +15,6 @@
             android:text="@string/view_tan_image_size_controls_size"
     />
 
-    <Button
-            android:id="@+id/btnIncreaseSize"
-            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
-            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-            android:text="@string/view_tan_image_size_controls_increase_size"
-    />
-
     <Button
             android:id="@+id/btnDecreaseSize"
             android:layout_width="@dimen/view_tan_image_controls_buttons_width"
@@ -29,4 +22,11 @@
             android:text="@string/view_tan_image_size_controls_decrease_size"
     />
 
+    <Button
+            android:id="@+id/btnIncreaseSize"
+            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
+            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
+            android:text="@string/view_tan_image_size_controls_increase_size"
+    />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/fints4javaAndroidApp/src/main/res/values/strings.xml b/fints4javaAndroidApp/src/main/res/values/strings.xml
index 9d67ca18..a5c99e56 100644
--- a/fints4javaAndroidApp/src/main/res/values/strings.xml
+++ b/fints4javaAndroidApp/src/main/res/values/strings.xml
@@ -55,12 +55,12 @@
     <string name="dialog_transfer_money_message_transfer_failed">Could not transfer %1$s %2$s to %3$s:\n%4$s.</string>
 
     <string name="view_tan_image_size_controls_size">Size:</string>
-    <string name="view_tan_image_size_controls_increase_size">+</string>
     <string name="view_tan_image_size_controls_decrease_size">-</string>
+    <string name="view_tan_image_size_controls_increase_size">+</string>
 
     <string name="view_flicker_code_frequency">Frequency:</string>
-    <string name="view_flicker_code_increase_frequency">+</string>
     <string name="view_flicker_code_decrease_frequency">-</string>
+    <string name="view_flicker_code_increase_frequency">+</string>
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN procedure</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN medium</string>