wip

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

Hide file tree

Showing 3 changed files with 64 additions and 36 deletions.
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/grid/GridUI.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/grid/GridUI.kt
@@ -128,20 +128,47 @@ class GridUI :
         val maximumWidth = (gridSize.width * maximumCellSizeInDP * resources.displayMetrics.density).toInt()
         val maximumHeight = (gridSize.height * maximumCellSizeInDP * resources.displayMetrics.density).toInt()
 
-        return when {
-            widthMode == MeasureSpec.UNSPECIFIED && heightMode == MeasureSpec.UNSPECIFIED ->
-                Pair(maximumWidth, maximumHeight)
-            widthMode == MeasureSpec.EXACTLY && heightMode == MeasureSpec.EXACTLY ->
-                Pair(widthSize, heightSize)
-            else -> {
-                val cellSize = potentialCellSize(widthSize, heightSize)
-
-                Pair(
-                    min(widthSize, cellSize.first * gridSize.width),
-                    min(heightSize, cellSize.second * gridSize.height),
-                )
+        println("on measure: $widthMode x $heightMode")
+        println("on measure2: $widthSize x $heightSize")
+
+        val measured =
+            when {
+                widthMode == MeasureSpec.UNSPECIFIED && heightMode == MeasureSpec.UNSPECIFIED -> {
+                    println("both unspecified: $maximumWidth x $maximumHeight")
+
+                    Pair(maximumWidth, maximumHeight)
+                }
+                widthMode == MeasureSpec.EXACTLY && heightMode == MeasureSpec.EXACTLY -> {
+                    println("both exectly: $widthSize x $heightSize")
+
+                    Pair(widthSize, heightSize)
+                }
+                /*widthMode == MeasureSpec.EXACTLY && heightMode == MeasureSpec.AT_MOST -> {
+                    println("most: $widthSize x $heightSize")
+
+                    Pair(widthSize, min(widthSize, heightSize))
+                }*/
+                else -> {
+                    val cellSize = potentialCellSize(widthSize, heightSize)
+
+                    println("else with cellSize $cellSize")
+                    println(
+                        "else with ${min(
+                            widthSize,
+                            cellSize.first * gridSize.width,
+                        )} x ${min(heightSize, cellSize.second * gridSize.height)}",
+                    )
+
+                    Pair(
+                        min(widthSize, cellSize.first * gridSize.width),
+                        min(heightSize, cellSize.second * gridSize.height),
+                    )
+                }
             }
-        }
+
+        println("measured: ${measured.first} x ${measured.second}")
+
+        return measured
     }
 
     override fun onSizeChanged(

diff --git a/gauguin-app/src/main/res/layout-h840dp/activity_newgame.xml b/gauguin-app/src/main/res/layout-h840dp/activity_newgame.xml
@@ -10,7 +10,6 @@
     <FrameLayout
         android:id="@+id/bottomSheet"
         style="@style/Widget.Material3.BottomSheet"
-        app:backgroundTint="?attr/colorSurfaceVariant"
         android:layout_width="match_parent"
         android:layout_height="500dp"
         android:orientation="horizontal"

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
@@ -5,43 +5,42 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent" >
 
-    <org.piepmeyer.gauguin.ui.grid.GridUI
-        android:id="@+id/newGridPreview"
-        android:transitionName="grid"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/newGameSizeCardView"
-        />
-
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/newGameSizeCardView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintHeight_max="100dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         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"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             >
 
+            <org.piepmeyer.gauguin.ui.grid.GridUI
+                android:id="@+id/newGridPreview"
+                android:transitionName="grid"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/widthslider"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                />
+
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/squareRectangularToggleGroup"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/widthslider"
+                app:layout_constraintBottom_toBottomOf="@id/heigthslider"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:singleSelection="true"
                 app:selectionRequired="true"
                 >
@@ -68,7 +67,9 @@
                 android:layout_height="wrap_content"
                 app:layout_constraintStart_toEndOf="@id/squareRectangularToggleGroup"
                 app:layout_constraintEnd_toStartOf="@id/newGameGridSize"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/newGridPreview"
+                app:layout_constraintBottom_toTopOf="@id/heigthslider"
+                android:layout_marginTop="16dp"
                 android:valueFrom="3.0"
                 android:valueTo="11.0"
                 android:stepSize="1.0"/>
@@ -91,9 +92,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginEnd="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/newGridPreview"
                 app:layout_constraintBottom_toBottomOf="parent"
                 />