main screen: avoid key pad to be overlapped by grid using a tablet

meikpiep · Oct 20, 2024 · 72a014a · 72a014a
1 parent eac6844
commit 72a014a
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 5 deletions.
diff --git a/gauguin-app/src/main/res/layout-sw600dp-land/activity_main.xml b/gauguin-app/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -39,15 +39,15 @@
 
             <org.piepmeyer.gauguin.ui.grid.GridUI
                 android:id="@+id/gridview"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="120dp"
                 android:transitionName="grid"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@id/gameTopFrame"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/keypadFrame"
                 app:layout_constraintTop_toBottomOf="@id/gameTopFrame" />
 
@@ -87,7 +87,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="16dp"
-                app:layout_constraintStart_toEndOf="@id/gridview"
                 app:layout_constraintEnd_toEndOf="@id/gameTopFrame"
                 app:layout_constraintTop_toBottomOf="@id/gameTopFrame"
                 app:layout_constraintBottom_toBottomOf="parent"/>

diff --git a/gauguin-app/src/main/res/layout-sw840dp-land/activity_main.xml b/gauguin-app/src/main/res/layout-sw840dp-land/activity_main.xml
@@ -87,8 +87,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="16dp"
-                app:layout_constraintStart_toEndOf="@id/gridview"
-                app:layout_constraintEnd_toEndOf="@id/gameTopFrame"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/gameTopFrame"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 

diff --git a/...otTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...otTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...otTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...otTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...in/ui/main/MainActivityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGame.png b/...in/ui/main/MainActivityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGame.png
diff --git a/...ActivityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithCellDetails.png b/...ActivityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithCellDetails.png
diff --git a/...vityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGrid.png b/...vityScreenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGrid.png
diff --git a/...ARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png b/...ARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...otTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...otTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...otTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...otTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...in/ui/main/MainActivityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGame.png b/...in/ui/main/MainActivityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGame.png
diff --git a/...ActivityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithCellDetails.png b/...ActivityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithCellDetails.png
diff --git a/...vityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGrid.png b/...vityScreenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGrid.png
diff --git a/...EDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png b/...EDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png