Move popup messages of the main screen to cover the bottom app bar

meikpiep · Jan 23, 2024 · 2d7c125 · 2d7c125
1 parent db1450e
commit 2d7c125
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Move the popup messages of the main screen to the absolute bottom of the screen, now covering the
+ bottom app bar. Avoids covering the bottom row of number buttons when checking if there are errors.
+
 ### Deprecated
 
 ### Removed

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
@@ -6,6 +6,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
@@ -381,8 +382,22 @@ class MainActivity : AppCompatActivity(), GridCreationListener {
             }
 
         val snackbar =
-            Snackbar.make(binding.hintOrNewGame, text, duration)
-                .setAnchorView(binding.hintOrNewGame)
+            Snackbar.make(binding.root, text, duration)
+
+        val params = snackbar.view.layoutParams as ViewGroup.MarginLayoutParams
+
+        val startMarginOfBottomAppBar =
+            (binding.mainBottomAppBar.layoutParams as ViewGroup.MarginLayoutParams)
+                .marginStart
+
+        params.setMargins(
+            params.leftMargin + startMarginOfBottomAppBar,
+            params.topMargin,
+            params.rightMargin,
+            params.bottomMargin,
+        )
+
+        snackbar.view.layoutParams = params
 
         if (mistakes > 0 && game.undoManager.isUndoPossible()) {
             snackbar.setAction(resources.getText(R.string.hint_as_toast_undo_last_step)) {
@@ -396,17 +411,15 @@ class MainActivity : AppCompatActivity(), GridCreationListener {
 
     private fun showSnackbar(string: String): Snackbar {
         val snackbar =
-            Snackbar.make(binding.hintOrNewGame, string, Snackbar.LENGTH_LONG)
-                .setAnchorView(binding.hintOrNewGame)
+            Snackbar.make(binding.root, string, Snackbar.LENGTH_LONG)
 
         snackbar.show()
 
         return snackbar
     }
 
     fun gameSaved() {
-        Snackbar.make(binding.hintOrNewGame, resources.getText(R.string.main_activity_current_game_saved), Snackbar.LENGTH_LONG)
-            .setAnchorView(binding.hintOrNewGame)
+        Snackbar.make(binding.root, resources.getText(R.string.main_activity_current_game_saved), Snackbar.LENGTH_LONG)
             .show()
     }
 

diff --git a/gauguin-app/src/main/res/layout-land/activity_main.xml b/gauguin-app/src/main/res/layout-land/activity_main.xml
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_marginBottom="48dp"
+                android:layout_marginBottom="72dp"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@id/gridview"
                 app:layout_constraintTop_toBottomOf="@id/gameTopFrame"

diff --git a/gauguin-app/src/main/res/layout/activity_main.xml b/gauguin-app/src/main/res/layout/activity_main.xml
@@ -20,7 +20,7 @@
             android:id="@+id/mainConstraintLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="48dp">
+            android:layout_marginBottom="72dp">
 
             <FrameLayout
                 android:id="@+id/gameTopFrame"