Merge pull request #2622 from switchifyapp/fix/scroll-in-movement-pad-2621

Move scroll into movement pad on PC control

Author: enaboapps

app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGrid.kt

@@ -235,15 +235,14 @@ fun PcControlCommandSections(
     modifier: Modifier = Modifier
 ) {
     val specs = pcMouseCompactControlSpecs(movementStep)
-    val dpadCells = specs.take(9).map { it.toCommandCell(enabled, onCommandSelected) }
-    val clickCells = specs.subList(9, 12).map { it.toCommandCell(enabled, onCommandSelected) }
-    val scrollCells = specs.subList(12, 14).map { it.toCommandCell(enabled, onCommandSelected) }
+    val dpadCells = specs.take(12).map { it.toCommandCell(enabled, onCommandSelected) }
+    val clickCells = specs.subList(12, 15).map { it.toCommandCell(enabled, onCommandSelected) }
 
     Column(modifier = modifier.fillMaxWidth()) {
         Section(titleResId = R.string.pc_mouse_section_movement) {
             Box(modifier = Modifier.padding(12.dp)) {
                 PcCompactCommandGrid(
-                    columns = 3,
+                    columns = 4,
                     minTileHeightDp = 56,
                     cells = dpadCells
                 )
@@ -263,15 +262,6 @@ fun PcControlCommandSections(
             onSizeSelected = onSizeSelected,
             enabled = sizeSelectorEnabled
         )
-        Section(titleResId = R.string.pc_mouse_section_scroll) {
-            Box(modifier = Modifier.padding(12.dp)) {
-                PcCompactCommandGrid(
-                    columns = 2,
-                    minTileHeightDp = 52,
-                    cells = scrollCells
-                )
-            }
-        }
     }
 }
 
@@ -556,18 +546,18 @@ fun pcMouseCompactControlSpecs(moveStep: Int): List<PcMouseControlSpec?> {
         movement[0],
         movement[1],
         movement[2],
+        scroll[0],
         movement[3],
         clicks[0],
         movement[4],
+        null,
         movement[5],
         movement[6],
         movement[7],
+        scroll[1],
         clicks[1],
         clicks[2],
-        clicks[3],
-        scroll[0],
-        scroll[1],
-        null
+        clicks[3]
     )
 }
 

app/src/main/res/values/strings.xml

@@ -386,7 +386,6 @@
     <string name="pc_mouse_movement_large">Large</string>
     <string name="pc_mouse_section_movement">Movement</string>
     <string name="pc_mouse_section_clicks">Clicks</string>
-    <string name="pc_mouse_section_scroll">Scroll</string>
     <string name="request_rejected">Request rejected.</string>
     <string name="request_expired_try_again">Request expired. Try again.</string>
     <string name="pc_mouse_up_left">Up left</string>

app/src/test/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGridTest.kt

@@ -115,7 +115,7 @@ class PcControlCommandGridTest {
     fun compactCommandsPutClickInMovementPadCenter() {
         val commands = pcMouseCompactControlSpecs(40).mapNotNull { it?.command }
 
-        assertEquals(PcControlCommand.LeftClick, commands[4])
+        assertEquals(PcControlCommand.LeftClick, commands[5])
     }
 
     @Test
@@ -127,35 +127,35 @@ class PcControlCommandGridTest {
                 PcControlCommand.Move(-40, -40),
                 PcControlCommand.Move(0, -40),
                 PcControlCommand.Move(40, -40),
+                PcControlCommand.Scroll(0, 5),
                 PcControlCommand.Move(-40, 0),
                 PcControlCommand.LeftClick,
                 PcControlCommand.Move(40, 0),
                 PcControlCommand.Move(-40, 40),
                 PcControlCommand.Move(0, 40),
                 PcControlCommand.Move(40, 40),
+                PcControlCommand.Scroll(0, -5),
                 PcControlCommand.DoubleClick,
                 PcControlCommand.RightClick,
-                PcControlCommand.DragStart(),
-                PcControlCommand.Scroll(0, 5),
-                PcControlCommand.Scroll(0, -5)
+                PcControlCommand.DragStart()
             ),
             commands
         )
     }
 
     @Test
-    fun compactCommandsPadFinalRow() {
+    fun compactCommandsPadScrollColumnMiddle() {
         val specs = pcMouseCompactControlSpecs(40)
 
         assertEquals(15, specs.size)
         assertEquals(14, specs.filterNotNull().size)
-        assertEquals(null, specs[14])
+        assertEquals(null, specs[7])
     }
 
     @Test
     fun compactCommandsIncludeDragInStableScanOrder() {
         val commands = pcMouseCompactControlSpecs(40).mapNotNull { it?.command }
 
-        assertEquals(PcControlCommand.DragStart(), commands[11])
+        assertEquals(PcControlCommand.DragStart(), commands[13])
     }
 }