From 27d46eb85115d78623c6694a00262e5853cb6bc8 Mon Sep 17 00:00:00 2001
From: EduRGB <25287542+EduRGB@users.noreply.github.com>
Date: Sat, 22 Mar 2025 04:57:21 +0100
Subject: [PATCH] Add full-featured number row layout and set it as default;
 set existing layout as basic.

---
 .../assets/layouts/number_row/number_row.json |  44 +++++++
 .../assets/layouts/number_row/number_row.txt  | 124 ------------------
 .../layouts/number_row/number_row_basic.txt   |  10 ++
 app/src/main/res/values/strings.xml           |   2 +
 4 files changed, 56 insertions(+), 124 deletions(-)
 create mode 100644 app/src/main/assets/layouts/number_row/number_row.json
 delete mode 100644 app/src/main/assets/layouts/number_row/number_row.txt
 create mode 100644 app/src/main/assets/layouts/number_row/number_row_basic.txt

diff --git a/app/src/main/assets/layouts/number_row/number_row.json b/app/src/main/assets/layouts/number_row/number_row.json
new file mode 100644
index 00000000..3ad11861
--- /dev/null
+++ b/app/src/main/assets/layouts/number_row/number_row.json
@@ -0,0 +1,44 @@
+[
+    [
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "!" },
+        "default": { "label": "1", "popup": { "relevant": [{ "label": "¹" }, { "label": "½" }, { "label": "⅓" }, { "label": "¼" }, { "label": "⅛" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "@" },
+        "default": { "label": "2", "popup": { "relevant": [{ "label": "²" }, { "label": "⅔" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "#" },
+        "default": { "label": "3", "popup": { "relevant": [{ "label": "³" }, { "label": "¾" }, { "label": "⅜" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "$" },
+        "default": { "label": "4", "popup": { "relevant": [{ "label": "⁴" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "%" },
+        "default": { "label": "5", "popup": { "relevant": [{ "label": "⁵" }, { "label": "⅝" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "^" },
+        "default": { "label": "6", "popup": { "relevant": [{ "label": "⁶" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "&" },
+        "default": { "label": "7", "popup": { "relevant": [{ "label": "⁷" }, { "label": "⅞" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "*" },
+        "default": { "label": "8", "popup": { "relevant": [{ "label": "⁸" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": "(" },
+        "default": { "label": "9", "popup": { "relevant": [{ "label": "⁹" }] } }
+      },
+      { "$": "shift_state_selector",
+        "manualOrLocked": { "label": ")" },
+        "default": { "label": "0", "popup": { "relevant": [{ "label": "⁰" }, { "label": "ⁿ" }, { "label": "∅" }] } }
+      }
+    ]
+  ]
\ No newline at end of file
diff --git a/app/src/main/assets/layouts/number_row/number_row.txt b/app/src/main/assets/layouts/number_row/number_row.txt
deleted file mode 100644
index 84dbed0a..00000000
--- a/app/src/main/assets/layouts/number_row/number_row.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-[
-  [
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "!" },
-      "default": { 
-        "label": "1", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "¹" }, { "label": "½" }, { "label": "⅓" }, { "label": "¼" }, { "label": "⅛" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "@" },
-      "default": { 
-        "label": "2", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "²" }, { "label": "⅔" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "#" },
-      "default": { 
-        "label": "3", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "³" }, { "label": "¾" }, { "label": "⅜" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "$" },
-      "default": { 
-        "label": "4", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁴" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "%" },
-      "default": { 
-        "label": "5", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁵" }, { "label": "⅝" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "^" },
-      "default": { 
-        "label": "6", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁶" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "&" },
-      "default": { 
-        "label": "7", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁷" }, { "label": "⅞" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "*" },
-      "default": { 
-        "label": "8", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁸" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": "(" },
-      "default": { 
-        "label": "9", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁹" } 
-          ] 
-        } 
-      } 
-    },
-    {
-      "$": "shift_state_selector",
-      "manualOrLocked": { "label": ")" },
-      "default": { 
-        "label": "0", 
-        "popup": { 
-          "relevant": [ 
-            { "label": "⁰" }, { "label": "ⁿ" }, { "label": "∅" } 
-          ] 
-        } 
-      } 
-    }
-  ]
-]
diff --git a/app/src/main/assets/layouts/number_row/number_row_basic.txt b/app/src/main/assets/layouts/number_row/number_row_basic.txt
new file mode 100644
index 00000000..709c30a8
--- /dev/null
+++ b/app/src/main/assets/layouts/number_row/number_row_basic.txt
@@ -0,0 +1,10 @@
+1 ¹ ½ ⅓ ¼ ⅛
+2 ² ⅔
+3 ³ ¾ ⅜
+4 ⁴
+5 ⁵ ⅝
+6 ⁶
+7 ⁷ ⅞
+8 ⁸
+9 ⁹
+0 ⁰ ⁿ ∅
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e063b07c..4d932c6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -559,6 +559,8 @@ disposition rather than other common dispositions for Latin languages. -->
     <string name="layout_numpad_landscape" tools:keep="@string/layout_numpad_landscape">Numpad (landscape)</string>
     <!-- Name for number row layout -->
     <string name="layout_number_row" tools:keep="@string/layout_number_row">Number row</string>
+    <!-- Name for number row basic layout -->
+    <string name="layout_number_row_basic" tools:keep="@string/layout_number_row_basic">Number row (basic)</string>
     <!-- Name for bottom row layout in emoji view -->
     <string name="layout_emoji_bottom_row" tools:keep="@string/layout_emoji_bottom_row">Emoji bottom row</string>
     <!-- Name for bottom row layout in clipboard view -->