Project

General

Profile

« Previous | Next » 

Revision 7cf2637d

Added by Leszek Koltunski over 3 years ago

Control the Cube: beginnings.

View differences:

src/main/java/org/distorted/states/RubikStatePlay.java
51 51
  public static final int DEF_OBJECT= ObjectList.CUBE.ordinal();
52 52
  public static final int DEF_SIZE  =  3;
53 53

  
54
  private static final int[] BUTTON_LABELS = { R.string.scores, R.string.patterns, R.string.solver, R.string.tutorials, R.string.about };
54
  private static final int[] BUTTON_LABELS = { R.string.scores,
55
                                               R.string.patterns,
56
                                               R.string.control,
57
                                               R.string.solver,
58
                                               R.string.tutorials,
59
                                               R.string.about };
60

  
55 61
  private static final int NUM_BUTTONS = BUTTON_LABELS.length;
56 62
  private static final float LAST_BUTTON = 1.5f;
57 63

  
......
363 369
    adjustLevels(act);
364 370
    }
365 371

  
372
///////////////////////////////////////////////////////////////////////////////////////////////////
373

  
374
  private void controlTheCube()
375
    {
376
    android.util.Log.e("D", "Control");
377
    }
378

  
366 379
///////////////////////////////////////////////////////////////////////////////////////////////////
367 380

  
368 381
  private void MenuAction(RubikActivity act, int button)
......
387 400
              pDiag.setArguments(pBundle);
388 401
              pDiag.show( act.getSupportFragmentManager(), RubikDialogPattern.getDialogTag() );
389 402
              break;
390
      case 2: StateList.switchState(act, StateList.SVER);
403
      case 2: controlTheCube();
404
              break;
405
      case 3: StateList.switchState(act, StateList.SVER);
391 406
              break;
392
      case 3: RubikDialogTutorial tDiag = new RubikDialogTutorial();
407
      case 4: RubikDialogTutorial tDiag = new RubikDialogTutorial();
393 408
              Bundle tBundle = new Bundle();
394 409
              int tOrd = getTutorialOrdinal();
395 410
              tBundle.putInt("tab", tOrd );
396 411
              tDiag.setArguments(tBundle);
397 412
              tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );
398 413
              break;
399
      case 4: RubikDialogAbout aDiag = new RubikDialogAbout();
414
      case 5: RubikDialogAbout aDiag = new RubikDialogAbout();
400 415
              aDiag.show(act.getSupportFragmentManager(), null);
401 416
              break;
402 417
      }
src/main/res/values-de/strings.xml
6 6
    <string name="play">Spielen</string>
7 7
    <string name="error">Fehler</string>
8 8
    <string name="effects">Effekte</string>
9
    <string name="scores">Highscores</string>
10
    <string name="patterns">Hübsche Muster</string>
11 9
    <string name="choose_pattern">Muster auswählen</string>
12
    <string name="solver">3x3x3 Löser</string>
13
    <string name="about">Über</string>
14 10
    <string name="solved">Gelöst</string>
15 11
    <string name="new_record">Neuer Rekord</string>
16 12
    <string name="new_record_submit">Möchten Sie bei den High Scores einreichen?</string>
......
34 30
    <string name="new_name_try_again">Der von Ihnen ausgewählte Name %s ist bereits vergeben. Versuchen Sie es noch einmal:</string>
35 31
    <string name="downloading">Wird heruntergeladen…</string>
36 32
    <string name="submitting">Einreichen…</string>
37
    <string name="tutorial">Sehen Sie sich ein Lernprogramm an?</string>
38
    <string name="tutorials">Lernprogrammen</string>
39 33
    <string name="view">Sehen</string>
40 34
    <string name="level_full">Volles Scramble</string>
41 35

  
36
    <string name="scores">Highscores</string>
37
    <string name="patterns">Hübsche Muster</string>
38
    <string name="control">Den Würfel steuern</string>
39
    <string name="solver">3x3x3 Löser</string>
40
    <string name="tutorials">Lernprogrammen</string>
41
    <string name="about">Über die App</string>
42

  
42 43
    <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>
43 44
    <string name="credits2">Hübsche Muster von Walter Randelshofer. Sehen Sie <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">Laden Sie den Code herunter, sehen Sie sich Tutorials an, lernen Sie, wie Sie Ihren eigenen Grafikeffekt hinzufügen, wie Sie Ihr eigenes Objekt codieren, ein hübsches Muster beisteuern, Ihren eigenen Löser implementieren oder einen Fehler melden: <a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-es/strings.xml
