From 73592510a8a0378032a58a80c7b25bce3e55a137 Mon Sep 17 00:00:00 2001
From: Thomas Klingbeil <64434904+tklingbeil@users.noreply.github.com>
Date: Fri, 5 Jun 2020 16:26:03 +0200
Subject: [PATCH] Revert "Change teleTAN from 7 to 10 characters (#192)" (#200)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit b31fd1d86b97a9e625758b5031e31872f80dad8b.
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../ui/submission/TanConstants.kt | 2 +-
.../coronawarnapp/ui/submission/TanInput.kt | 8 +-----
.../src/main/res/layout/view_tan_input.xml | 26 -------------------
.../src/main/res/values/dimens.xml | 2 +-
.../src/main/res/values/strings.xml | 2 +-
5 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
index 644cf1ee0..b6be13be8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanConstants.kt
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.ui.submission
object TanConstants {
- const val MAX_LENGTH = 10
+ const val MAX_LENGTH = 7
val ALPHA_NUMERIC_CHARS = ('a'..'z').plus('A'..'Z').plus('0'..'9')
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
index a7bf4972c..70cc48b68 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/TanInput.kt
@@ -16,9 +16,6 @@ import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_4
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_5
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_6
import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_7
-import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_8
-import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_9
-import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_10
class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
@@ -74,10 +71,7 @@ class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, att
tan_input_textview_4,
tan_input_textview_5,
tan_input_textview_6,
- tan_input_textview_7,
- tan_input_textview_8,
- tan_input_textview_9,
- tan_input_textview_10
+ tan_input_textview_7
).forEachIndexed { i, tanDigit ->
tanDigit.text = digitAtIndex(i)
}
diff --git a/Corona-Warn-App/src/main/res/layout/view_tan_input.xml b/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
index 13d0453fb..213e9ff71 100644
--- a/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_tan_input.xml
@@ -72,36 +72,10 @@
android:id="@+id/tan_input_textview_7"
style="@style/tanInputDigit"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_8"
app:layout_constraintStart_toEndOf="@+id/tan_input_textview_6"
app:layout_constraintTop_toTopOf="parent"
tools:text="X" />
- <TextView
- android:id="@+id/tan_input_textview_8"
- style="@style/tanInputDigit"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_9"
- app:layout_constraintStart_toEndOf="@+id/tan_input_textview_7"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="X" />
-
- <TextView
- android:id="@+id/tan_input_textview_9"
- style="@style/tanInputDigit"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/tan_input_textview_10"
- app:layout_constraintStart_toEndOf="@+id/tan_input_textview_8"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="X" />
-
- <TextView
- android:id="@+id/tan_input_textview_10"
- style="@style/tanInputDigit"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/tan_input_textview_9"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="X" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index 228ca5a29..141c37f5e 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -80,7 +80,7 @@
<!-- Submission Tan Input -->
<dimen name="submission_tan_input_edittext_size">1dp</dimen>
<dimen name="submission_tan_input_digit_radius">2dp</dimen>
- <dimen name="submission_tan_input_digit_width">26dp</dimen>
+ <dimen name="submission_tan_input_digit_width">36dp</dimen>
<dimen name="submission_tan_input_digit_height">50dp</dimen>
<!-- Submission QR Code Scan -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 0969b7372..6f3c230cc 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -659,7 +659,7 @@
<!-- XHED: Page title for TAN submission pge -->
<string name="submission_tan_title">TAN Eingabe</string>
<!-- YTXT: Body text for the tan submission page -->
- <string name="submission_tan_body">Die TAN ist 10-stellig und Groß- und Kleinschreibung muss beachtet werden.\n\nGeben Sie bitte die Ihnen mitgeteilte TAN ein:</string>
+ <string name="submission_tan_body">Die TAN ist 7-stellig und Groß- und Kleinschreibung muss beachtet werden.\n\nGeben Sie bitte die Ihnen mitgeteilte TAN ein:</string>
<!-- XBUT: Submit TAN button -->
<string name="submission_tan_button_text">Weiter</string>
--
GitLab