Update AltPages to List<Row> instead of Keyboard

java/assets/layouts/Default/ipa.yaml

@@ -85,11 +85,7 @@ rows:
           - "$delete"
 
 altPages:
-    - name: International Phonetic Alphabet
+    -     - letters:
-      minimumFunctionalKeyWidth: 0.0
-      attributes: *attrs
-      rows:
-          - letters:
                 - "i"
                 - "y"
                 - "$gap"
@@ -158,11 +154,7 @@ altPages:
                 - "ɑ"
                 - "ɒ"
                 - "$delete"
-    - name: International Phonetic Alphabet
+    -     - letters:
-      minimumFunctionalKeyWidth: 0.0
-      attributes: *attrs
-      rows:
-          - letters:
                 - "ɓ̥"
                 - "ɓ"
                 - "ɗ̥"

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,
+    val altPages: List<List<Row>> = listOf()
-    // it doesn't make sense to declare name and description repeatedly
-    val altPages: List<Keyboard> = listOf()
 ) {
     var id: String = ""
 

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