Merge pull request #510 from tadeubas/keypad-changes

Rearranged keys on keypads

Author: odudex

src/krux/pages/__init__.py

@@ -63,8 +63,8 @@
 
 LETTERS = "abcdefghijklmnopqrstuvwxyz"
 UPPERCASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-NUM_SPECIAL_1 = "1234567890 !#$%&'()*"
-NUM_SPECIAL_2 = '+,-./:;<=>?@[\\]^_"{|}~'
+NUM_SPECIAL_1 = "1234567890 !#$%()&*'"
+NUM_SPECIAL_2 = '<>.,"[]:;/{}^~|-+=_\\?@'
 DIGITS = "1234567890"
 
 BATTERY_WIDTH = 22

src/krux/pages/file_operations.py

@@ -29,7 +29,7 @@
 from ..krux_settings import t
 from ..sd_card import SDHandler
 
-FILE_SPECIAL = "1234567890()-.[]_~"
+FILE_SPECIAL = "1234567890[]-._()~"
 
 
 class SaveFile(Page):

src/krux/pages/keypads.py

@@ -156,7 +156,7 @@ def draw_keys(self):
                     key = t("Go")
                     custom_color = theme.go_color
                 elif key_index == self.more_index and len(self.keysets) > 1:
-                    key = "ABC"
+                    key = self.keysets[self._move_keyset_index()][:3]
                     custom_color = theme.toggle_color
 
                 if key is not None:
@@ -310,11 +310,16 @@ def _previous_key(self):
     def next_keyset(self):
         """Change keys for the next keyset"""
         if len(self.keysets) > 1:
-            self.keyset_index = (self.keyset_index + 1) % len(self.keysets)
+            self.keyset_index = self._move_keyset_index()
             self.reset()
 
     def previous_keyset(self):
         """Change keys for the previous keyset"""
         if len(self.keysets) > 1:
-            self.keyset_index = (self.keyset_index - 1) % len(self.keysets)
+            self.keyset_index = self._move_keyset_index(False)
             self.reset()
+
+    def _move_keyset_index(self, forward=True):
+        """Calc the index of keyset forward or backwards"""
+        i = 1 if forward else -1
+        return (self.keyset_index + i) % len(self.keysets)

src/krux/pages/wallet_settings.py

@@ -56,7 +56,7 @@
 from ..key import P2PKH, P2SH_P2WPKH, P2WPKH, P2WSH, P2TR
 
 PASSPHRASE_MAX_LEN = 200
-DERIVATION_KEYPAD = "123456789/0h"
+DERIVATION_KEYPAD = "1234567890/h"
 
 MINISCRIPT_DEFAULT_DERIVATION = "m/48h/0h/0h/2h"