Merge pull request #198 from LedgerHQ/fbe/fix_navigation_for_latest_stax

Move Stax layout navigation following API_LEVEL_21 update

src/ragger/firmware/touch/positions.py

@@ -29,11 +29,10 @@ def __iter__(self):
 
 # Stax resolution is 400x670
 STAX_CENTER = Position(200, 335)
-STAX_CENTER_LEFT = Position(200, 40)
 # Flex resolution is 480x600
 FLEX_CENTER = Position(240, 300)
 
-# Used for Flex keyboard 'validation' button, which is not vertically centered, contrary to Stax
+STAX_BUTTON_UPPER_CENTER_MIDDLE = Position(200, 280)
 FLEX_BUTTON_UPPER_CENTER_MIDDLE = Position(240, 250)
 
 STAX_BUTTON_UPPER_LEFT = Position(36, 36)
@@ -49,8 +48,9 @@ def __iter__(self):
 FLEX_BUTTON_LOWER_MIDDLE = Position(240, 550)
 
 STAX_BUTTON_LOWER_RIGHT = Position(342, 606)
-FLEX_BUTTON_LOWER_MIDDLE_RIGHT = Position(320, 550)
 FLEX_BUTTON_LOWER_RIGHT = Position(430, 550)
+STAX_BUTTON_LOWER_MIDDLE_RIGHT = Position(266, 615)
+FLEX_BUTTON_LOWER_MIDDLE_RIGHT = Position(320, 550)
 
 STAX_BUTTON_ABOVE_LOWER_MIDDLE = Position(200, 515)
 FLEX_BUTTON_ABOVE_LOWER_MIDDLE = Position(240, 435)
@@ -374,7 +374,7 @@ def __iter__(self):
         Firmware.FLEX: FLEX_CENTER,
     },
     "KeyboardConfirmationButton": {
-        Firmware.STAX: STAX_CENTER,
+        Firmware.STAX: STAX_BUTTON_UPPER_CENTER_MIDDLE,
         Firmware.FLEX: FLEX_BUTTON_UPPER_CENTER_MIDDLE,
     },
     "RightHeader": {
@@ -394,7 +394,7 @@ def __iter__(self):
         Firmware.FLEX: FLEX_BUTTON_LOWER_LEFT
     },
     "CancelFooter": {
-        Firmware.STAX: STAX_BUTTON_LOWER_MIDDLE,
+        Firmware.STAX: STAX_BUTTON_LOWER_LEFT,
         Firmware.FLEX: FLEX_BUTTON_LOWER_LEFT
     },
     "UseCaseHome": {
@@ -427,7 +427,7 @@ def __iter__(self):
         Firmware.STAX: {
             "single_page_exit": STAX_BUTTON_UPPER_LEFT,
             "multi_page_exit": STAX_BUTTON_UPPER_LEFT,
-            "previous": STAX_BUTTON_LOWER_LEFT,
+            "previous": STAX_BUTTON_LOWER_MIDDLE_RIGHT,
             "next": STAX_BUTTON_LOWER_RIGHT,
         },
         Firmware.FLEX: {
@@ -452,7 +452,7 @@ def __iter__(self):
     "UseCaseChoice": {
         Firmware.STAX: {
             "confirm": STAX_BUTTON_ABOVE_LOWER_MIDDLE,
-            "reject": STAX_BUTTON_LOWER_MIDDLE,
+            "reject": STAX_BUTTON_LOWER_LEFT,
         },
         Firmware.FLEX: {
             "confirm": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,
@@ -469,10 +469,10 @@ def __iter__(self):
     },
     "UseCaseReview": {
         Firmware.STAX: {
-            "tap": STAX_CENTER_LEFT,
-            "previous": STAX_BUTTON_UPPER_LEFT,
+            "tap": STAX_BUTTON_LOWER_RIGHT,
+            "previous": STAX_BUTTON_LOWER_MIDDLE,
             "confirm": STAX_BUTTON_ABOVE_LOWER_MIDDLE,
-            "reject": STAX_BUTTON_LOWER_MIDDLE,
+            "reject": STAX_BUTTON_LOWER_LEFT,
         },
         Firmware.FLEX: {
             "tap": FLEX_BUTTON_LOWER_RIGHT,
@@ -498,7 +498,7 @@ def __iter__(self):
             "tap": STAX_BUTTON_ABOVE_LOWER_MIDDLE,
             "exit_qr": STAX_BUTTON_LOWER_MIDDLE,
             "confirm": STAX_BUTTON_ABOVE_LOWER_MIDDLE,
-            "cancel": STAX_BUTTON_LOWER_MIDDLE,
+            "cancel": STAX_BUTTON_LOWER_LEFT,
         },
         Firmware.FLEX: {
             "tap": FLEX_BUTTON_ABOVE_LOWER_MIDDLE,

tests/unit/firmware/touch/test_screen_FullScreen.py

@@ -24,10 +24,10 @@ def test_non_variable_layouts(self):
             (self.screen.navigation_header, POSITIONS["LeftHeader"][self.firmware]),
             (self.screen.tappable_center, POSITIONS["TappableCenter"][self.firmware]),
             (self.screen.centered_footer, POSITIONS["CenteredFooter"][self.firmware]),
-            (self.screen.cancel_footer, POSITIONS["CenteredFooter"][self.firmware]),
-            (self.screen.exit_footer, POSITIONS["CenteredFooter"][self.firmware]),
-            (self.screen.info_footer, POSITIONS["CenteredFooter"][self.firmware]),
-            (self.screen.settings_footer, POSITIONS["CenteredFooter"][self.firmware]),
+            (self.screen.cancel_footer, POSITIONS["CancelFooter"][self.firmware]),
+            (self.screen.exit_footer, POSITIONS["CancelFooter"][self.firmware]),
+            (self.screen.info_footer, POSITIONS["CancelFooter"][self.firmware]),
+            (self.screen.settings_footer, POSITIONS["CancelFooter"][self.firmware]),
         ]
         call_number = 0
         self.assertEqual(self.backend.finger_touch.call_count, call_number)