commit 453ee65ae654366386b89695a27b0776c34818a4
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Jul 4 15:33:11 2022 +0200

    Exit button in the main screen.

diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 9be24589..6fd802b4 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -77,7 +77,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
   private static final float BIG_BUTTON = 1.5f;
   private static final int[] mLocation = new int[2];
 
-  private TransparentImageButton mObjButton, mMenuButton, mSolveButton, mScrambleButton;
+  private TransparentImageButton mObjButton, mMenuButton, mExitButton;
   private TransparentButton mPlayButton;
   private PopupWindow mObjectPopup, mMenuPopup, mPlayPopup;
   private LinearLayout mPlayLayout;
@@ -128,9 +128,8 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     setupPlayButton(act,mScreenWidth);
     layoutTop.addView(mPlayButton);
 
-    setupSolveButton(act);
-    setupScrambleButton(act);
-    createBottomPane(act,mSolveButton,mScrambleButton);
+    setupExitButton(act);
+    createBottomPane(act,mExitButton,null);
     }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -468,41 +467,18 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  void setupSolveButton(final RubikActivity act)
+  void setupExitButton(final RubikActivity act)
     {
     int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve_new,R.drawable.ui_medium_cube_solve_new, R.drawable.ui_big_cube_solve_new, R.drawable.ui_huge_cube_solve_new);
     LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mSolveButton = new TransparentImageButton(act, icon, TransparentImageButton.GRAVITY_END,params);
+    mExitButton = new TransparentImageButton(act, icon, TransparentImageButton.GRAVITY_MIDDLE,params);
 
-    mSolveButton.setOnClickListener( new View.OnClickListener()
+    mExitButton.setOnClickListener( new View.OnClickListener()
       {
       @Override
       public void onClick(View v)
         {
-        act.getControl().solveObject();
-        mMovesController.clearMoves(act);
-        }
-      });
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  private void setupScrambleButton(final RubikActivity act)
-    {
-    int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_scramble_new,R.drawable.ui_medium_cube_scramble_new, R.drawable.ui_big_cube_scramble_new, R.drawable.ui_huge_cube_scramble_new);
-    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f);
-    mScrambleButton = new TransparentImageButton(act, icon, TransparentImageButton.GRAVITY_START, params);
-
-    mScrambleButton.setOnClickListener( new View.OnClickListener()
-      {
-      @Override
-      public void onClick(View v)
-        {
-        int currObject = RubikObjectList.getCurrObject();
-        RubikObject object = RubikObjectList.getObject(currObject);
-        int numScrambles = object==null ? 0 : object.getNumScramble();
-        mShouldReactToEndOfScrambling = false;
-        act.getControl().scrambleObject(numScrambles);
+        act.finish();
         }
       });
     }