wip

meikpiep · Jan 6, 2025 · 168ad83 · 168ad83
1 parent d57a751
commit 168ad83
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 8 deletions.
diff --git a/gauguin-app/src/main/res/layout-sw600dp/fragment_new_game_grid_shape_options.xml b/gauguin-app/src/main/res/layout-sw600dp/fragment_new_game_grid_shape_options.xml
@@ -36,7 +36,11 @@
                 android:id="@+id/squareRectangularToggleGroup"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:singleSelection="true"
                 app:selectionRequired="true"
@@ -64,10 +68,10 @@
                 android:id="@+id/widthslider"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginTop="8dp"
+                app:layout_constraintStart_toEndOf="@id/squareRectangularToggleGroup"
                 app:layout_constraintEnd_toStartOf="@id/newGameGridSize"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/squareRectangularToggleGroup"
                 android:valueFrom="3.0"
                 android:valueTo="11.0"
                 android:stepSize="1.0"/>
@@ -76,10 +80,11 @@
                 android:id="@+id/heigthslider"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
                 app:layout_constraintStart_toStartOf="@id/widthslider"
                 app:layout_constraintEnd_toEndOf="@id/widthslider"
                 app:layout_constraintTop_toBottomOf="@id/widthslider"
-                app:layout_constraintBottom_toTopOf="@id/squareRectangularToggleGroup"
+                app:layout_constraintBottom_toBottomOf="parent"
                 android:valueFrom="3.0"
                 android:valueTo="11.0"
                 android:stepSize="1.0" />
@@ -91,10 +96,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="16dp"
-                app:layout_constraintStart_toEndOf="@id/widthslider"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/widthslider"
-                app:layout_constraintTop_toBottomOf="@id/squareRectangularToggleGroup" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>

diff --git a/gauguin-app/src/main/res/layout/fragment_new_game_grid_shape_options.xml b/gauguin-app/src/main/res/layout/fragment_new_game_grid_shape_options.xml
@@ -28,7 +28,7 @@
         app:layout_constraintBottom_toTopOf="@id/newGameNewAlgorithmSwitch"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        style="?attr/materialCardViewElevatedStyle">
+        style="?attr/materialCardViewFilledStyle">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -39,6 +39,9 @@
                 android:id="@+id/squareRectangularToggleGroup"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -66,6 +69,7 @@
                 android:id="@+id/widthslider"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 app:layout_constraintStart_toEndOf="@id/squareRectangularToggleGroup"
                 app:layout_constraintEnd_toStartOf="@id/newGameGridSize"
                 app:layout_constraintTop_toTopOf="parent"
@@ -77,6 +81,7 @@
                 android:id="@+id/heigthslider"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
                 app:layout_constraintStart_toStartOf="@id/widthslider"
                 app:layout_constraintEnd_toEndOf="@id/widthslider"
                 app:layout_constraintTop_toBottomOf="@id/widthslider"

diff --git a/...eActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...eActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...GameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...GameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...wGameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...wGameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...ameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...ameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...eActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...eActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...GameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...GameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...wGameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...wGameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...ameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...ameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...wGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...wGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/.../NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/.../NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...e/NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...e/NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...ewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...ewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...e/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...e/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...me/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...me/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/.../NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/.../NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...ameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...ameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...ewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...ewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...NewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...NewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...wGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...wGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png