Skip to content

Commit 4473060

Browse files
mrgames13marcauberer
authored andcommitted
Fix bug with hex input
1 parent ec527ce commit 4473060

File tree

11 files changed

+14
-13
lines changed

11 files changed

+14
-13
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
applicationId "com.mrgames13.jimdo.colorconverter"
1414
minSdkVersion 19
1515
targetSdkVersion 29
16-
versionCode 202
17-
versionName "2.0.2"
16+
versionCode 203
17+
versionName "2.0.3"
1818
vectorDrawables.useSupportLibrary = true
1919
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2020
}

app/src/main/java/com/mrgames13/jimdo/colorconverter/ui/activity/MainActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,12 @@ class MainActivity : AppCompatActivity() {
321321
// Prepare views
322322
hexValue.addTextChangedListener(object : SimpleTextWatcher() {
323323
override fun afterTextChanged(s: Editable?) {
324-
if(!s.toString().startsWith("#")) {
324+
val value = s.toString()
325+
if(!value.startsWith("#")) {
325326
hexValue.setText("#")
326327
Selection.setSelection(hexValue.text, hexValue.text.length)
327328
} else {
329+
if(value.length > 1 && !value.matches("#[a-fA-F0-9]+".toRegex())) s?.delete(value.length -1, value.length)
328330
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = s.toString().length == 7 || s.toString().length == 4
329331
}
330332
}

app/src/main/res/layout/dialog_edit_hex.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
android:inputType="textCapCharacters"
1818
android:hint="@string/hex_code"
1919
android:maxLength="7"
20-
android:importantForAutofill="no"
21-
android:digits="0123456789ABCDEF"/>
20+
android:importantForAutofill="no"/>
2221
</FrameLayout>

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: de, German
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 16:41:59 +0000
8+
Exported at: Fri, 27 Dec 2019 20:40:20 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="close">schließen</string>

app/src/main/res/values-de/strings_colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: de, German
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 13:31:29 +0100
8+
Exported at: Fri, 27 Dec 2019 20:40:20 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="color_alice_blue">Aliceblau</string>

app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: es, Spanish
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 16:42:00 +0000
8+
Exported at: Fri, 27 Dec 2019 20:40:20 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="close">cerrar</string>

app/src/main/res/values-es/strings_colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: es, Spanish
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 13:31:29 +0100
8+
Exported at: Fri, 27 Dec 2019 20:40:20 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="color_alice_blue">Azul Alicia</string>

app/src/main/res/values-fr/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: fr, French
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 16:41:59 +0000
8+
Exported at: Fri, 27 Dec 2019 20:40:19 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="close">fermer</string>

app/src/main/res/values-fr/strings_colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: fr, French
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 13:31:28 +0100
8+
Exported at: Fri, 27 Dec 2019 20:40:20 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="color_alice_blue">Bleu alice</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: en, English
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 16:41:59 +0000
8+
Exported at: Fri, 27 Dec 2019 20:40:19 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="close">close</string>

app/src/main/res/values/strings_colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Release: Working copy
66
Locale: en, English
77
Exported by: M&R Games
8-
Exported at: Mon, 23 Dec 2019 13:31:28 +0100
8+
Exported at: Fri, 27 Dec 2019 20:40:19 +0000
99
-->
1010
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1111
<string name="color_alice_blue">Alice Blue</string>

0 commit comments

Comments
 (0)