Minor improvements

santalu · Jul 22, 2020 · e46208c · e46208c
1 parent 3770da2
commit e46208c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -13,28 +13,28 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+        android:textAppearance="?attr/textAppearanceBody1" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/unMasked"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+        android:textAppearance="?attr/textAppearanceBody1" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/status"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
+        android:textAppearance="?attr/textAppearanceBody1" />
 
     <com.santalu.maskara.widget.MaskEditText
         android:id="@+id/input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="number"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+        android:textAppearance="?attr/textAppearanceHeadline6"
         app:mask="+90 (___) ___ __ __" />
 
 </LinearLayout>
diff --git a/library/src/main/java/com/santalu/maskara/Maskara.kt b/library/src/main/java/com/santalu/maskara/Maskara.kt
@@ -86,7 +86,9 @@ internal fun Mask.nextSelection(before: CharSequence, after: CharSequence, actio
     val end = after.length
     var nextMaskIndex = value.indexOf(character, start)
     // Make sure the cursor is located to the end of the selection
-    if (before.getOrNull(start) != after.getOrNull(nextMaskIndex)) {
+    val previousChar = before.getOrNull(start)
+    val nextChar = after.getOrNull(nextMaskIndex)
+    if (previousChar != nextChar && nextChar != character) {
         ++nextMaskIndex
     }