Revision b61c66ad
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java | ||
---|---|---|
43 | 43 |
private void addSection(int tab, int level, int lastLevel, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time) |
44 | 44 |
{ |
45 | 45 |
String title = level==lastLevel-1 ? |
46 |
mAct.getString(R.string.level_full) :
|
|
46 |
mAct.getString(R.string.levelM) :
|
|
47 | 47 |
mAct.getString(R.string.lv_placeholder,level+1); |
48 | 48 |
|
49 | 49 |
final LinearLayout section = view.createSection(mAct, tab, title, level, country, name, time); |
... | ... | |
98 | 98 |
{ |
99 | 99 |
prepareView(); |
100 | 100 |
|
101 |
int MAX = RubikScreenPlay.LEVELS_SHOWN; |
|
101 |
int MAX = RubikScreenPlay.LEVELS_SHOWN+1;
|
|
102 | 102 |
int toDo=0; |
103 | 103 |
int[] toDoTab = new int[mNumTabs]; |
104 | 104 |
int[] maxTab = new int[mNumTabs]; |
src/main/java/org/distorted/screens/RubikScreenPlay.java | ||
---|---|---|
376 | 376 |
int padding = (int)(width*RubikActivity.MEDIUM_MARGIN); |
377 | 377 |
|
378 | 378 |
mMenuLayoutWidth = (int)(width*0.6f); |
379 |
mMenuLayoutHeight= (int)( padding + NUM_BUTTONS*(mMenuButtonHeight+padding) + 4*mMenuButtonHeight+6*padding);
|
|
379 |
mMenuLayoutHeight= padding + NUM_BUTTONS*(mMenuButtonHeight+padding) + 4*mMenuButtonHeight+6*padding;
|
|
380 | 380 |
|
381 | 381 |
layout.setPadding(padding,0,padding,0); |
382 | 382 |
|
src/main/res/layout/popup_menu.xml | ||
---|---|---|
83 | 83 |
|
84 | 84 |
<Button |
85 | 85 |
android:id="@+id/level1" |
86 |
android:text="1" |
|
86 |
android:text="@string/level1"
|
|
87 | 87 |
android:layout_width="30dp" |
88 | 88 |
android:layout_height="30dp" |
89 | 89 |
android:paddingRight="10dp" |
... | ... | |
91 | 91 |
android:backgroundTint="@color/dark_grey"/> |
92 | 92 |
<Button |
93 | 93 |
android:id="@+id/level2" |
94 |
android:text="2" |
|
94 |
android:text="@string/level2"
|
|
95 | 95 |
android:layout_width="30dp" |
96 | 96 |
android:layout_height="30dp" |
97 | 97 |
android:paddingRight="10dp" |
... | ... | |
99 | 99 |
android:backgroundTint="@color/dark_grey"/> |
100 | 100 |
<Button |
101 | 101 |
android:id="@+id/level3" |
102 |
android:text="3" |
|
102 |
android:text="@string/level3"
|
|
103 | 103 |
android:layout_width="30dp" |
104 | 104 |
android:layout_height="30dp" |
105 | 105 |
android:paddingRight="10dp" |
... | ... | |
116 | 116 |
|
117 | 117 |
<Button |
118 | 118 |
android:id="@+id/level4" |
119 |
android:text="4" |
|
119 |
android:text="@string/level4"
|
|
120 | 120 |
android:layout_width="30dp" |
121 | 121 |
android:layout_height="30dp" |
122 | 122 |
android:paddingRight="10dp" |
... | ... | |
124 | 124 |
android:backgroundTint="@color/dark_grey"/> |
125 | 125 |
<Button |
126 | 126 |
android:id="@+id/level5" |
127 |
android:text="5" |
|
127 |
android:text="@string/level5"
|
|
128 | 128 |
android:layout_width="30dp" |
129 | 129 |
android:layout_height="30dp" |
130 | 130 |
android:paddingRight="10dp" |
... | ... | |
132 | 132 |
android:backgroundTint="@color/dark_grey"/> |
133 | 133 |
<Button |
134 | 134 |
android:id="@+id/level6" |
135 |
android:text="6" |
|
135 |
android:text="@string/level6"
|
|
136 | 136 |
android:layout_width="30dp" |
137 | 137 |
android:layout_height="30dp" |
138 | 138 |
android:paddingRight="10dp" |
... | ... | |
149 | 149 |
|
150 | 150 |
<Button |
151 | 151 |
android:id="@+id/level7" |
152 |
android:text="7" |
|
152 |
android:text="@string/level7"
|
|
153 | 153 |
android:layout_width="30dp" |
154 | 154 |
android:layout_height="30dp" |
155 | 155 |
android:paddingRight="10dp" |
... | ... | |
157 | 157 |
android:backgroundTint="@color/dark_grey"/> |
158 | 158 |
<Button |
159 | 159 |
android:id="@+id/level8" |
160 |
android:text="8" |
|
160 |
android:text="@string/level8"
|
|
161 | 161 |
android:layout_width="30dp" |
162 | 162 |
android:layout_height="30dp" |
163 | 163 |
android:paddingRight="10dp" |
... | ... | |
165 | 165 |
android:backgroundTint="@color/dark_grey"/> |
166 | 166 |
<Button |
167 | 167 |
android:id="@+id/levelM" |
168 |
android:text="MAX"
|
|
168 |
android:text="@string/levelM"
|
|
169 | 169 |
android:layout_width="30dp" |
170 | 170 |
android:layout_height="30dp" |
171 | 171 |
android:paddingRight="10dp" |
src/main/res/values-de/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">Netzwerkfehler</string> |
36 | 36 |
<string name="success">Erfolg</string> |
37 | 37 |
<string name="view">Sehen</string> |
38 |
<string name="free_play">Freies Spiel</string> |
|
39 |
<string name="level_full">Volles Scramble</string> |
|
40 | 38 |
<string name="levels">Ebenen</string> |
41 | 39 |
<string name="save_object">Speichern</string> |
42 | 40 |
<string name="save_object_really">Möchten Sie diesen Cube speichern?</string> |
src/main/res/values-es/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">Error de red</string> |
36 | 36 |
<string name="success">Éxito</string> |
37 | 37 |
<string name="view">Ver</string> |
38 |
<string name="free_play">Juego libre</string> |
|
39 |
<string name="level_full">Revuelto Completo</string> |
|
40 | 38 |
<string name="levels">Niveles</string> |
41 | 39 |
<string name="save_object">Guardar</string> |
42 | 40 |
<string name="save_object_really">¿Quieres guardar este Cubo?</string> |
src/main/res/values-fr/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">Erreur réseau</string> |
36 | 36 |
<string name="success">Succès</string> |
37 | 37 |
<string name="view">Regarder</string> |
38 |
<string name="free_play">Jeu libre</string> |
|
39 |
<string name="level_full">Brouillage Complet</string> |
|
40 | 38 |
<string name="levels">Niveaux</string> |
41 | 39 |
<string name="save_object">Enregistrer</string> |
42 | 40 |
<string name="save_object_really">Voulez-vous enregistrer ce Cube?</string> |
src/main/res/values-ja/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">ネットワークエラー</string> |
36 | 36 |
<string name="success">成功</string> |
37 | 37 |
<string name="view">見る</string> |
38 |
<string name="free_play">無料プレイ</string> |
|
39 |
<string name="level_full">フルスクランブル</string> |
|
40 | 38 |
<string name="levels">レベル</string> |
41 | 39 |
<string name="save_object">保存</string> |
42 | 40 |
<string name="save_object_really">このキューブを保存しますか?</string> |
src/main/res/values-ko/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">네트워크 오류</string> |
36 | 36 |
<string name="success">성공</string> |
37 | 37 |
<string name="view">보다</string> |
38 |
<string name="free_play">게임</string> |
|
39 |
<string name="level_full">풀 스크램블</string> |
|
40 | 38 |
<string name="levels">레벨</string> |
41 | 39 |
<string name="save_object">저장</string> |
42 | 40 |
<string name="save_object_really">이 큐브를 저장하시겠습니까?</string> |
src/main/res/values-pl/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">Błąd sieci</string> |
36 | 36 |
<string name="success">Sukces</string> |
37 | 37 |
<string name="view">Zobacz</string> |
38 |
<string name="free_play">Zabawa z Kostką</string> |
|
39 |
<string name="level_full">Pełne Pomieszanie</string> |
|
40 | 38 |
<string name="levels">Poziomy</string> |
41 | 39 |
<string name="save_object">Zapisz</string> |
42 | 40 |
<string name="save_object_really">Chcesz zapisać tą kostkę?</string> |
src/main/res/values-ru/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">Ошибка сети</string> |
36 | 36 |
<string name="success">Успех</string> |
37 | 37 |
<string name="view">Смотри</string> |
38 |
<string name="free_play">Игра с кубом</string> |
|
39 |
<string name="level_full">Полная Схватка</string> |
|
40 | 38 |
<string name="levels">Уровни</string> |
41 | 39 |
<string name="save_object">Сохранять</string> |
42 | 40 |
<string name="save_object_really">Вы хотите сохранить этот куб?</string> |
src/main/res/values-zh-rCN/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">網絡錯誤</string> |
36 | 36 |
<string name="success">成功</string> |
37 | 37 |
<string name="view">看</string> |
38 |
<string name="free_play">玩立方体</string> |
|
39 |
<string name="level_full">级满</string> |
|
40 | 38 |
<string name="levels">级别</string> |
41 | 39 |
<string name="save_object">保存</string> |
42 | 40 |
<string name="save_object_really">你想保存这个多维数据集吗?</string> |
src/main/res/values-zh-rTW/strings.xml | ||
---|---|---|
35 | 35 |
<string name="networkError">網絡錯誤</string> |
36 | 36 |
<string name="success">成功</string> |
37 | 37 |
<string name="view">看</string> |
38 |
<string name="free_play">玩立方體</string> |
|
39 |
<string name="level_full">級滿</string> |
|
40 | 38 |
<string name="levels">級別</string> |
41 | 39 |
<string name="save_object">保存</string> |
42 | 40 |
<string name="save_object_really">你想保存這個多維數據集嗎?</string> |
src/main/res/values/strings.xml | ||
---|---|---|
37 | 37 |
<string name="networkError">Network Error</string> |
38 | 38 |
<string name="success">Success</string> |
39 | 39 |
<string name="view">View</string> |
40 |
<string name="free_play">Free Play</string> |
|
41 |
<string name="level_full">Full Scramble</string> |
|
42 | 40 |
<string name="levels">Levels</string> |
43 | 41 |
<string name="save_object">Save</string> |
44 | 42 |
<string name="save_object_really">Do you want to save this Cube?</string> |
... | ... | |
59 | 57 |
<string name="no_updates">No update found</string> |
60 | 58 |
<string name="install">Install</string> |
61 | 59 |
|
60 |
<string name="level1" translatable="false">1</string> |
|
61 |
<string name="level2" translatable="false">2</string> |
|
62 |
<string name="level3" translatable="false">3</string> |
|
63 |
<string name="level4" translatable="false">4</string> |
|
64 |
<string name="level5" translatable="false">5</string> |
|
65 |
<string name="level6" translatable="false">6</string> |
|
66 |
<string name="level7" translatable="false">7</string> |
|
67 |
<string name="level8" translatable="false">8</string> |
|
68 |
<string name="levelM" translatable="false">MAX</string> |
|
69 |
|
|
62 | 70 |
<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> |
63 | 71 |
<string name="credits2">Pretty Patterns by Walter Randelshofer. See <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string> |
64 | 72 |
<string name="credits3">Rubik and Rubik Cube are registered trademarks. We are not affiliated with it.</string> |
Also available in: Unified diff
Correct the leaderboard. Still, the 'MAX' level does noot work!