6 6
    <string name="play">Jugar</string>
7 7
    <string name="error">Error</string>
8 8
    <string name="effects">Efectos</string>
9
    <string name="scores">Leaderboard</string>
10
    <string name="patterns">Patrones</string>
11 9
    <string name="choose_pattern">Elige un patrón</string>
12
    <string name="solver">Solucionador</string>
13
    <string name="about">Acerca de</string>
14 10
    <string name="solved">Resuelto</string>
15 11
    <string name="new_record">Nuevo récord</string>
16 12
    <string name="new_record_submit">¿Quieres enviarlo a las puntuaciones altas?</string>
......
34 30
    <string name="new_name_try_again">El nombre que has elegido, %s, ya está en uso. Inténtalo de nuevo:</string>
35 31
    <string name="downloading">Descargando…</string>
36 32
    <string name="submitting">Enviando…</string>
37
    <string name="tutorial">¿Ver un tutorial?</string>
38
    <string name="tutorials">Tutoriales</string>
39 33
    <string name="view">Ver</string>
40 34
    <string name="level_full">Revuelto Completo</string>
41 35

  
36
    <string name="scores">Leaderboard</string>
37
    <string name="patterns">Patrones</string>
38
    <string name="control">Controla el cubo</string>
39
    <string name="solver">Solucionador</string>
40
    <string name="tutorials">Tutoriales</string>
41
    <string name="about">Acerca de</string>
42

  
42 43
    <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>
43 44
    <string name="credits2">Pretty Patterns por Walter Randelshofer. Mira <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">Descarga código, echa un vistazo a los tutoriales, aprende a añadir tu propio efecto gráfico, aprende a programar tu propio objeto, contribuye con un patrón hermoso, implementa tu propio solucionador o informa un error: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-fr/strings.xml
6 6
    <string name="play">Jouer</string>
7 7
    <string name="error">Erreur</string>
8 8
    <string name="effects">Effets</string>
9
    <string name="scores">Meilleurs scores</string>
10
    <string name="patterns">Jolis motifs</string>
11 9
    <string name="choose_pattern">Choisissez un motif</string>
12
    <string name="solver">Solutionneur</string>
13
    <string name="about">À propos de</string>
14 10
    <string name="solved">Résolu</string>
15 11
    <string name="new_record">Nouvel registre</string>
16 12
    <string name="new_record_submit">Voulez-vous le soumettre aux meilleurs scores ?</string>
......
34 30
    <string name="new_name_try_again">Le nom que vous avez choisi, %s, est déjà pris. Réessayez :</string>
35 31
    <string name="downloading">Téléchargement…</string>
36 32
    <string name="submitting">Soumission…</string>
37
    <string name="tutorial">Regarder un tutoriel?</string>
38
    <string name="tutorials">Tutoriels</string>
39 33
    <string name="view">Regarder</string>
40 34
    <string name="level_full">Brouillage Complet</string>
41 35

  
36
    <string name="scores">Meilleurs scores</string>
37
    <string name="patterns">Jolis motifs</string>
38
    <string name="control">Contrôle du cube</string>
39
    <string name="solver">Solutionneur</string>
40
    <string name="tutorials">Tutoriels</string>
41
    <string name="about">À propos de</string>
42

  
42 43
    <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>
43 44
    <string name="credits2">Pretty Patterns par Walter Randelshofer. Voir <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">Téléchargez le code, consultez les tutoriels, apprenez comment ajouter votre propre effet graphique, apprenez à coder votre propre objet, contribuez à un joli modèle, mettez en oeuvre votre propre solutionneur ou signalez un bogue : \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-ja/strings.xml
6 6
    <string name="play">プレイする</string>
7 7
    <string name="error">エラー</string>
8 8
    <string name="effects">エフェクト</string>
9
    <string name="scores">ハイスコア</string>
10
    <string name="patterns">プリティパターン</string>
11 9
    <string name="choose_pattern">パターンを選択</string>
12
    <string name="solver">3x3x3 ソルバー</string>
13
    <string name="about">約</string>
14 10
    <string name="solved">解答済</string>
15 11
    <string name="new_record">新記録</string>
