commit 00af50608d99097dc842891fbdb7078c277399e3
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Mar 9 22:02:01 2021 +0100

    Always use only (max) 10 levels - (max) 9 'initial' Levels + Full Scramble.

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
index cca7bf93..643f9c79 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
@@ -30,27 +30,33 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import org.distorted.main.R;
 import org.distorted.scores.RubikScores;
 import org.distorted.scores.RubikScoresDownloader;
 import org.distorted.objects.ObjectList;
+import org.distorted.states.RubikStatePlay;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresDownloader.Receiver
   {
-  private FragmentActivity mAct;
-  private RubikDialogScores mDialog;
-  private RubikDialogScoresView[] mViews;
-  private ViewPager mViewPager;
-  private int mNumTabs;
-  private boolean mIsSubmitting;
+  private final FragmentActivity mAct;
+  private final RubikDialogScores mDialog;
+  private final RubikDialogScoresView[] mViews;
+  private final ViewPager mViewPager;
+  private final int mNumTabs;
+  private final boolean mIsSubmitting;
   private int mToDoTab, mToDoLvl;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void addSection(int tab, int level, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time)
+  private void addSection(int tab, int level, int lastLevel, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time)
     {
-    final LinearLayout section = view.createSection(mAct, tab, level, country, name, time);
+    String title = level==lastLevel-1 ?
+                   mAct.getString(R.string.level_full) :
+                   mAct.getString(R.string.lv_placeholder,level+1);
+
+    final LinearLayout section = view.createSection(mAct, tab, title, level, country, name, time);
 
     mAct.runOnUiThread(new Runnable()
       {
@@ -73,12 +79,12 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private void getNext(int currentTab, int[] toDoTab, int[] maxTab)
+  private void getNext(int currentTab, int[] toDoTab, int[] maxTab, int[] lastTab)
     {
     if( toDoTab[currentTab]<maxTab[currentTab] )
       {
       mToDoTab = currentTab;
-      mToDoLvl = toDoTab[currentTab];
+      mToDoLvl = toDoTab[currentTab]<maxTab[currentTab]-1 ? toDoTab[currentTab] : lastTab[currentTab]-1;
       toDoTab[currentTab]++;
       }
     else
@@ -88,7 +94,7 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD
         if( toDoTab[tab]<maxTab[tab] )
           {
           mToDoTab = tab;
-          mToDoLvl = toDoTab[tab];
+          mToDoLvl = toDoTab[tab]<maxTab[tab]-1 ? toDoTab[tab] : lastTab[tab]-1;
           toDoTab[tab]++;
           break;
           }
@@ -102,15 +108,18 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD
     {
     prepareView();
 
+    int MAX = RubikStatePlay.LEVELS_SHOWN;
     int toDo=0;
     int[] toDoTab = new int[mNumTabs];
     int[] maxTab  = new int[mNumTabs];
+    int[] lastTab = new int[mNumTabs];
 
     for(int i=0; i<mNumTabs; i++)
       {
       int object   = ObjectList.unpackObject(i);
       int sizeIndex= ObjectList.unpackSizeIndex(i);
-      maxTab[i]    = ObjectList.getMaxLevel(object, sizeIndex);
+      lastTab[i]   = ObjectList.getMaxLevel(object, sizeIndex);
+      maxTab[i]    = Math.min(lastTab[i],MAX);
       toDoTab[i]   = 0;
 
       toDo += maxTab[i];
@@ -119,8 +128,8 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD
     while( toDo>0 )
       {
       toDo--;
-      getNext(mViewPager.getCurrentItem(),toDoTab,maxTab);
-      addSection( mToDoTab,mToDoLvl, mViews[mToDoTab],
+      getNext(mViewPager.getCurrentItem(),toDoTab,maxTab,lastTab);
+      addSection( mToDoTab,mToDoLvl, lastTab[mToDoTab], mViews[mToDoTab],
                   country[mToDoTab][mToDoLvl],name[mToDoTab][mToDoLvl],time[mToDoTab][mToDoLvl]);
       }
     }
diff --git a/src/main/java/org/distorted/dialogs/RubikDialogScoresView.java b/src/main/java/org/distorted/dialogs/RubikDialogScoresView.java
index 0a86ad58..1fe5263d 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogScoresView.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogScoresView.java
@@ -76,11 +76,11 @@ public class RubikDialogScoresView extends FrameLayout
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   @SuppressLint("DefaultLocale")
-  LinearLayout createSection(FragmentActivity act, int tab, int level, final String[] country, final String[] name, final float[] time)
+  LinearLayout createSection(FragmentActivity act, int tab, String title, int level, final String[] country, final String[] name, final float[] time)
     {
     LinearLayout levelLayout = (LinearLayout)inflate(act, R.layout.dialog_scores_scramble_title, null);
     TextView text = levelLayout.findViewById(R.id.scoresScrambleTitle);
-    text.setText(act.getString(R.string.lv_placeholder,level+1));
+    text.setText(title);
 
     int size = (int)(mHeight*RubikActivity.SCORES_LEVEL_TEXT);
     text.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java
index c03edbc3..91b40829 100644
--- a/src/main/java/org/distorted/objects/ObjectList.java
+++ b/src/main/java/org/distorted/objects/ObjectList.java
@@ -153,7 +153,7 @@ public enum ObjectList
   MEGA (
          new int[][] {
                        {3 , 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} ,
-                       {5 , 25, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,
+                       {5 , 35, R.raw.mega5, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} ,
                      },
          TwistyMegaminx.class,
          new MovementMinx(),
diff --git a/src/main/java/org/distorted/states/RubikStatePlay.java b/src/main/java/org/distorted/states/RubikStatePlay.java
index e7252870..924bcf0a 100644
--- a/src/main/java/org/distorted/states/RubikStatePlay.java
+++ b/src/main/java/org/distorted/states/RubikStatePlay.java
@@ -45,12 +45,13 @@ import org.distorted.scores.RubikScores;
 
 public class RubikStatePlay extends RubikStateBase
   {
-  private static final int LEVELS_SHOWN = 10;
-  public  static final int DEF_OBJECT= ObjectList.CUBE.ordinal();
-  public  static final int DEF_SIZE  =  3;
+  public static final int LEVELS_SHOWN = 10;
+  public static final int DEF_OBJECT= ObjectList.CUBE.ordinal();
+  public static final int DEF_SIZE  =  3;
 
   private static final int[] BUTTON_LABELS = { R.string.scores, R.string.patterns, R.string.solver, R.string.tutorials, R.string.about };
   private static final int NUM_BUTTONS = BUTTON_LABELS.length;
+  private static final float LAST_BUTTON = 1.4f;
 
   private ImageButton mObjButton, mMenuButton, mSolveButton;
   private Button mPlayButton;
@@ -173,7 +174,7 @@ public class RubikStatePlay extends RubikStateBase
           final int levelsShown = Math.min(maxLevel,LEVELS_SHOWN);
 
           mPlayPopup.showAsDropDown(view, margin, margin);
-          mPlayPopup.update(view, mPlayLayoutWidth, (int)(levelsShown*(mMenuItemSize+margin)+2*margin));
+          mPlayPopup.update(view, mPlayLayoutWidth, (int)(levelsShown*(mMenuItemSize+margin)+3*margin+mMenuItemSize*(LAST_BUTTON-1.0f)));
 
           mPlayPopup.setFocusable(true);
           mPlayPopup.update();
@@ -493,14 +494,21 @@ public class RubikStatePlay extends RubikStateBase
     {
     int sizeIndex = ObjectList.getSizeIndex(mObject,mSize);
     int maxLevel = ObjectList.getMaxLevel(mObject, sizeIndex);
-    String[] levels = new String[maxLevel];
+    int numLevel = Math.min(maxLevel, LEVELS_SHOWN);
+    String[] levels = new String[numLevel];
 
-    for(int i=0; i<maxLevel; i++)
+    for(int i=0; i<numLevel-1; i++)
       {
       levels[i] = act.getString(R.string.lv_placeholder,i+1);
       }
 
-    if( mLevelValue>maxLevel ) mLevelValue=1;
+    levels[numLevel-1] = act.getString(R.string.level_full);
+
+    if( mLevelValue>maxLevel || mLevelValue<1 ||
+       (mLevelValue<maxLevel || mLevelValue>LEVELS_SHOWN ) )
+      {
+      mLevelValue=1;
+      }
 
     float width = act.getScreenWidthInPixels();
     int margin  = (int)(width*RubikActivity.MARGIN);
@@ -510,18 +518,18 @@ public class RubikStatePlay extends RubikStateBase
     pM.setMargins(margin, 0, margin, margin);
     LinearLayout.LayoutParams pT = new LinearLayout.LayoutParams( mPlayLayoutWidth - 2*padding, (int)mMenuItemSize);
     pT.setMargins(margin, margin, margin, margin);
-    LinearLayout.LayoutParams pB = new LinearLayout.LayoutParams( mPlayLayoutWidth - 2*padding, (int)mMenuItemSize);
+    LinearLayout.LayoutParams pB = new LinearLayout.LayoutParams( mPlayLayoutWidth - 2*padding, (int)(mMenuItemSize*LAST_BUTTON) );
     pB.setMargins(margin, margin, margin, 2*margin);
 
     mPlayLayout.removeAllViews();
 
     RubikScores scores = RubikScores.getInstance();
 
-    for(int i=0; i<maxLevel; i++)
+    for(int i=0; i<numLevel; i++)
       {
-      final int but = i;
+      final int scrambles = i<numLevel-1 ? i+1 : maxLevel;
       Button button = new Button(act);
-      button.setLayoutParams(i==0 ? pT : (i==maxLevel-1 ? pB : pM));
+      button.setLayoutParams(i==0 ? pT : (i==numLevel-1 ? pB : pM));
       button.setText(levels[i]);
       button.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
 
@@ -534,7 +542,7 @@ public class RubikStatePlay extends RubikStateBase
         public void onClick(View v)
           {
           mPlayPopup.dismiss();
-          mLevelValue = but+1;
+          mLevelValue = scrambles;
           act.getPreRender().scrambleObject(mLevelValue);
           }
         });
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 84ec3f4f..5365bb5d 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">Sehen Sie sich ein Lernprogramm an?</string>
     <string name="tutorials">Lernprogrammen</string>
     <string name="view">Sehen</string>
+    <string name="level_full">Volles Scramble</string>
 
     <string name="credits1">Open Source App, die mit der Distorted Graphics Library entwickelt wurde. Lizenziert unter <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL Version 2</a> oder wie gewünscht einer späteren Version.</string>
     <string name="credits2">Hübsche Muster von Walter Randelshofer. Sehen Sie <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 75c055ee..91a8b43f 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">¿Ver un tutorial?</string>
     <string name="tutorials">Tutoriales</string>
     <string name="view">Ver</string>
+    <string name="level_full">Revuelto Completo</string>
 
     <string name="credits1">Aplicación de código abierto desarrollada con la biblioteca de gráficos de Distorted. Con licencia <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL versión 2</a> o, a tu elección, cualquier versión posterior.</string>
     <string name="credits2">Pretty Patterns por Walter Randelshofer. Mira <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 30314857..5be25217 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">Regarder un tutoriel?</string>
     <string name="tutorials">Tutoriels</string>
     <string name="view">Regarder</string>
+    <string name="level_full">Brouillage Complet</string>
 
     <string name="credits1">Appli Open Source développée à l\'aide de la bibliothèque graphique Distorted. Sous licence <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL version 2</a> ou - à votre choix - toute version ultérieure.</string>
     <string name="credits2">Pretty Patterns par Walter Randelshofer. Voir <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index c209f8ae..02cdbcfc 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">チュートリアルを見ますか？</string>
     <string name="tutorials">チュートリアル</string>
     <string name="view">見る</string>
+    <string name="level_full">フルスクランブル</string>
 
     <string name="credits1">ディストートグラフィックのライブラリを使用して開発されたオープンソースアプリ。<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL バージョン 2</a>でライセンスされているか、または-オプション-それ以降のすべてのバージョン。</string>
     <string name="credits2">Pretty Patterns 沿って Walter Randelshofer. 見る <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 0bbf5769..1052f096 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">튜토리얼을 보시겠습니까?</string>
     <string name="tutorials">튜토리얼</string>
     <string name="view">보다</string>
+    <string name="level_full">풀 스크램블</string>
 
     <string name="credits1">왜곡된 그래픽 라이브러리를 사용하여 개발된 오픈 소스 앱. <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL 버전 2</a> 또는 귀하의 선택에 따라 최신 버전으로 라이센스가 부여됩니다.</string>
     <string name="credits2">Pretty Patterns 으로 Walter Randelshofer. 보다 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index b6a730f5..87a180c9 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">Zobacz tutorial?</string>
     <string name="tutorials">Tutoriale</string>
     <string name="view">Zobacz</string>
+    <string name="level_full">Pełne Pomieszanie</string>
 
     <string name="credits1">Aplikacja open-source napisana wykorzystując bibliotekę Distorted. Licencja: <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL wersja 2</a> albo jakakolwiek poźniejsza.</string>
     <string name="credits2">Piękne Wzory Waltera Randelshofera. Zobacz <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 417bb615..c4bd4e44 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">Смотрите учебник?</string>
     <string name="tutorials">Учебники</string>
     <string name="view">Смотри</string>
+    <string name="level_full">Полная Схватка</string>
 
     <string name="credits1">Приложение с открытым исходным кодом, разработанное с использованием библиотеки графики Искажений. Лицензируется согласно <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">версии 2 GPL</a> или любой более поздней версии по вашему выбору.</string>
     <string name="credits2">Pretty Patterns по Walter Randelshofer. Смотри <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2e58d01f..13d97158 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">观看教程？</string>
     <string name="tutorials">讲解</string>
     <string name="view">看</string>
+    <string name="level_full">级满</string>
 
     <string name="credits1">此应用程式原始码开发使用Distorted图型库。根据<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共许可版本2</a>或者任何更新版本（根据您的选择）进行许可。</string>
     <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 82809127..e9351d4d 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -37,6 +37,7 @@
     <string name="tutorial">觀看教程？</string>
     <string name="tutorials">講解</string>
     <string name="view">看</string>
+    <string name="level_full">級滿</string>
 
     <string name="credits1">此應用程式原始碼開發使用Distorted圖型庫。根據<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共許可版本2</a>或者任何更新版本（根據您的選擇）進行許可。</string>
     <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
@@ -56,7 +57,7 @@
     <string name="solver_cube3_error9">求解器中斷！</string>
 
     <string name="ms_placeholder">%1$d 毫秒</string>
-    <string name="lv_placeholder">级别 %1$d</string>
+    <string name="lv_placeholder">級別 %1$d</string>
     <string name="tm_placeholder">%1$02d:%2$02d</string>
     <string name="ap_placeholder">%1$s %2$s</string>
     <string name="ti_placeholder">%1$.2f 秒</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d42c65d5..0e43b3bc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="tutorial">Watch a tutorial?</string>
     <string name="tutorials">Tutorials</string>
     <string name="view">View</string>
+    <string name="level_full">Full Scramble</string>
 
     <string name="credits1">Open Source app developed using the Distorted graphics library. Licensed under <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL version 2</a> or - at your option - any later version.</string>
     <string name="credits2">Pretty Patterns by Walter Randelshofer. See <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>