wip

meikpiep · Feb 20, 2025 · 0ca568d · 0ca568d
1 parent cb2ca7c
commit 0ca568d
Show file tree

Hide file tree

Showing 46 changed files with 41 additions and 26 deletions.
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/KeyPadFragment.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/KeyPadFragment.kt
@@ -68,19 +68,18 @@ class KeyPadFragment :
             addButtonListeners(it)
         }
 
+        if (layoutId != layoutCalculator.calculateLayoutId(game.grid)) {
+            requireActivity().recreate()
+            // this.requireView().forceLayout()
+        }
+
         val viewModel: MainViewModel by viewModels()
 
         lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.uiState.collect {
-                    if (it.state == MainUiState.PLAYING) {
-                        requireActivity().runOnUiThread {
-                            if (layoutId != layoutCalculator.calculateLayoutId(game.grid)) {
-                                requireActivity().recreate()
-                            } else {
-                                setButtonStates()
-                            }
-                        }
+                    requireActivity().runOnUiThread {
+                        setButtonStates()
                     }
                 }
             }

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainActivity.kt
@@ -36,7 +36,7 @@ class MainActivity : AppCompatActivity() {
     private val applicationPreferences: ApplicationPreferences by inject()
     private val activityUtils: ActivityUtils by inject()
 
-    private lateinit var binding: ActivityMainBinding
+    lateinit var binding: ActivityMainBinding
     private lateinit var bottomAppBarService: MainBottomAppBarService
 
     public override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/gauguin-app/src/main/res/layout-land/activity_main.xml b/gauguin-app/src/main/res/layout-land/activity_main.xml
@@ -76,7 +76,7 @@
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 app:layout_constraintTop_toTopOf="@id/keypadFrame"
                 app:layout_constraintBottom_toBottomOf="@id/keypadFrame"
                 app:layout_constraintStart_toStartOf="@id/keypadFrame"

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
@@ -102,7 +102,7 @@
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 app:layout_constraintStart_toEndOf="@id/gridview"
                 app:layout_constraintEnd_toEndOf="@id/gameTopFrame"
                 app:layout_constraintTop_toBottomOf="@id/gameTopFrame"

diff --git a/gauguin-app/src/main/res/layout-sw600dp/activity_main.xml b/gauguin-app/src/main/res/layout-sw600dp/activity_main.xml
@@ -106,7 +106,7 @@
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 app:layout_constraintTop_toTopOf="@id/keypadFrame"
                 app:layout_constraintBottom_toBottomOf="@id/keypadFrame"
                 app:layout_constraintStart_toStartOf="@id/keypadFrame"

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
@@ -103,7 +103,7 @@
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="16dp"
                 app:layout_constraintStart_toEndOf="@id/gridview"

diff --git a/gauguin-app/src/main/res/layout-sw840dp/activity_main.xml b/gauguin-app/src/main/res/layout-sw840dp/activity_main.xml
@@ -85,8 +85,8 @@
 
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="16dp"
                 app:layout_constraintStart_toEndOf="@id/gridview"

diff --git a/gauguin-app/src/main/res/layout/activity_main.xml b/gauguin-app/src/main/res/layout/activity_main.xml
@@ -34,7 +34,7 @@
 
             <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="8dp"
                 android:layout_marginBottom="8dp"
@@ -49,8 +49,6 @@
                 android:id="@+id/keypadFrame"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintVertical_bias="0.75"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -59,10 +57,9 @@
 
             <FrameLayout
                 android:id="@+id/fastFinishingModeFrame"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintVertical_bias="0.75"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="96dp"
                 app:layout_constraintTop_toTopOf="@id/keypadFrame"
                 app:layout_constraintBottom_toBottomOf="@id/keypadFrame"
                 app:layout_constraintStart_toStartOf="parent"

diff --git a/gauguin-app/src/main/res/layout/fragment_main_fast_finishing_mode.xml b/gauguin-app/src/main/res/layout/fragment_main_fast_finishing_mode.xml
@@ -20,9 +20,9 @@
         android:layout_margin="16dp"
         android:visibility="invisible"
 
-        android:backgroundTint="#50000000"
-        android:foregroundTint="?attr/colorCustomColor1"
-        style="@style/Widget.Material3.CardView.Elevated"
+        android:backgroundTint="?attr/colorCustomColor1"
+        android:foregroundTint="#50000000"
+        style="MaterialCarView.FastFinishingMode"
         >
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -92,7 +92,7 @@
                 android:layout_margin="16dp"
                 android:text="@string/fast_finishing_mode_deactivate_fast_finishing_mode_button"
                 app:icon="@drawable/outline_clear_24"
-                style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Tertiary"
+                style="@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Surface"
                 />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/gauguin-app/src/main/res/values/styles.xml b/gauguin-app/src/main/res/values/styles.xml
@@ -142,4 +142,7 @@
         <item name="legendTextColor">?attr/colorOnSurface</item>
     </style>
 
+
+    <style name="MaterialCarView.FastFinishingMode" parent="Widget.Material3.CardView.Outlined">
+    </style>
 </resources>
diff --git a/gauguin-app/src/test/kotlin/org/piepmeyer/gauguin/ui/main/MainActivityScreenshotTest.kt b/gauguin-app/src/test/kotlin/org/piepmeyer/gauguin/ui/main/MainActivityScreenshotTest.kt
@@ -43,6 +43,7 @@ class MainActivityScreenshotTest(
         NewGame,
         NewGameWithCellDetails,
         GameWith6x6GridFromZeroOnPossibleIn3x3,
+        GameWith6x6GridFastFinishingMode,
         GameWith7x7GridFromZeroOnPossibleIn3x3,
         NewGameWithRectangularGrid,
         NewGameWithRectangularGridAndFastFinishingMode,
@@ -100,6 +101,10 @@ class MainActivityScreenshotTest(
             onActivityViaUiState()
 
             gameLifecycle.stoppGameTimerAndResetGameTime()
+
+            while (it.binding.mainBottomAppBar.isLayoutRequested) {
+                Thread.sleep(100)
+            }
         }
 
         robolectricScreenshotRule
@@ -140,6 +145,17 @@ class MainActivityScreenshotTest(
                 game.gridUI.invalidate()
             }
 
+            UiStateEnum.GameWith6x6GridFastFinishingMode -> {
+                preferences.gridTakesRemainingSpaceIfNecessary = false
+
+                game.updateGrid(createGrid(11, 11))
+
+                game.selectCell(game.grid.getCell(15))
+                game.enterFastFinishingMode()
+
+                game.gridUI.invalidate()
+            }
+
             UiStateEnum.GameWith7x7GridFromZeroOnPossibleIn3x3 -> {
                 preferences.show3x3Pencils = true
                 game.updateGrid(

diff --git a/...yScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png b/...yScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png
diff --git a/...nshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...nshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...nshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...nshotTest_LARGE_DESKTOP_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...uguin/ui/main/MainActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGame.png b/...uguin/ui/main/MainActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGame.png
diff --git a/...ainActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithCellDetails.png b/...ainActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithCellDetails.png
diff --git a/...ctivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithRectangularGrid.png b/...ctivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithRectangularGrid.png
diff --git a/...t_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png b/...t_LARGE_DESKTOP_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...reenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith6x6GridFastFinishingMode.png b/...reenshotTest_LARGE_DESKTOP_NIGHT_LANDSCAPE_GameWith6x6GridFastFinishingMode.png
diff --git a/...ARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png b/...ARGE_DESKTOP_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...yScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png b/...yScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png
diff --git a/...ctivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_NewGameWithRectangularGrid.png b/...ctivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_NewGameWithRectangularGrid.png
diff --git a/...t_MEDIUM_TABLET_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png b/...t_MEDIUM_TABLET_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...reenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith6x6GridFastFinishingMode.png b/...reenshotTest_MEDIUM_TABLET_NIGHT_LANDSCAPE_GameWith6x6GridFastFinishingMode.png
diff --git a/...EDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png b/...EDIUM_TABLET_NIGHT_LANDSCAPE_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...ivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png b/...ivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png
diff --git a/...creenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...creenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...creenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...creenshotTest_NEXUS_ONE_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...r/gauguin/ui/main/MainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGame.png b/...r/gauguin/ui/main/MainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGame.png
diff --git a/...in/MainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithCellDetails.png b/...in/MainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithCellDetails.png
diff --git a/...ainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithRectangularGrid.png b/...ainActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithRectangularGrid.png
diff --git a/...tTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png b/...tTest_NEXUS_ONE_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...tivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png b/...tivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png
diff --git a/...ScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...ScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...ScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...ScreenshotTest_PIXEL_4A_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...er/gauguin/ui/main/MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGame.png b/...er/gauguin/ui/main/MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGame.png
diff --git a/...ain/MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithCellDetails.png b/...ain/MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithCellDetails.png
diff --git a/...MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithRectangularGrid.png b/...MainActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithRectangularGrid.png
diff --git a/...otTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png b/...otTest_PIXEL_4A_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png
diff --git a/...ityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png b/...ityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith6x6GridFastFinishingMode.png
diff --git a/...eenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png b/...eenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith6x6GridFromZeroOnPossibleIn3x3.png
diff --git a/...eenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png b/...eenshotTest_SMALL_PHONE_DAY_PORTRAIT_GameWith7x7GridFromZeroOnPossibleIn3x3.png
diff --git a/...gauguin/ui/main/MainActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGame.png b/...gauguin/ui/main/MainActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGame.png
diff --git a/.../MainActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGameWithCellDetails.png b/.../MainActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGameWithCellDetails.png
diff --git a/...nActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGameWithRectangularGrid.png b/...nActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NewGameWithRectangularGrid.png
diff --git a/...est_SMALL_PHONE_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png b/...est_SMALL_PHONE_DAY_PORTRAIT_NewGameWithRectangularGridAndFastFinishingMode.png