Fix cameras locations (#5)

* fix cameras button locations
flipperdevices · Sep 2, 2024 · 1358f05 · 1358f05
1 parent c82c540
commit 1358f05
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 62 deletions.
diff --git a/...or/ui/src/main/kotlin/com/flipperdevices/ifrmvp/kenerator/ui/category/camera/CameraMap.kt b/...or/ui/src/main/kotlin/com/flipperdevices/ifrmvp/kenerator/ui/category/camera/CameraMap.kt
@@ -6,6 +6,17 @@ import com.flipperdevices.ifrmvp.model.buttondata.ButtonData.ButtonType
 
 internal class CameraMap : BrandMap by BrandMap.Default(
     getMap = {
+        val singleButtonLocations = buildList {
+            Position(x = 0, y = 0).run(::add)
+            Position(x = 1, y = 0).run(::add)
+            Position(x = 3, y = 0).run(::add)
+            Position(x = 4, y = 0).run(::add)
+            (0..4).map { x -> Position(x = x, y = 1) }.run(::addAll)
+            (0..4).map { x -> Position(x = x, y = 10) }.run(::addAll)
+        }.toMutableList()
+        val navigationLocations = mutableListOf(
+            Position(x = 1, y = 7, containerHeight = 3, containerWidth = 3)
+        )
         ButtonType.entries.associateWith {
             when (it) {
                 ButtonType.POWER -> mutableListOf(
@@ -15,24 +26,15 @@ internal class CameraMap : BrandMap by BrandMap.Default(
                 ButtonType.UNKNOWN,
                 ButtonType.TEXT,
                 ButtonType.ICON,
-                ButtonType.BASE64_IMAGE -> buildList {
-                    Position(x = 0, y = 0).run(::add)
-                    Position(x = 1, y = 0).run(::add)
-                    Position(x = 3, y = 0).run(::add)
-                    Position(x = 4, y = 0).run(::add)
-                    (0..4).map { x -> Position(x = x, y = 1) }.run(::addAll)
-                    (0..4).map { x -> Position(x = x, y = 10) }.run(::addAll)
-                }.toMutableList()
+                ButtonType.BASE64_IMAGE -> singleButtonLocations
 
 
                 ButtonType.SHUTTER -> mutableListOf(
                     Position(x = 1, y = 3, containerHeight = 3, containerWidth = 3)
                 )
 
                 ButtonType.OK_NAVIGATION,
-                ButtonType.NAVIGATION -> mutableListOf(
-                    Position(x = 1, y = 7, containerHeight = 3, containerWidth = 3)
-                )
+                ButtonType.NAVIGATION -> navigationLocations
 
 
                 ButtonType.VOLUME,

diff --git a/.../ui/src/main/kotlin/com/flipperdevices/ifrmvp/kenerator/ui/category/dvd/DvdUiGenerator.kt b/.../ui/src/main/kotlin/com/flipperdevices/ifrmvp/kenerator/ui/category/dvd/DvdUiGenerator.kt