From 942fe63d9688ee86cc7ca7b0d4636c6eb617fdc7 Mon Sep 17 00:00:00 2001
From: Aleksandras Kostarevas <aleks076@protonmail.com>
Date: Sat, 24 Aug 2024 15:02:37 +0300
Subject: [PATCH] Update AltPages to List<Row> instead of Keyboard

---
 java/assets/layouts/Default/ipa.yaml                 | 12 ++----------
 java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt |  4 +---
 .../futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt |  2 ++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/java/assets/layouts/Default/ipa.yaml b/java/assets/layouts/Default/ipa.yaml
index 5198817bf..766659efc 100644
--- a/java/assets/layouts/Default/ipa.yaml
+++ b/java/assets/layouts/Default/ipa.yaml
@@ -85,11 +85,7 @@ rows:
           - "$delete"
 
 altPages:
-    - name: International Phonetic Alphabet
-      minimumFunctionalKeyWidth: 0.0
-      attributes: *attrs
-      rows:
-          - letters:
+    -     - letters:
                 - "i"
                 - "y"
                 - "$gap"
@@ -158,11 +154,7 @@ altPages:
                 - "ɑ"
                 - "ɒ"
                 - "$delete"
-    - name: International Phonetic Alphabet
-      minimumFunctionalKeyWidth: 0.0
-      attributes: *attrs
-      rows:
-          - letters:
+    -     - letters:
                 - "ɓ̥"
                 - "ɓ"
                 - "ɗ̥"
diff --git a/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt b/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
index 9abdc5a89..79fbed86e 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
@@ -149,9 +149,7 @@ data class Keyboard(
     val minimumFunctionalKeyWidth: Float = 0.125f,
     val minimumBottomRowFunctionalKeyWidth: Float = 0.15f,
 
-    // TODO: These should probably be lists of List<Row> or similar,
-    // it doesn't make sense to declare name and description repeatedly
-    val altPages: List<Keyboard> = listOf()
+    val altPages: List<List<Row>> = listOf()
 ) {
     var id: String = ""
 
diff --git a/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt b/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
index 5c222c199..dc9f12bd9 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
@@ -169,6 +169,8 @@ class KeyboardLayoutSetV2 internal constructor(
                 val baseElement = element.copy(page = KeyboardLayoutPage.Base)
                 val baseLayout = elements[baseElement]
                 baseLayout?.altPages?.get(altIdx)
+            }?.let {
+                mainLayout.copy(definedRows = it)
             }
         } ?: run {
             // If all else fails, show the error layout