commit 369a0fcee6b18da83c8a89a55906f415a3b63f4a
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Jul 12 00:03:55 2022 +0200

    Progress with central menu popup.

diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 32a20fb9..3dcd59f4 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -70,7 +70,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
   private PopupWindow mObjectPopup, mMenuPopup;
   private WeakReference<RubikActivity> mWeakAct;
   private TextView mBubbleUpdates;
-  private int mObjectSize, mMenuLayoutWidth, mMenuLayoutHeight, mMenuButtonHeight;
+  private int mObjectSize, mMenuLayoutWidth, mMenuLayoutHeight, mMenuButtonHeight, mMenuTextSize;
   private int mLevelValue;
   private int mColCount, mRowCount, mMaxRowCount;
   private int mUpperBarHeight;
@@ -94,6 +94,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     mUpperBarHeight = act.getHeightUpperBar();
 
     mMenuButtonHeight = (int)(mScreenWidth*RubikActivity.MENU_BUTTON_HEIGHT);
+    mMenuTextSize     = (int)(mScreenWidth*RubikActivity.MENU_BIG_TEXT_SIZE);
 
     mRowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS;
     mColCount = NUM_COLUMNS;
@@ -381,11 +382,12 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     int padding = (int)(width*RubikActivity.MEDIUM_MARGIN);
 
     mMenuLayoutWidth = (int)(width*0.6f);
-    mMenuLayoutHeight= (int)( padding + NUM_BUTTONS*(mMenuButtonHeight+padding) + 4*mMenuButtonHeight+5*padding);
+    mMenuLayoutHeight= (int)( padding + NUM_BUTTONS*(mMenuButtonHeight+padding) + 4*mMenuButtonHeight+6*padding);
 
     layout.setPadding(padding,0,padding,0);
 
     Button highScores = layout.findViewById(R.id.menuHighScores);
+    highScores.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     highScores.setOnClickListener( new View.OnClickListener()
         {
         @Override
@@ -403,6 +405,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
         });
 
     Button prettyPatterns = layout.findViewById(R.id.menuPrettyPatterns);
+    prettyPatterns.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     prettyPatterns.setOnClickListener( new View.OnClickListener()
         {
         @Override
@@ -415,6 +418,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
         });
 
     Button solver = layout.findViewById(R.id.menuSolver);
+    solver.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     solver.setOnClickListener( new View.OnClickListener()
         {
         @Override
@@ -426,6 +430,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
         });
 
     Button tutorials = layout.findViewById(R.id.menuTutorials);
+    tutorials.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     tutorials.setOnClickListener( new View.OnClickListener()
         {
         @Override
@@ -438,6 +443,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
         });
 
     Button about = layout.findViewById(R.id.menuAbout);
+    about.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     about.setOnClickListener( new View.OnClickListener()
         {
         @Override
@@ -449,6 +455,9 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
           }
         });
 
+    TextView levels = layout.findViewById(R.id.menuLevels);
+    levels.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
+
     setupLevelButtons(act,layout,padding);
     }
 
@@ -462,30 +471,39 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
     params.setMargins(padding/2,0,padding/2,0);
 
     Button level1 = layout.findViewById(R.id.level1);
+    level1.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level1.setLayoutParams(params);
     setupLevelButton(act,level1,1);
     Button level2 = layout.findViewById(R.id.level2);
+    level2.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level2.setLayoutParams(params);
     setupLevelButton(act,level2,2);
     Button level3 = layout.findViewById(R.id.level3);
+    level3.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level3.setLayoutParams(params);
     setupLevelButton(act,level3,3);
     Button level4 = layout.findViewById(R.id.level4);
+    level4.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level4.setLayoutParams(params);
     setupLevelButton(act,level4,4);
     Button level5 = layout.findViewById(R.id.level5);
+    level5.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level5.setLayoutParams(params);
     setupLevelButton(act,level5,5);
     Button level6 = layout.findViewById(R.id.level6);
+    level6.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level6.setLayoutParams(params);
     setupLevelButton(act,level6,6);
     Button level7 = layout.findViewById(R.id.level7);
+    level7.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level7.setLayoutParams(params);
     setupLevelButton(act,level7,7);
     Button level8 = layout.findViewById(R.id.level8);
+    level8.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     level8.setLayoutParams(params);
     setupLevelButton(act,level8,8);
     Button levelM = layout.findViewById(R.id.levelM);
+    levelM.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
     levelM.setLayoutParams(params);
     setupLevelButton(act,levelM,9);
     }
diff --git a/src/main/res/layout/popup_menu.xml b/src/main/res/layout/popup_menu.xml
index 2f8ff1df..dd28bf03 100644
--- a/src/main/res/layout/popup_menu.xml
+++ b/src/main/res/layout/popup_menu.xml
@@ -67,6 +67,7 @@
       android:gravity="center"/>
 
    <TextView
+       android:id="@+id/menuLevels"
        android:layout_width="match_parent"
        android:text="@string/levels"
        android:layout_height="0dp"