16 12
    <string name="new_record_submit">ハイスコアに提出しますか?</string>
......
34 30
    <string name="new_name_try_again">選択した名前%sは既に使用されています。もう一度トライする:</string>
35 31
    <string name="downloading">ダウンロードしています…</string>
36 32
    <string name="submitting">送信しています…</string>
37
    <string name="tutorial">チュートリアルを見ますか?</string>
38
    <string name="tutorials">チュートリアル</string>
39 33
    <string name="view">見る</string>
40 34
    <string name="level_full">フルスクランブル</string>
41 35

  
36
    <string name="scores">ハイスコア</string>
37
    <string name="patterns">プリティパターン</string>
38
    <string name="control">キューブの制御</string>
39
    <string name="solver">3x3x3 ソルバー</string>
40
    <string name="tutorials">チュートリアル</string>
41
    <string name="about">アプリについて</string>
42

  
42 43
    <string name="credits1">ディストートグラフィックのライブラリを使用して開発されたオープンソースアプリ。<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL バージョン 2</a>でライセンスされているか、または-オプション-それ以降のすべてのバージョン。</string>
43 44
    <string name="credits2">Pretty Patterns 沿って Walter Randelshofer. 見る <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">コードのダウンロード、チュートリアルの確認、独自のグラフィック効果の追加方法、独自のオブジェクトのコーディング方法、プリティパターンの提出、独自のソルバーの実装、またはバグの報告などについて知る。\n\n <a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-ko/strings.xml
6 6
    <string name="play">플레이</string>
7 7
    <string name="error">오류</string>
8 8
    <string name="effects">효과</string>
9
    <string name="scores">고득점</string>
10
    <string name="patterns">예쁜 패턴</string>
11 9
    <string name="choose_pattern">패턴을 선택하십시오</string>
12
    <string name="solver">3x3x3 해결사</string>
13
    <string name="about">정보</string>
14 10
    <string name="solved">해결됨</string>
15 11
    <string name="new_record">신기록</string>
16 12
    <string name="new_record_submit">고득점에 제출하시겠습니까?</string>
......
34 30
    <string name="new_name_try_again">선택한 이름 %s이(가) 이미 사용되었습니다. 다시 시도하십시오:</string>
35 31
    <string name="downloading">다운로드 중…</string>
36 32
    <string name="submitting">제출 중…</string>
37
    <string name="tutorial">튜토리얼을 보시겠습니까?</string>
38
    <string name="tutorials">튜토리얼</string>
39 33
    <string name="view">보다</string>
40 34
    <string name="level_full">풀 스크램블</string>
41 35

  
36
    <string name="scores">고득점</string>
37
    <string name="patterns">예쁜 패턴</string>
38
    <string name="control">큐브 제어</string>
39
    <string name="solver">3x3x3 해결사</string>
40
    <string name="tutorials">튜토리얼</string>
41
    <string name="about">정보</string>
42

  
42 43
    <string name="credits1">왜곡된 그래픽 라이브러리를 사용하여 개발된 오픈 소스 앱. <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL 버전 2</a> 또는 귀하의 선택에 따라 최신 버전으로 라이센스가 부여됩니다.</string>
43 44
    <string name="credits2">Pretty Patterns 으로 Walter Randelshofer. 보다 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">코드를 다운로드하고, 튜토리얼을보고, 자신만의 그래픽 효과를 추가하는 방법을 배우고, 자신의 개체를 코딩하는 방법을 배우며, 예쁜 패턴을 기여하고, 자신만의 해결사를 구현하거나, 버그를 신고하십시오:\n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-pl/strings.xml
6 6
    <string name="play">Graj</string>
7 7
    <string name="error">Błąd</string>
8 8
    <string name="effects">Efekty</string>
9
    <string name="scores">Lista najlepszych</string>
10
    <string name="patterns">Piękne Wzory</string>
11 9
    <string name="choose_pattern">Wybierz Wzór</string>
12
    <string name="solver">Rozwiązywacz</string>
13
    <string name="about">O aplikacji</string>
14 10
    <string name="solved">Rozwiązane</string>
15 11
    <string name="new_record">Nowy Rekord</string>
16 12
    <string name="new_record_submit">Chcesz go przesłać na listę najlepszych?</string>
