commit b61c66ad8e19625306b88cfa356a63aa0d1c457a
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Jul 27 13:11:05 2022 +0200

    Correct the leaderboard. Still, the 'MAX' level does noot work!

diff --git a/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
index 915a989f..17c3f824 100644
--- a/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
+++ b/src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
@@ -43,7 +43,7 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikNetwork
   private void addSection(int tab, int level, int lastLevel, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time)
     {
     String title = level==lastLevel-1 ?
-                   mAct.getString(R.string.level_full) :
+                   mAct.getString(R.string.levelM) :
                    mAct.getString(R.string.lv_placeholder,level+1);
 
     final LinearLayout section = view.createSection(mAct, tab, title, level, country, name, time);
@@ -98,7 +98,7 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikNetwork
     {
     prepareView();
 
-    int MAX = RubikScreenPlay.LEVELS_SHOWN;
+    int MAX = RubikScreenPlay.LEVELS_SHOWN+1;
     int toDo=0;
     int[] toDoTab = new int[mNumTabs];
     int[] maxTab  = new int[mNumTabs];
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index 728eaef9..b73c601c 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -376,7 +376,7 @@ 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+6*padding);
+    mMenuLayoutHeight= padding + NUM_BUTTONS*(mMenuButtonHeight+padding) + 4*mMenuButtonHeight+6*padding;
 
     layout.setPadding(padding,0,padding,0);
 
diff --git a/src/main/res/layout/popup_menu.xml b/src/main/res/layout/popup_menu.xml
index dd28bf03..45dab0a6 100644
--- a/src/main/res/layout/popup_menu.xml
+++ b/src/main/res/layout/popup_menu.xml
@@ -83,7 +83,7 @@
 
         <Button
            android:id="@+id/level1"
-           android:text="1"
+           android:text="@string/level1"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -91,7 +91,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/level2"
-           android:text="2"
+           android:text="@string/level2"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -99,7 +99,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/level3"
-           android:text="3"
+           android:text="@string/level3"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -116,7 +116,7 @@
 
         <Button
            android:id="@+id/level4"
-           android:text="4"
+           android:text="@string/level4"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -124,7 +124,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/level5"
-           android:text="5"
+           android:text="@string/level5"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -132,7 +132,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/level6"
-           android:text="6"
+           android:text="@string/level6"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -149,7 +149,7 @@
 
         <Button
            android:id="@+id/level7"
-           android:text="7"
+           android:text="@string/level7"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -157,7 +157,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/level8"
-           android:text="8"
+           android:text="@string/level8"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
@@ -165,7 +165,7 @@
            android:backgroundTint="@color/dark_grey"/>
         <Button
            android:id="@+id/levelM"
-           android:text="MAX"
+           android:text="@string/levelM"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:paddingRight="10dp"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 8eefe08a..40e73b15 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">Netzwerkfehler</string>
     <string name="success">Erfolg</string>
     <string name="view">Sehen</string>
-    <string name="free_play">Freies Spiel</string>
-    <string name="level_full">Volles Scramble</string>
     <string name="levels">Ebenen</string>
     <string name="save_object">Speichern</string>
     <string name="save_object_really">Möchten Sie diesen Cube speichern?</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 47ad51ba..ef5b67c1 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">Error de red</string>
     <string name="success">Éxito</string>
     <string name="view">Ver</string>
-    <string name="free_play">Juego libre</string>
-    <string name="level_full">Revuelto Completo</string>
     <string name="levels">Niveles</string>
     <string name="save_object">Guardar</string>
     <string name="save_object_really">¿Quieres guardar este Cubo?</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index ca4bc825..fefe63d3 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">Erreur réseau</string>
     <string name="success">Succès</string>
     <string name="view">Regarder</string>
-    <string name="free_play">Jeu libre</string>
-    <string name="level_full">Brouillage Complet</string>
     <string name="levels">Niveaux</string>
     <string name="save_object">Enregistrer</string>
     <string name="save_object_really">Voulez-vous enregistrer ce Cube?</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 89b29286..1da2387c 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">ネットワークエラー</string>
     <string name="success">成功</string>
     <string name="view">見る</string>
-    <string name="free_play">無料プレイ</string>
-    <string name="level_full">フルスクランブル</string>
     <string name="levels">レベル</string>
     <string name="save_object">保存</string>
     <string name="save_object_really">このキューブを保存しますか?</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 679b49cc..927e76d4 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">네트워크 오류</string>
     <string name="success">성공</string>
     <string name="view">보다</string>
-    <string name="free_play">게임</string>
-    <string name="level_full">풀 스크램블</string>
     <string name="levels">레벨</string>
     <string name="save_object">저장</string>
     <string name="save_object_really">이 큐브를 저장하시겠습니까?</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 393cf595..713f6764 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">Błąd sieci</string>
     <string name="success">Sukces</string>
     <string name="view">Zobacz</string>
-    <string name="free_play">Zabawa z Kostką</string>
-    <string name="level_full">Pełne Pomieszanie</string>
     <string name="levels">Poziomy</string>
     <string name="save_object">Zapisz</string>
     <string name="save_object_really">Chcesz zapisać tą kostkę?</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index faae8a5e..3ba69dfa 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">Ошибка сети</string>
     <string name="success">Успех</string>
     <string name="view">Смотри</string>
-    <string name="free_play">Игра с кубом</string>
-    <string name="level_full">Полная Схватка</string>
     <string name="levels">Уровни</string>
     <string name="save_object">Сохранять</string>
     <string name="save_object_really">Вы хотите сохранить этот куб?</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 3941e21d..7e3acbb2 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">網絡錯誤</string>
     <string name="success">成功</string>
     <string name="view">看</string>
-    <string name="free_play">玩立方体</string>
-    <string name="level_full">级满</string>
     <string name="levels">级别</string>
     <string name="save_object">保存</string>
     <string name="save_object_really">你想保存这个多维数据集吗?</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index f4d484ac..d18b855e 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -35,8 +35,6 @@
     <string name="networkError">網絡錯誤</string>
     <string name="success">成功</string>
     <string name="view">看</string>
-    <string name="free_play">玩立方體</string>
-    <string name="level_full">級滿</string>
     <string name="levels">級別</string>
     <string name="save_object">保存</string>
     <string name="save_object_really">你想保存這個多維數據集嗎?</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d18ce50a..4cc106b5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -37,8 +37,6 @@
     <string name="networkError">Network Error</string>
     <string name="success">Success</string>
     <string name="view">View</string>
-    <string name="free_play">Free Play</string>
-    <string name="level_full">Full Scramble</string>
     <string name="levels">Levels</string>
     <string name="save_object">Save</string>
     <string name="save_object_really">Do you want to save this Cube?</string>
@@ -59,6 +57,16 @@
     <string name="no_updates">No update found</string>
     <string name="install">Install</string>
 
+    <string name="level1" translatable="false">1</string>
+    <string name="level2" translatable="false">2</string>
+    <string name="level3" translatable="false">3</string>
+    <string name="level4" translatable="false">4</string>
+    <string name="level5" translatable="false">5</string>
+    <string name="level6" translatable="false">6</string>
+    <string name="level7" translatable="false">7</string>
+    <string name="level8" translatable="false">8</string>
+    <string name="levelM" translatable="false">MAX</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>
     <string name="credits3">Rubik and Rubik Cube are registered trademarks. We are not affiliated with it.</string>