Remove feature to shift the keypad to the left and right side

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

Hide file tree

Showing 6 changed files with 2 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - Removed message when cheating/revealing cells. It seemed to be not motivating at all.
+- Removed the possibility to shift the keypad from center to the left and right.
 
 ### Fixed
 

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/BottomAppBarItemClickListener.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/BottomAppBarItemClickListener.kt
@@ -1,25 +1,19 @@
 package org.piepmeyer.gauguin.ui.main
 
-import android.transition.TransitionManager
 import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.piepmeyer.gauguin.R
 import org.piepmeyer.gauguin.game.Game
 import org.piepmeyer.gauguin.game.GameSolveService
 
 class BottomAppBarItemClickListener(
-    private val mainConstraintLayout: ConstraintLayout,
     private val mainActivity: MainActivity,
 ) : Toolbar.OnMenuItemClickListener, KoinComponent {
     private val game: Game by inject()
     private val gameSolveService: GameSolveService by inject()
 
-    private var keypadFrameHorizontalBias = 0f
-
     override fun onMenuItemClick(menuItem: MenuItem): Boolean {
         when (menuItem.itemId) {
             R.id.hintOrNewGame -> mainActivity.checkProgressOrStartNewGame()
@@ -47,18 +41,6 @@ class BottomAppBarItemClickListener(
                 gameSolveService.solveGrid()
                 mainActivity.cheatedOnGame()
             }
-
-            R.id.menu_swap_keypad -> {
-                keypadFrameHorizontalBias += 0.25f
-                if (keypadFrameHorizontalBias == 1.0f) {
-                    keypadFrameHorizontalBias = 0.25f
-                }
-                val constraintSet = ConstraintSet()
-                constraintSet.clone(mainConstraintLayout)
-                constraintSet.setHorizontalBias(R.id.keypadFrame, keypadFrameHorizontalBias)
-                TransitionManager.beginDelayedTransition(mainConstraintLayout)
-                constraintSet.applyTo(mainConstraintLayout)
-            }
         }
 
         return true

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainNavigationViewService.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainNavigationViewService.kt
@@ -170,10 +170,7 @@ class MainNavigationViewService(
         }
 
         binding.mainBottomAppBar.setOnMenuItemClickListener(
-            BottomAppBarItemClickListener(
-                binding.mainConstraintLayout,
-                mainActivity,
-            ),
+            BottomAppBarItemClickListener(mainActivity),
         )
         binding.mainBottomAppBar.setNavigationOnClickListener { binding.container.open() }
 

diff --git a/gauguin-app/src/main/res/menu/bottom_app_bar.xml b/gauguin-app/src/main/res/menu/bottom_app_bar.xml
@@ -35,10 +35,4 @@
         android:title="@string/menu_show_solution"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_swap_keypad"
-        android:title="@string/main_activity_manu_item_swap_key_pad"
-        android:icon="@drawable/baseline_swap_horiz_24"
-        app:showAsAction="never" />
-
 </menu>
diff --git a/gauguin-app/src/main/res/values-de-rDE/strings.xml b/gauguin-app/src/main/res/values-de-rDE/strings.xml
@@ -103,7 +103,6 @@
     <string name="setting_pencil_at_start_summary_on">Mit gefüllten möglichen Zahlen beginnen</string>
     <string name="setting_pencil_at_start_summary_off">Keine möglichen Zahlen beim Spielstart eintragen</string>
     <string name="game_erase_selected_cell">Zelle löschen</string>
-    <string name="main_activity_manu_item_swap_key_pad">Zahlenbereich verschieben</string>
     <string name="main_activity_manu_item_undo_one_step">Rückgängig</string>
     <string name="main_activity_current_game_saved">Spiel erfolgreich gespeichert.</string>
     <string name="load_game_screen_app_bar_button_delete_all">Alle Spiele löschen</string>

diff --git a/gauguin-app/src/main/res/values/strings.xml b/gauguin-app/src/main/res/values/strings.xml
@@ -127,7 +127,6 @@
     <string name="setting_pencil_at_start_summary_on">Begin with filled pencil marks</string>
     <string name="setting_pencil_at_start_summary_off">Empty pencil marks at start</string>
     <string name="game_erase_selected_cell">Erase Cell</string>
-    <string name="main_activity_manu_item_swap_key_pad">Swap key pad</string>
     <string name="main_activity_manu_item_undo_one_step">Undo</string>
     <string name="main_activity_current_game_saved">Game saved successfully.</string>
     <string name="load_game_screen_app_bar_button_delete_all">Delete All</string>