Skip to content
Snippets Groups Projects
Unverified Commit 73592510 authored by Thomas Klingbeil's avatar Thomas Klingbeil Committed by GitHub
Browse files

Revert "Change teleTAN from 7 to 10 characters (#192)" (#200)


This reverts commit b31fd1d8.

Co-authored-by: default avatarJakob Möller <jakob.moeller@sap.com>
parent 5a6e3528
No related branches found
No related tags found
No related merge requests found
package de.rki.coronawarnapp.ui.submission package de.rki.coronawarnapp.ui.submission
object TanConstants { object TanConstants {
const val MAX_LENGTH = 10 const val MAX_LENGTH = 7
val ALPHA_NUMERIC_CHARS = ('a'..'z').plus('A'..'Z').plus('0'..'9') val ALPHA_NUMERIC_CHARS = ('a'..'z').plus('A'..'Z').plus('0'..'9')
} }
...@@ -16,9 +16,6 @@ import kotlinx.android.synthetic.main.view_tan_input.view.tan_input_textview_4 ...@@ -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_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_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_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) { class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
...@@ -74,10 +71,7 @@ class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, att ...@@ -74,10 +71,7 @@ class TanInput(context: Context, attrs: AttributeSet) : FrameLayout(context, att
tan_input_textview_4, tan_input_textview_4,
tan_input_textview_5, tan_input_textview_5,
tan_input_textview_6, tan_input_textview_6,
tan_input_textview_7, tan_input_textview_7
tan_input_textview_8,
tan_input_textview_9,
tan_input_textview_10
).forEachIndexed { i, tanDigit -> ).forEachIndexed { i, tanDigit ->
tanDigit.text = digitAtIndex(i) tanDigit.text = digitAtIndex(i)
} }
......
...@@ -72,36 +72,10 @@ ...@@ -72,36 +72,10 @@
android:id="@+id/tan_input_textview_7" android:id="@+id/tan_input_textview_7"
style="@style/tanInputDigit" style="@style/tanInputDigit"
app:layout_constraintEnd_toEndOf="parent" 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_constraintStart_toEndOf="@+id/tan_input_textview_6"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="X" /> 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> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<!-- Submission Tan Input --> <!-- Submission Tan Input -->
<dimen name="submission_tan_input_edittext_size">1dp</dimen> <dimen name="submission_tan_input_edittext_size">1dp</dimen>
<dimen name="submission_tan_input_digit_radius">2dp</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> <dimen name="submission_tan_input_digit_height">50dp</dimen>
<!-- Submission QR Code Scan --> <!-- Submission QR Code Scan -->
......
...@@ -659,7 +659,7 @@ ...@@ -659,7 +659,7 @@
<!-- XHED: Page title for TAN submission pge --> <!-- XHED: Page title for TAN submission pge -->
<string name="submission_tan_title">TAN Eingabe</string> <string name="submission_tan_title">TAN Eingabe</string>
<!-- YTXT: Body text for the tan submission page --> <!-- 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 --> <!-- XBUT: Submit TAN button -->
<string name="submission_tan_button_text">Weiter</string> <string name="submission_tan_button_text">Weiter</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment