Insert trailing colons to avoid cursor jumps (#3)

* Insert trailing colons when needed * . * rename
Shingyx · Mar 31, 2024 · 13deaee · 13deaee
1 parent a543ff7
commit 13deaee
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/wakeonlan/src/main/java/com/github/shingyx/wakeonlan/ui/MacAddressTextWatcher.kt b/wakeonlan/src/main/java/com/github/shingyx/wakeonlan/ui/MacAddressTextWatcher.kt
@@ -23,18 +23,26 @@ class MacAddressTextWatcher : TextWatcher {
     private fun formatMacAddress(text: String): String {
         val builder = StringBuilder()
         var digits = 0
+        var insertTrailingColon = false
         for (char in text) {
             if (char.isLetterOrDigit()) {
-                if (digits % 2 == 0 && digits > 0 && digits < 12) {
+                if (allowSeparator(digits)) {
                     builder.append(':')
+                    insertTrailingColon = false
                 }
                 builder.append(char)
                 digits++
+            } else if (char == ':') {
+                insertTrailingColon = true
             }
         }
-        if (text.lastOrNull() == ':') {
+        if ((insertTrailingColon || text.lastOrNull() == ':') && allowSeparator(digits)) {
             builder.append(':')
         }
         return builder.toString()
     }
+
+    private fun allowSeparator(digits: Int): Boolean {
+        return digits % 2 == 0 && digits in 1 until 12
+    }
 }