......
34 30
    <string name="new_name_try_again">Imię które wybrałeś, %s, jest zajęte. Spróbuj jeszcze raz:</string>
35 31
    <string name="downloading">Ściąganie…</string>
36 32
    <string name="submitting">Przesyłanie…</string>
37
    <string name="tutorial">Zobacz tutorial?</string>
38
    <string name="tutorials">Tutoriale</string>
39 33
    <string name="view">Zobacz</string>
40 34
    <string name="level_full">Pełne Pomieszanie</string>
41 35

  
36
    <string name="scores">Lista najlepszych</string>
37
    <string name="patterns">Piękne Wzory</string>
38
    <string name="control">Obroty Kostki</string>
39
    <string name="solver">Rozwiązywacz</string>
40
    <string name="tutorials">Tutoriale</string>
41
    <string name="about">O aplikacji</string>
42

  
42 43
    <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>
43 44
    <string name="credits2">Piękne Wzory Waltera Randelshofera. Zobacz <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">Ściągnij kod, rzuć okiem na tutoriale, naucz się napisać swój własny efekt graficzny, dodaj własny obiekt, wymyśl Piekny Wzór, zaimplementuj Rozwiązywacz, albo zgłoś błąd: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a></string>
src/main/res/values-ru/strings.xml
6 6
    <string name="play">Играть</string>
7 7
    <string name="error">Ошибка</string>
8 8
    <string name="effects">Эффекты</string>
9
    <string name="scores">Высокие баллы</string>
10
    <string name="patterns">Красивые узоры</string>
11 9
    <string name="choose_pattern">Выберите узор</string>
12
    <string name="solver">Решебник 3х3х3</string>
13
    <string name="about">О нас</string>
14 10
    <string name="solved">Решено</string>
15 11
    <string name="new_record">Новый рекорд</string>
16 12
    <string name="new_record_submit">Вы хотите поместить его в Список рекордов?</string>
......
34 30
    <string name="new_name_try_again">Выбранное вами имя %s уже занято. Попробуй еще раз:</string>
35 31
    <string name="downloading">Загрузка…</string>
36 32
    <string name="submitting">Добавляю…</string>
37
    <string name="tutorial">Смотрите учебник?</string>
38
    <string name="tutorials">Учебники</string>
39 33
    <string name="view">Смотри</string>
40 34
    <string name="level_full">Полная Схватка</string>
41 35

  
36
    <string name="scores">Высокие баллы</string>
37
    <string name="patterns">Красивые узоры</string>
38
    <string name="control">Управление кубом</string>
39
    <string name="solver">Решебник 3х3х3</string>
40
    <string name="tutorials">Учебники</string>
41
    <string name="about">О нас</string>
42

  
42 43
    <string name="credits1">Приложение с открытым исходным кодом, разработанное с использованием библиотеки графики Искажений. Лицензируется согласно <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">версии 2 GPL</a> или любой более поздней версии по вашему выбору.</string>
43 44
    <string name="credits2">Pretty Patterns по Walter Randelshofer. Смотри <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">Загрузите код, посмотрите учебные пособия, узнайте, как добавить собственный графический эффект, научитесь кодировать собственный объект, добавьте Симпатичный узор, внедрите собственный решебник или сообщите об ошибке: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-zh-rCN/strings.xml
6 6
    <string name="play">玩</string>
7 7
    <string name="error">错误</string>
8 8
    <string name="effects">效果</string>
9
    <string name="scores">高分</string>
10
    <string name="patterns">模式</string>
11 9
    <string name="choose_pattern">选择一种模式</string>
12
    <string name="solver">3x3x3求解器</string>
13
    <string name="about">关于</string>
14 10
    <string name="solved">已解决</string>
15 11
    <string name="new_record">新纪录</string>
16 12
    <string name="new_record_submit">是否要将其提交到“排行榜”?</string>
......
34 30
    <string name="new_name_try_again">您选择的名称,%s,已被使用。请重试:</string>
35 31
    <string name="downloading">正在下载……</string>
36 32
    <string name="submitting">正在提交……</string>
37
    <string name="tutorial">观看教程?</string>
38
    <string name="tutorials">讲解</string>
39 33
    <string name="view">看</string>
40 34
    <string name="level_full">级满</string>
41 35

  
36
    <string name="scores">高分</string>
37
    <string name="patterns">模式</string>
38
    <string name="control">控制立方体</string>
39
    <string name="solver">3x3x3求解器</string>
40
    <string name="tutorials">讲解</string>
41
    <string name="about">关于</string>
42

  
42 43
    <string name="credits1">此应用程式原始码开发使用Distorted图型库。根据<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共许可版本2</a>或者任何更新版本(根据您的选择)进行许可。</string>
43 44
    <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">下载代码,浏览教程,学习如何添加自己的图形效果,学习如何编写自己的专案,创造美丽图案,实现自己的求解器,或者报告错误:<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values-zh-rTW/strings.xml
6 6
    <string name="play">開始玩</string>
7 7
    <string name="error">錯誤</string>
8 8
    <string name="effects">效果</string>
9
    <string name="scores">高分</string>
10
    <string name="patterns">模式</string>
11 9
    <string name="choose_pattern">選擇一種模式</string>
12
    <string name="solver">3x3x3求解器</string>
13
    <string name="about">關於</string>
14 10
    <string name="solved">已解决</string>
15 11
    <string name="new_record">新紀錄</string>
16 12
    <string name="new_record_submit">要傳送至“排行榜”?</string>
......
34 30
    <string name="new_name_try_again">您選擇的名稱,%s,已被使用。請重試:</string>
35 31
    <string name="downloading">正在下載……</string>
36 32
    <string name="submitting">正在傳送……</string>
37
    <string name="tutorial">觀看教程?</string>
38
    <string name="tutorials">講解</string>
39 33
    <string name="view">看</string>
40 34
    <string name="level_full">級滿</string>
41 35

  
36
    <string name="scores">高分</string>
37
    <string name="patterns">模式</string>
38
    <string name="control">控制立方體</string>
39
    <string name="solver">3x3x3求解器</string>
40
    <string name="tutorials">講解</string>
41
    <string name="about">關於</string>
42

  
42 43
    <string name="credits1">此應用程式原始碼開發使用Distorted圖型庫。根據<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">通用公共許可版本2</a>或者任何更新版本(根據您的選擇)進行許可。</string>
43 44
    <string name="credits2">Pretty Patterns by Werner Randelshofer. 請看 <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
44 45
    <string name="credits3">下載代碼,瀏覽教程,學習如何添加自己的圖形效果,學習如何编寫自己的專案,創造美麗圖案,實现自己的求解器,或者報告錯誤:\n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a>
src/main/res/values/strings.xml
7 7
    <string name="play">Play</string>
8 8
    <string name="error">Error</string>
9 9
    <string name="effects">Effects</string>
10
    <string name="scores">High Scores</string>
11
    <string name="patterns">Pretty Patterns</string>
12
    <string name="choose_pattern">Choose a Pattern</string>
13
    <string name="solver">3x3x3 Solver</string>
14
    <string name="about">About</string>
15 10
    <string name="solved">Solved</string>
11
    <string name="choose_pattern">Choose a Pattern</string>
16 12
    <string name="new_record">New Record</string>
17 13
    <string name="new_record_submit">Do you want to submit it to High Scores?</string>
18 14
    <string name="back">Back</string>
......
35 31
    <string name="new_name_try_again">The name you have chosen, %s, is already taken. Try again:</string>
36 32
    <string name="downloading">Downloading…</string>
37 33
    <string name="submitting">Submitting…</string>
38
    <string name="tutorial">Watch a tutorial?</string>
39
    <string name="tutorials">Tutorials</string>
40 34
    <string name="view">View</string>
41 35
    <string name="level_full">Full Scramble</string>
42 36

  
37
    <string name="scores">High Scores</string>
38
    <string name="patterns">Pretty Patterns</string>
39
    <string name="control">Control the Cube</string>
40
    <string name="solver">3x3x3 Solver</string>
41
    <string name="tutorials">Tutorials</string>
42
    <string name="about">About</string>
43

  
43 44
    <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>
44 45
    <string name="credits2">Pretty Patterns by Walter Randelshofer. See <a href="http://www.randelshofer.ch">http://www.randelshofer.ch</a></string>
45 46
    <string name="credits3">Download code, take a look at tutorials, learn how to add your own graphics effect, learn how to code your own object, contribute a Pretty Pattern, implement your own solver, or report a bug: \n\n<a href="https://distorted.org/redmine/projects/magic-cube/wiki">Distorted.org</a></string>

Also available in: Unified diff