From b954e1493478e6bc784744533aa1412e18bebe90 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 26 Nov 2017 16:01:46 +0100 Subject: [PATCH] Changed Tutorials --- .../debug/android/support/v7/appcompat/R.java | 116 +++--- .../assets/debug/levelpacks/Grasslands.xml | 74 ++-- .../mergeDebugAndroidTestResources/merger.xml | 20 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugResources/merger.xml | 32 +- app/build/intermediates/symbols/debug/R.txt | 348 +++++++++--------- .../logs/manifest-merger-debug-report.txt | 20 +- app/src/main/assets/levelpacks/Grasslands.xml | 74 ++-- .../frajul/endlessroll/main/GameActivity.java | 10 +- .../de/frajul/endlessroll/main/game/Game.java | 28 +- .../endlessroll/main/screens/GameScreen.java | 7 +- .../main/screens/ToolShopScreen.java | 13 +- .../main/screens/WorldsScreen.java | 2 + .../endlessroll/main/tutorial/BreakPoint.java | 2 +- .../endlessroll/main/tutorial/Tutorial.java | 45 +-- .../main/tutorial/TutorialManager.java | 78 ++-- .../main/tutorial/TutorialView.java | 22 +- .../java/de/frajul/endlessroll/user/User.java | 11 - .../frajul/endlessroll/views/Countdown.java | 1 + .../endlessroll/views/GameOverMessage.java | 8 + .../frajul/endlessroll/views/GoalMessage.java | 39 +- .../frajul/endlessroll/views/ShortMenu.java | 8 + .../de/frajul/endlessroll/views/TopBar.java | 8 +- .../frajul/endlessroll/views/ViewManager.java | 11 +- app/src/main/res/layout/goal_message.xml | 40 +- app/src/main/res/layout/toolshop.xml | 3 +- app/src/main/res/layout/topbar.xml | 4 +- app/src/main/res/values/strings.xml | 5 +- build.gradle | 4 +- 29 files changed, 536 insertions(+), 499 deletions(-) diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java index c90a224..c1a72f9 100644 --- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -494,64 +494,64 @@ public final class R { public static final int end_padder = 0x7f080020; public static final int expand_activities_button = 0x7f080024; public static final int expanded_menu = 0x7f080025; - public static final int home = 0x7f08003f; - public static final int homeAsUp = 0x7f080040; - public static final int icon = 0x7f080042; - public static final int ifRoom = 0x7f080043; - public static final int image = 0x7f080044; - public static final int info = 0x7f080046; - public static final int line1 = 0x7f080053; - public static final int line3 = 0x7f080054; - public static final int listMode = 0x7f080057; - public static final int list_item = 0x7f080058; - public static final int media_actions = 0x7f080059; - public static final int middle = 0x7f08005a; - public static final int multiply = 0x7f08005b; - public static final int never = 0x7f08005c; - public static final int none = 0x7f08005d; - public static final int normal = 0x7f08005e; - public static final int parentPanel = 0x7f08005f; - public static final int progress_circular = 0x7f080063; - public static final int progress_horizontal = 0x7f080064; - public static final int radio = 0x7f080065; - public static final int screen = 0x7f080066; - public static final int scrollIndicatorDown = 0x7f080067; - public static final int scrollIndicatorUp = 0x7f080068; - public static final int scrollView = 0x7f080069; - public static final int search_badge = 0x7f08006a; - public static final int search_bar = 0x7f08006b; - public static final int search_button = 0x7f08006c; - public static final int search_close_btn = 0x7f08006d; - public static final int search_edit_frame = 0x7f08006e; - public static final int search_go_btn = 0x7f08006f; - public static final int search_mag_icon = 0x7f080070; - public static final int search_plate = 0x7f080071; - public static final int search_src_text = 0x7f080072; - public static final int search_voice_btn = 0x7f080073; - public static final int select_dialog_listview = 0x7f080074; - public static final int shortcut = 0x7f080084; - public static final int showCustom = 0x7f080089; - public static final int showHome = 0x7f08008a; - public static final int showTitle = 0x7f08008b; - public static final int spacer = 0x7f08008c; - public static final int split_action_bar = 0x7f08008d; - public static final int src_atop = 0x7f08008e; - public static final int src_in = 0x7f08008f; - public static final int src_over = 0x7f080090; - public static final int status_bar_latest_event_content = 0x7f080096; - public static final int submit_area = 0x7f080097; - public static final int tabMode = 0x7f080098; - public static final int text = 0x7f08009a; - public static final int text2 = 0x7f08009b; - public static final int textSpacerNoButtons = 0x7f08009c; - public static final int time = 0x7f08009d; - public static final int title = 0x7f08009e; - public static final int title_template = 0x7f08009f; - public static final int topPanel = 0x7f0800bc; - public static final int up = 0x7f0800ce; - public static final int useLogo = 0x7f0800cf; - public static final int withText = 0x7f0800d0; - public static final int wrap_content = 0x7f0800d9; + public static final int home = 0x7f08003e; + public static final int homeAsUp = 0x7f08003f; + public static final int icon = 0x7f080041; + public static final int ifRoom = 0x7f080042; + public static final int image = 0x7f080043; + public static final int info = 0x7f080045; + public static final int line1 = 0x7f080052; + public static final int line3 = 0x7f080053; + public static final int listMode = 0x7f080056; + public static final int list_item = 0x7f080057; + public static final int media_actions = 0x7f080058; + public static final int middle = 0x7f080059; + public static final int multiply = 0x7f08005a; + public static final int never = 0x7f08005b; + public static final int none = 0x7f08005c; + public static final int normal = 0x7f08005d; + public static final int parentPanel = 0x7f08005e; + public static final int progress_circular = 0x7f080062; + public static final int progress_horizontal = 0x7f080063; + public static final int radio = 0x7f080064; + public static final int screen = 0x7f080065; + public static final int scrollIndicatorDown = 0x7f080066; + public static final int scrollIndicatorUp = 0x7f080067; + public static final int scrollView = 0x7f080068; + public static final int search_badge = 0x7f080069; + public static final int search_bar = 0x7f08006a; + public static final int search_button = 0x7f08006b; + public static final int search_close_btn = 0x7f08006c; + public static final int search_edit_frame = 0x7f08006d; + public static final int search_go_btn = 0x7f08006e; + public static final int search_mag_icon = 0x7f08006f; + public static final int search_plate = 0x7f080070; + public static final int search_src_text = 0x7f080071; + public static final int search_voice_btn = 0x7f080072; + public static final int select_dialog_listview = 0x7f080073; + public static final int shortcut = 0x7f080083; + public static final int showCustom = 0x7f080088; + public static final int showHome = 0x7f080089; + public static final int showTitle = 0x7f08008a; + public static final int spacer = 0x7f08008b; + public static final int split_action_bar = 0x7f08008c; + public static final int src_atop = 0x7f08008d; + public static final int src_in = 0x7f08008e; + public static final int src_over = 0x7f08008f; + public static final int status_bar_latest_event_content = 0x7f080095; + public static final int submit_area = 0x7f080096; + public static final int tabMode = 0x7f080097; + public static final int text = 0x7f080099; + public static final int text2 = 0x7f08009a; + public static final int textSpacerNoButtons = 0x7f08009b; + public static final int time = 0x7f08009c; + public static final int title = 0x7f08009d; + public static final int title_template = 0x7f08009e; + public static final int topPanel = 0x7f0800bb; + public static final int up = 0x7f0800cd; + public static final int useLogo = 0x7f0800ce; + public static final int withText = 0x7f0800cf; + public static final int wrap_content = 0x7f0800d8; } public static final class integer { public static final int abc_config_activityDefaultDur = 0x7f090000; diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml index 1b68b08..8267f19 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -21,41 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -104,7 +70,7 @@ - + @@ -159,7 +125,7 @@ - + @@ -209,6 +175,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml index 846481a..a835cd4 100644 --- a/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml @@ -1,5 +1,5 @@ -truefalsetruefalsetruefalsetruefalse@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232@android:color/white@android:color/black#6680cbc4#66009688@color/bright_foreground_disabled_material_dark@color/bright_foreground_disabled_material_light#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f116dp56dp0dp0dp16dp10dp6dp40dp48dp180dp5dp-3dp48dp48dp36dp48dp@dimen/abc_control_inset_material6dp8dp@dimen/abc_control_padding_material320dp2dp4dp4dp80%100%320dp320dp8dp65%95%24dp18dp0.300.2632dip8dip8dip7dp4dp10dp16dp@dimen/abc_action_bar_content_inset_material296dp320dip160dip2dp2dp20dp3dp14sp14sp14sp12sp34sp45sp56sp112sp24sp22sp18sp16sp14sp16sp16dp20sp20dp0.300.260.260.200.1264dp64dp12dp#3333B5E52201502127999Navigate home%1$s, %2$s%1$s, %2$s, %3$sNavigate upMore optionsDoneSee allChoose an appOFFONSearch…Clear querySearch querySearchSubmit queryVoice searchShare withShare with %sCollapse999+"मुख्यपृष्ठ पर नेविगेट करें""%1$s, %2$s""%1$s, %2$s, %3$s""ऊपर नेविगेट करें""अधिक विकल्प""पूर्ण""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""खोजा जा रहा है…""क्‍वेरी साफ़ करें""खोज क्वेरी""खोजें""क्वेरी सबमिट करें""ध्वनि खोज""इसके द्वारा साझा करें""%s के साथ साझा करें""संक्षिप्त करें""999+""Idi na početnu""%1$s, %2$s""%1$s, %2$s, %3$s""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeljenje sa: %s""Sažmi""999+""Ugrás a főoldalra""%1$s, %2$s""%1$s, %2$s, %3$s""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következővel: %s""Összecsukás""999+""Ուղղվել տուն""%1$s, %2$s""%1$s, %2$s, %3$s""Ուղղվել վերև""Այլ ընտրանքներ""Կատարված է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Տարածել""Տարածել ըստ %s""Թաքցնել""999+""Navigasi ke beranda""%1$s, %2$s""%1$s, %2$s, %3$s""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan dengan %s""Ciutkan""999+""Fara heim""%1$s, %2$s""%1$s, %2$s, %3$s""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""999+""Vai alla home page""%1$s, %2$s""%1$s, %2$s, %3$s""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi con %s""Comprimi""999+""נווט לדף הבית""‏%1$s‏, %2$s""‏%1$s‏, %2$s‏, %3$s""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""חפש…""מחק שאילתה""שאילתת חיפוש""חפש""שלח שאילתה""חיפוש קולי""שתף עם""‏שתף עם %s""כווץ""‎999+‎""ホームへ移動""%1$s、%2$s""%1$s、%2$s、%3$s""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""999+""მთავარზე ნავიგაცია""%1$s, %2$s""%1$s, %2$s, %3$s""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""%s-თან გაზიარება""აკეცვა""999+""Негізгі бетте қозғалу""%1$s, %2$s""%1$s, %2$s, %3$s""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s бөлісу""Тасалау""999+""រកមើល​ទៅ​ដើម""%1$s, %2$s""%1$s, %2$s, %3$s""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែករំលែក​ជាមួយ %s""បង្រួម""999+""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""%1$s, %2$s""%1$s, %2$s, %3$s""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕು""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""999+""홈 탐색""%1$s, %2$s""%1$s, %2$s, %3$s""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""999+""Үйгө багыттоо""%1$s, %2$s""%1$s, %2$s, %3$s""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""999+"truetrue48dp32dp12dp14dptruetrue440dp60%90%60%90%55%80%192dip4"मुख्यपृष्ठ पर नेविगेट करें""%1$s, %2$s""%1$s, %2$s, %3$s""ऊपर नेविगेट करें""अधिक विकल्प""पूर्ण""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""खोजा जा रहा है…""क्‍वेरी साफ़ करें""खोज क्वेरी""खोजें""क्वेरी सबमिट करें""ध्वनि खोज""इसके द्वारा साझा करें""%s के साथ साझा करें""संक्षिप्त करें""999+""Idi na početnu""%1$s, %2$s""%1$s, %2$s, %3$s""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeljenje sa: %s""Sažmi""999+""Ugrás a főoldalra""%1$s, %2$s""%1$s, %2$s, %3$s""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következővel: %s""Összecsukás""999+""Ուղղվել տուն""%1$s, %2$s""%1$s, %2$s, %3$s""Ուղղվել վերև""Այլ ընտրանքներ""Կատարված է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Տարածել""Տարածել ըստ %s""Թաքցնել""999+""Navigasi ke beranda""%1$s, %2$s""%1$s, %2$s, %3$s""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan dengan %s""Ciutkan""999+""Fara heim""%1$s, %2$s""%1$s, %2$s, %3$s""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""999+""Vai alla home page""%1$s, %2$s""%1$s, %2$s, %3$s""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi con %s""Comprimi""999+""נווט לדף הבית""‏%1$s‏, %2$s""‏%1$s‏, %2$s‏, %3$s""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""חפש…""מחק שאילתה""שאילתת חיפוש""חפש""שלח שאילתה""חיפוש קולי""שתף עם""‏שתף עם %s""כווץ""‎999+‎""ホームへ移動""%1$s、%2$s""%1$s、%2$s、%3$s""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""999+""მთავარზე ნავიგაცია""%1$s, %2$s""%1$s, %2$s, %3$s""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""%s-თან გაზიარება""აკეცვა""999+""Негізгі бетте қозғалу""%1$s, %2$s""%1$s, %2$s, %3$s""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s бөлісу""Тасалау""999+""រកមើល​ទៅ​ដើម""%1$s, %2$s""%1$s, %2$s, %3$s""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែករំលែក​ជាមួយ %s""បង្រួម""999+""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""%1$s, %2$s""%1$s, %2$s, %3$s""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕು""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""999+""홈 탐색""%1$s, %2$s""%1$s, %2$s, %3$s""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""999+""Үйгө багыттоо""%1$s, %2$s""%1$s, %2$s, %3$s""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""999+"truetrue48dp32dp12dp14dptruetrue440dp60%90%60%90%55%80%192dip40px0px"मुख्यपृष्ठ पर नेविगेट करें""%1$s, %2$s""%1$s, %2$s, %3$s""ऊपर नेविगेट करें""अधिक विकल्प""पूर्ण""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""खोजा जा रहा है…""क्‍वेरी साफ़ करें""खोज क्वेरी""खोजें""क्वेरी सबमिट करें""ध्वनि खोज""इसके द्वारा साझा करें""%s के साथ साझा करें""संक्षिप्त करें""999+""Idi na početnu""%1$s, %2$s""%1$s, %2$s, %3$s""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeljenje sa: %s""Sažmi""999+""Ugrás a főoldalra""%1$s, %2$s""%1$s, %2$s, %3$s""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következővel: %s""Összecsukás""999+""Ուղղվել տուն""%1$s, %2$s""%1$s, %2$s, %3$s""Ուղղվել վերև""Այլ ընտրանքներ""Կատարված է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Տարածել""Տարածել ըստ %s""Թաքցնել""999+""Navigasi ke beranda""%1$s, %2$s""%1$s, %2$s, %3$s""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan dengan %s""Ciutkan""999+""Fara heim""%1$s, %2$s""%1$s, %2$s, %3$s""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""999+""Vai alla home page""%1$s, %2$s""%1$s, %2$s, %3$s""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi con %s""Comprimi""999+""נווט לדף הבית""‏%1$s‏, %2$s""‏%1$s‏, %2$s‏, %3$s""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""חפש…""מחק שאילתה""שאילתת חיפוש""חפש""שלח שאילתה""חיפוש קולי""שתף עם""‏שתף עם %s""כווץ""‎999+‎""ホームへ移動""%1$s、%2$s""%1$s、%2$s、%3$s""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""999+""მთავარზე ნავიგაცია""%1$s, %2$s""%1$s, %2$s, %3$s""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""%s-თან გაზიარება""აკეცვა""999+""Негізгі бетте қозғалу""%1$s, %2$s""%1$s, %2$s, %3$s""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s бөлісу""Тасалау""999+""រកមើល​ទៅ​ដើម""%1$s, %2$s""%1$s, %2$s, %3$s""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែករំលែក​ជាមួយ %s""បង្រួម""999+""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""%1$s, %2$s""%1$s, %2$s, %3$s""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕು""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""999+""홈 탐색""%1$s, %2$s""%1$s, %2$s, %3$s""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""999+""Үйгө багыттоо""%1$s, %2$s""%1$s, %2$s, %3$s""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""999+"truetrue48dp32dp12dp14dptruetrue440dp60%90%60%90%55%80%192dip4"मुख्यपृष्ठ पर नेविगेट करें""%1$s, %2$s""%1$s, %2$s, %3$s""ऊपर नेविगेट करें""अधिक विकल्प""पूर्ण""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""खोजा जा रहा है…""क्‍वेरी साफ़ करें""खोज क्वेरी""खोजें""क्वेरी सबमिट करें""ध्वनि खोज""इसके द्वारा साझा करें""%s के साथ साझा करें""संक्षिप्त करें""999+""Idi na početnu""%1$s, %2$s""%1$s, %2$s, %3$s""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeljenje sa: %s""Sažmi""999+""Ugrás a főoldalra""%1$s, %2$s""%1$s, %2$s, %3$s""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következővel: %s""Összecsukás""999+""Ուղղվել տուն""%1$s, %2$s""%1$s, %2$s, %3$s""Ուղղվել վերև""Այլ ընտրանքներ""Կատարված է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Տարածել""Տարածել ըստ %s""Թաքցնել""999+""Navigasi ke beranda""%1$s, %2$s""%1$s, %2$s, %3$s""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan dengan %s""Ciutkan""999+""Fara heim""%1$s, %2$s""%1$s, %2$s, %3$s""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""999+""Vai alla home page""%1$s, %2$s""%1$s, %2$s, %3$s""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi con %s""Comprimi""999+""נווט לדף הבית""‏%1$s‏, %2$s""‏%1$s‏, %2$s‏, %3$s""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""חפש…""מחק שאילתה""שאילתת חיפוש""חפש""שלח שאילתה""חיפוש קולי""שתף עם""‏שתף עם %s""כווץ""‎999+‎""ホームへ移動""%1$s、%2$s""%1$s、%2$s、%3$s""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""999+""მთავარზე ნავიგაცია""%1$s, %2$s""%1$s, %2$s, %3$s""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""%s-თან გაზიარება""აკეცვა""999+""Негізгі бетте қозғалу""%1$s, %2$s""%1$s, %2$s, %3$s""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s бөлісу""Тасалау""999+""រកមើល​ទៅ​ដើម""%1$s, %2$s""%1$s, %2$s, %3$s""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែករំលែក​ជាមួយ %s""បង្រួម""999+""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""%1$s, %2$s""%1$s, %2$s, %3$s""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕು""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""999+""홈 탐색""%1$s, %2$s""%1$s, %2$s, %3$s""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""999+""Үйгө багыттоо""%1$s, %2$s""%1$s, %2$s, %3$s""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""999+"truetrue48dp32dp12dp14dptruetrue440dp60%90%60%90%55%80%192dip40px0px170dp170dp70dp60dp \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt index b76ea27..8a7c49e 100644 --- a/app/build/intermediates/symbols/debug/R.txt +++ b/app/build/intermediates/symbols/debug/R.txt @@ -616,167 +616,166 @@ int id goal_message_levelbutton_star1 0x7f080035 int id goal_message_levelbutton_star2 0x7f080036 int id goal_message_levelbutton_star3 0x7f080037 int id goal_message_levelbutton_textview 0x7f080038 -int id goal_message_mid_layout 0x7f080039 -int id goal_message_next_level 0x7f08003a -int id goal_message_restart 0x7f08003b -int id goal_message_title 0x7f08003c -int id goal_message_to_menu 0x7f08003d -int id goal_message_topbar 0x7f08003e -int id home 0x7f08003f -int id homeAsUp 0x7f080040 -int id horizontalScrollView 0x7f080041 -int id icon 0x7f080042 -int id ifRoom 0x7f080043 -int id image 0x7f080044 -int id imageView 0x7f080045 -int id info 0x7f080046 -int id levelbutton_energy 0x7f080047 -int id levelbutton_lock 0x7f080048 -int id levelbutton_star1 0x7f080049 -int id levelbutton_star2 0x7f08004a -int id levelbutton_star3 0x7f08004b -int id levelbutton_textview 0x7f08004c -int id levels_bottom_row 0x7f08004d -int id levels_top_row 0x7f08004e -int id levels_topbar 0x7f08004f -int id levelup_level 0x7f080050 -int id levelup_text 0x7f080051 -int id levelup_unlocklist 0x7f080052 -int id line1 0x7f080053 -int id line3 0x7f080054 -int id linearLayout 0x7f080055 -int id linearLayout4 0x7f080056 -int id listMode 0x7f080057 -int id list_item 0x7f080058 -int id media_actions 0x7f080059 -int id middle 0x7f08005a -int id multiply 0x7f08005b -int id never 0x7f08005c -int id none 0x7f08005d -int id normal 0x7f08005e -int id parentPanel 0x7f08005f -int id price_button_currency 0x7f080060 -int id price_button_price 0x7f080061 -int id price_button_title 0x7f080062 -int id progress_circular 0x7f080063 -int id progress_horizontal 0x7f080064 -int id radio 0x7f080065 -int id screen 0x7f080066 -int id scrollIndicatorDown 0x7f080067 -int id scrollIndicatorUp 0x7f080068 -int id scrollView 0x7f080069 -int id search_badge 0x7f08006a -int id search_bar 0x7f08006b -int id search_button 0x7f08006c -int id search_close_btn 0x7f08006d -int id search_edit_frame 0x7f08006e -int id search_go_btn 0x7f08006f -int id search_mag_icon 0x7f080070 -int id search_plate 0x7f080071 -int id search_src_text 0x7f080072 -int id search_voice_btn 0x7f080073 -int id select_dialog_listview 0x7f080074 -int id settings_reset 0x7f080075 -int id settings_soundtoggle 0x7f080076 -int id settings_topbar 0x7f080077 -int id shape_button_button 0x7f080078 -int id shape_button_textview 0x7f080079 -int id shape_inspector_check_box 0x7f08007a -int id shape_inspector_check_box_image 0x7f08007b -int id shape_inspector_check_box_text 0x7f08007c -int id shape_inspector_description 0x7f08007d -int id shape_inspector_imageview 0x7f08007e -int id shape_inspector_title 0x7f08007f -int id shape_shop_bottomRow 0x7f080080 -int id shape_shop_shape_inspector 0x7f080081 -int id shape_shop_topRow 0x7f080082 -int id shape_shop_topbar 0x7f080083 -int id shortcut 0x7f080084 -int id shortmenu_continue 0x7f080085 -int id shortmenu_exit 0x7f080086 -int id shortmenu_restart 0x7f080087 -int id shortmenu_topbar 0x7f080088 -int id showCustom 0x7f080089 -int id showHome 0x7f08008a -int id showTitle 0x7f08008b -int id spacer 0x7f08008c -int id split_action_bar 0x7f08008d -int id src_atop 0x7f08008e -int id src_in 0x7f08008f -int id src_over 0x7f080090 -int id startscreen_gain_90_ep 0x7f080091 -int id startscreen_play 0x7f080092 -int id startscreen_settings 0x7f080093 -int id startscreen_to_gl_test_screen 0x7f080094 -int id startscreen_unlock_levels 0x7f080095 -int id status_bar_latest_event_content 0x7f080096 -int id submit_area 0x7f080097 -int id tabMode 0x7f080098 -int id task_completed_unlock_list 0x7f080099 -int id text 0x7f08009a -int id text2 0x7f08009b -int id textSpacerNoButtons 0x7f08009c -int id time 0x7f08009d -int id title 0x7f08009e -int id title_template 0x7f08009f -int id tool_button_animation_layer 0x7f0800a0 -int id tool_button_background_layer 0x7f0800a1 -int id tool_button_progress_bar 0x7f0800a2 -int id tool_inspector_description 0x7f0800a3 -int id tool_inspector_imageview 0x7f0800a4 -int id tool_inspector_level_view 0x7f0800a5 -int id tool_inspector_pricebutton 0x7f0800a6 -int id tool_inspector_title 0x7f0800a7 -int id tool_upgrade_imageview 0x7f0800a8 -int id tool_upgrade_pricebutton 0x7f0800a9 -int id tool_upgrade_title 0x7f0800aa -int id tool_upgrade_value_new 0x7f0800ab -int id tool_upgrade_value_old 0x7f0800ac -int id toolbutton_1 0x7f0800ad -int id toolbutton_2 0x7f0800ae -int id toolbutton_3 0x7f0800af -int id toolbutton_4 0x7f0800b0 -int id toolofferslot_slot 0x7f0800b1 -int id toolofferslot_title 0x7f0800b2 -int id toolshop_slot1 0x7f0800b3 -int id toolshop_slot2 0x7f0800b4 -int id toolshop_slot3 0x7f0800b5 -int id toolshop_slot4 0x7f0800b6 -int id toolshop_tool_offer_bottom_row 0x7f0800b7 -int id toolshop_tool_offer_top_row 0x7f0800b8 -int id toolshop_toolinspector 0x7f0800b9 -int id toolshop_topbar 0x7f0800ba -int id toolslot_image 0x7f0800bb -int id topPanel 0x7f0800bc -int id topbar_energycount 0x7f0800bd -int id topbar_energycount_decrease 0x7f0800be -int id topbar_energyview 0x7f0800bf -int id topbar_layout 0x7f0800c0 -int id topbar_leveldisplay 0x7f0800c1 -int id topbar_levellayout 0x7f0800c2 -int id topbar_levelprogress 0x7f0800c3 -int id topbar_settings 0x7f0800c4 -int id topbar_shapeshop 0x7f0800c5 -int id topbar_starcount 0x7f0800c6 -int id topbar_starcount_decrease 0x7f0800c7 -int id topbar_starview 0x7f0800c8 -int id topbar_toolshop 0x7f0800c9 -int id tutorial_image_view 0x7f0800ca -int id tutorial_text_view 0x7f0800cb -int id unlockmessage_message 0x7f0800cc -int id unlockmessage_toolimage 0x7f0800cd -int id up 0x7f0800ce -int id useLogo 0x7f0800cf -int id withText 0x7f0800d0 -int id worldbutton_energycount 0x7f0800d1 -int id worldbutton_levelcount 0x7f0800d2 -int id worldbutton_lock 0x7f0800d3 -int id worldbutton_preview 0x7f0800d4 -int id worldbutton_starcount 0x7f0800d5 -int id worldbutton_title 0x7f0800d6 -int id worlds_layout 0x7f0800d7 -int id worlds_topbar 0x7f0800d8 -int id wrap_content 0x7f0800d9 +int id goal_message_next_level 0x7f080039 +int id goal_message_restart 0x7f08003a +int id goal_message_title 0x7f08003b +int id goal_message_to_menu 0x7f08003c +int id goal_message_topbar 0x7f08003d +int id home 0x7f08003e +int id homeAsUp 0x7f08003f +int id horizontalScrollView 0x7f080040 +int id icon 0x7f080041 +int id ifRoom 0x7f080042 +int id image 0x7f080043 +int id imageView 0x7f080044 +int id info 0x7f080045 +int id levelbutton_energy 0x7f080046 +int id levelbutton_lock 0x7f080047 +int id levelbutton_star1 0x7f080048 +int id levelbutton_star2 0x7f080049 +int id levelbutton_star3 0x7f08004a +int id levelbutton_textview 0x7f08004b +int id levels_bottom_row 0x7f08004c +int id levels_top_row 0x7f08004d +int id levels_topbar 0x7f08004e +int id levelup_level 0x7f08004f +int id levelup_text 0x7f080050 +int id levelup_unlocklist 0x7f080051 +int id line1 0x7f080052 +int id line3 0x7f080053 +int id linearLayout 0x7f080054 +int id linearLayout4 0x7f080055 +int id listMode 0x7f080056 +int id list_item 0x7f080057 +int id media_actions 0x7f080058 +int id middle 0x7f080059 +int id multiply 0x7f08005a +int id never 0x7f08005b +int id none 0x7f08005c +int id normal 0x7f08005d +int id parentPanel 0x7f08005e +int id price_button_currency 0x7f08005f +int id price_button_price 0x7f080060 +int id price_button_title 0x7f080061 +int id progress_circular 0x7f080062 +int id progress_horizontal 0x7f080063 +int id radio 0x7f080064 +int id screen 0x7f080065 +int id scrollIndicatorDown 0x7f080066 +int id scrollIndicatorUp 0x7f080067 +int id scrollView 0x7f080068 +int id search_badge 0x7f080069 +int id search_bar 0x7f08006a +int id search_button 0x7f08006b +int id search_close_btn 0x7f08006c +int id search_edit_frame 0x7f08006d +int id search_go_btn 0x7f08006e +int id search_mag_icon 0x7f08006f +int id search_plate 0x7f080070 +int id search_src_text 0x7f080071 +int id search_voice_btn 0x7f080072 +int id select_dialog_listview 0x7f080073 +int id settings_reset 0x7f080074 +int id settings_soundtoggle 0x7f080075 +int id settings_topbar 0x7f080076 +int id shape_button_button 0x7f080077 +int id shape_button_textview 0x7f080078 +int id shape_inspector_check_box 0x7f080079 +int id shape_inspector_check_box_image 0x7f08007a +int id shape_inspector_check_box_text 0x7f08007b +int id shape_inspector_description 0x7f08007c +int id shape_inspector_imageview 0x7f08007d +int id shape_inspector_title 0x7f08007e +int id shape_shop_bottomRow 0x7f08007f +int id shape_shop_shape_inspector 0x7f080080 +int id shape_shop_topRow 0x7f080081 +int id shape_shop_topbar 0x7f080082 +int id shortcut 0x7f080083 +int id shortmenu_continue 0x7f080084 +int id shortmenu_exit 0x7f080085 +int id shortmenu_restart 0x7f080086 +int id shortmenu_topbar 0x7f080087 +int id showCustom 0x7f080088 +int id showHome 0x7f080089 +int id showTitle 0x7f08008a +int id spacer 0x7f08008b +int id split_action_bar 0x7f08008c +int id src_atop 0x7f08008d +int id src_in 0x7f08008e +int id src_over 0x7f08008f +int id startscreen_gain_90_ep 0x7f080090 +int id startscreen_play 0x7f080091 +int id startscreen_settings 0x7f080092 +int id startscreen_to_gl_test_screen 0x7f080093 +int id startscreen_unlock_levels 0x7f080094 +int id status_bar_latest_event_content 0x7f080095 +int id submit_area 0x7f080096 +int id tabMode 0x7f080097 +int id task_completed_unlock_list 0x7f080098 +int id text 0x7f080099 +int id text2 0x7f08009a +int id textSpacerNoButtons 0x7f08009b +int id time 0x7f08009c +int id title 0x7f08009d +int id title_template 0x7f08009e +int id tool_button_animation_layer 0x7f08009f +int id tool_button_background_layer 0x7f0800a0 +int id tool_button_progress_bar 0x7f0800a1 +int id tool_inspector_description 0x7f0800a2 +int id tool_inspector_imageview 0x7f0800a3 +int id tool_inspector_level_view 0x7f0800a4 +int id tool_inspector_pricebutton 0x7f0800a5 +int id tool_inspector_title 0x7f0800a6 +int id tool_upgrade_imageview 0x7f0800a7 +int id tool_upgrade_pricebutton 0x7f0800a8 +int id tool_upgrade_title 0x7f0800a9 +int id tool_upgrade_value_new 0x7f0800aa +int id tool_upgrade_value_old 0x7f0800ab +int id toolbutton_1 0x7f0800ac +int id toolbutton_2 0x7f0800ad +int id toolbutton_3 0x7f0800ae +int id toolbutton_4 0x7f0800af +int id toolofferslot_slot 0x7f0800b0 +int id toolofferslot_title 0x7f0800b1 +int id toolshop_slot1 0x7f0800b2 +int id toolshop_slot2 0x7f0800b3 +int id toolshop_slot3 0x7f0800b4 +int id toolshop_slot4 0x7f0800b5 +int id toolshop_tool_offer_bottom_row 0x7f0800b6 +int id toolshop_tool_offer_top_row 0x7f0800b7 +int id toolshop_toolinspector 0x7f0800b8 +int id toolshop_topbar 0x7f0800b9 +int id toolslot_image 0x7f0800ba +int id topPanel 0x7f0800bb +int id topbar_energycount 0x7f0800bc +int id topbar_energycount_decrease 0x7f0800bd +int id topbar_energyview 0x7f0800be +int id topbar_layout 0x7f0800bf +int id topbar_leveldisplay 0x7f0800c0 +int id topbar_levellayout 0x7f0800c1 +int id topbar_levelprogress 0x7f0800c2 +int id topbar_settings 0x7f0800c3 +int id topbar_shapeshop 0x7f0800c4 +int id topbar_starcount 0x7f0800c5 +int id topbar_starcount_decrease 0x7f0800c6 +int id topbar_starview 0x7f0800c7 +int id topbar_toolshop 0x7f0800c8 +int id tutorial_image_view 0x7f0800c9 +int id tutorial_text_view 0x7f0800ca +int id unlockmessage_message 0x7f0800cb +int id unlockmessage_toolimage 0x7f0800cc +int id up 0x7f0800cd +int id useLogo 0x7f0800ce +int id withText 0x7f0800cf +int id worldbutton_energycount 0x7f0800d0 +int id worldbutton_levelcount 0x7f0800d1 +int id worldbutton_lock 0x7f0800d2 +int id worldbutton_preview 0x7f0800d3 +int id worldbutton_starcount 0x7f0800d4 +int id worldbutton_title 0x7f0800d5 +int id worlds_layout 0x7f0800d6 +int id worlds_topbar 0x7f0800d7 +int id wrap_content 0x7f0800d8 int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer abc_max_action_buttons 0x7f090002 @@ -962,25 +961,26 @@ int string tool_upgrade_value_max 0x7f0d0069 int string topbar_level_format_d 0x7f0d006a int string topbar_level_placeholder 0x7f0d006b int string topbar_toolshop 0x7f0d006c -int string tutorial_leveled_up 0x7f0d006d +int string tutorial_leveled_up_to_toolshop 0x7f0d006d int string tutorial_place_ramp_air 0x7f0d006e int string tutorial_place_ramp_air_2 0x7f0d006f int string tutorial_place_ramp_gap 0x7f0d0070 int string tutorial_place_ramp_obstacle 0x7f0d0071 int string tutorial_place_tools 0x7f0d0072 int string tutorial_placeholder 0x7f0d0073 -int string tutorial_to_toolshop 0x7f0d0074 -int string tutorial_toolshop_all_tools 0x7f0d0075 -int string tutorial_toolshop_equip_spring 0x7f0d0076 -int string tutorial_toolshop_inspector 0x7f0d0077 -int string tutorial_toolshop_select_buy_spring 0x7f0d0078 -int string tutorial_toolshop_toolbar 0x7f0d0079 -int string tutorial_toolshop_welcome 0x7f0d007a -int string tutorial_welcome 0x7f0d007b -int string unlock_message_placeholder 0x7f0d007c -int string world_button_count_format_dd 0x7f0d007d -int string world_button_progress_placeholder 0x7f0d007e -int string world_button_title_placeholder 0x7f0d007f +int string tutorial_switch_tools_switch 0x7f0d0074 +int string tutorial_switch_tools_two_neccessary 0x7f0d0075 +int string tutorial_toolshop_all_tools 0x7f0d0076 +int string tutorial_toolshop_equip_spring 0x7f0d0077 +int string tutorial_toolshop_inspector 0x7f0d0078 +int string tutorial_toolshop_select_buy_spring 0x7f0d0079 +int string tutorial_toolshop_toolbar 0x7f0d007a +int string tutorial_toolshop_welcome 0x7f0d007b +int string tutorial_welcome 0x7f0d007c +int string unlock_message_placeholder 0x7f0d007d +int string world_button_count_format_dd 0x7f0d007e +int string world_button_progress_placeholder 0x7f0d007f +int string world_button_title_placeholder 0x7f0d0080 int style AlertDialog_AppCompat 0x7f0e0000 int style AlertDialog_AppCompat_Light 0x7f0e0001 int style Animation_AppCompat_Dialog 0x7f0e0002 diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index a53eddc..02b1ff1 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -4,8 +4,8 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 -MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\27049d1afcfe240a00be9b27ab6dee89\AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\f1a49c3084d9c359f07c2a2e80015299\AndroidManifest.xml:17:1-24:12 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12 @@ -31,10 +31,10 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32 application ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:9:5-26:19 -MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:22:5-20 -MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:22:5-20 -MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:22:5-20 -MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\27049d1afcfe240a00be9b27ab6dee89\AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\27049d1afcfe240a00be9b27ab6dee89\AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\f1a49c3084d9c359f07c2a2e80015299\AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\f1a49c3084d9c359f07c2a2e80015299\AndroidManifest.xml:22:5-20 android:supportsRtl ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35 android:label @@ -67,10 +67,10 @@ uses-sdk INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml reason: use-sdk injection requested INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml -MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:20:5-43 -MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:20:5-43 -MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:20:5-43 -MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\27049d1afcfe240a00be9b27ab6dee89\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\27049d1afcfe240a00be9b27ab6dee89\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\f1a49c3084d9c359f07c2a2e80015299\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\f1a49c3084d9c359f07c2a2e80015299\AndroidManifest.xml:20:5-43 INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml android:targetSdkVersion diff --git a/app/src/main/assets/levelpacks/Grasslands.xml b/app/src/main/assets/levelpacks/Grasslands.xml index 1b68b08..8267f19 100644 --- a/app/src/main/assets/levelpacks/Grasslands.xml +++ b/app/src/main/assets/levelpacks/Grasslands.xml @@ -21,41 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -104,7 +70,7 @@ - + @@ -159,7 +125,7 @@ - + @@ -209,6 +175,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java index b7b21c5..01cf515 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java +++ b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java @@ -37,7 +37,6 @@ import de.frajul.endlessroll.rendering.renderer.GameRenderer; import de.frajul.endlessroll.sounds.SoundManager; import de.frajul.endlessroll.sqlDatabase.MyDatabase; import de.frajul.endlessroll.user.User; -import de.frajul.endlessroll.views.GoalMessage; import de.frajul.endlessroll.views.LevelupMessage; import de.frajul.endlessroll.views.TaskCompletedMessage; @@ -94,6 +93,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU levelManager = new LevelManager(this, dataStorageHandler); tutorialManager = new TutorialManager(this); + tutorialManager.getToolShopTutorial().setFinished(dataStorageHandler.readToolShopTutorialFinished()); this.glSurfaceView = new MyGlSurfaceView(this, new GameRenderer(this)); typeface = Typeface.createFromAsset(getAssets(), "fontBaron.ttf"); @@ -165,6 +165,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU levelupMessage.show(level); } }); + tutorialManager.onLvUp(user); } public void onTasksCompleted(final List shapes) { @@ -176,7 +177,10 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU }); } - public void showTutorialScreen(final List breakPoints) { + public void showTutorial(final List breakPoints) { + if(!gameScreen.isLevelFinished()){ + gameScreen.setGamePausedWithoutMenu(); + } runOnUiThread(new Runnable() { @Override public void run() { @@ -195,7 +199,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU dataStorageHandler.writeUserData(user); dataStorageHandler.writeToolShopTutorialFinished(false); levelManager.reset(); - tutorialManager.getToolShopTutorial().setFinished(false); + tutorialManager.resetAllTutorials(); MyDatabase database = dataStorageHandler.getDatabase(); database.open(); database.clearLevelProgess(); diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/Game.java b/app/src/main/java/de/frajul/endlessroll/main/game/Game.java index aa6918a..7abf9eb 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/game/Game.java +++ b/app/src/main/java/de/frajul/endlessroll/main/game/Game.java @@ -25,7 +25,6 @@ import de.frajul.endlessroll.main.GameHandler; import de.frajul.endlessroll.main.GameLog; import de.frajul.endlessroll.main.physics.Physics; import de.frajul.endlessroll.main.screens.Screen; -import de.frajul.endlessroll.main.tutorial.Tutorial; import de.frajul.endlessroll.rendering.Rendering; import de.frajul.endlessroll.sqlDatabase.MyDatabase; import de.frajul.endlessroll.views.ToolButton; @@ -55,8 +54,6 @@ public class Game extends Rendering { private List collectedStars = new ArrayList<>(); private boolean energyCollected; - private Tutorial currentTutorial; - public Game(GameHandler handler, GameActivity gameActivity) throws Exception { super(gameActivity); this.handler = handler; @@ -95,9 +92,6 @@ public class Game extends Rendering { if (scene != null) { gameState = GameState.COUNTDOWN; gameActivity.getTutorialManager().resetGameTutorials(); - currentTutorial = gameActivity.getTutorialManager().getGameTutorial(level); - if (level.isFinished()) - currentTutorial = null; collectedStars.clear(); energyCollected = false; particleSystem.deleteAllSources(); @@ -145,14 +139,7 @@ public class Game extends Rendering { } scene.getCamera().update(player.getPosition().y, timer); - if (currentTutorial != null) { - currentTutorial.update(playerProgress); - if (currentTutorial.isOverNewBreakPoints()) { - gameState = GameState.PAUSED; - handler.showTutorialScreen(currentTutorial.getCurrentBreakPoints()); - return; - } - } + gameActivity.getTutorialManager().update(level, playerProgress); physics.applyGravity(scene, timer); scene.update(timer); @@ -211,6 +198,10 @@ public class Game extends Rendering { currentTool = toolType; } + public void pauseWithoutMenu(){ + gameState = GameState.PAUSED; + } + public void tryToPause() { if (gameState == GameState.GAME_OVER || gameState == GameState.LEVEL_FINISHED || gameState == GameState.PAUSED) return; @@ -307,12 +298,6 @@ public class Game extends Rendering { } database.close(); gameActivity.getDataStorageHandler().writeUserData(gameActivity.getUser()); - - if (currentTutorial != null) { - currentTutorial.onLevelFinished(); - if (currentTutorial.isOverNewBreakPoints()) - handler.showTutorialScreen(currentTutorial.getCurrentBreakPoints()); - } } public void onStarCollision(Star star) { @@ -334,4 +319,7 @@ public class Game extends Rendering { return gameState; } + public ViewManager getViewManager() { + return viewManager; + } } diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java index fc834ad..603fd92 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java @@ -30,12 +30,17 @@ public class GameScreen extends GLScreen { @Override public void prepareToBeShown() { glView.setCurrentRendering(game); + game.getViewManager().prepareToBeShown(); } public void onPause() { game.tryToPause(); } + public void setGamePausedWithoutMenu(){ + game.pauseWithoutMenu(); + } + public void onResume() { game.setRunning(); } @@ -76,7 +81,7 @@ public class GameScreen extends GLScreen { @Override public void showTutorialScreen(List breakPoints) { - gameActivity.showTutorialScreen(breakPoints); + gameActivity.showTutorial(breakPoints); } @Override diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java index 7315221..145cb55 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java @@ -29,7 +29,6 @@ import de.frajul.endlessroll.views.TopBar; */ public class ToolShopScreen extends Screen implements View.OnClickListener { - private LevelUpBounties levelUpBounties; private ToolSlotSettings slotSettings; private ToolOfferSlot selectedToolOfferSlot; @@ -46,11 +45,9 @@ public class ToolShopScreen extends Screen implements View.OnCli public ToolShopScreen(GameActivity gameActivity) { super(ScreenType.TOOL_SHOP, gameActivity, R.layout.toolshop); - this.levelUpBounties = new LevelUpBounties(0); this.slotSettings = gameActivity.getUser().getToolSlotSettings(); this.tutorial = gameActivity.getTutorialManager().getToolShopTutorial(); tutorial.setToolShopScreen(this); - tutorial.setFinished(gameActivity.getDataStorageHandler().readToolShopTutorialFinished()); pulse = AnimationUtils.loadAnimation(gameActivity, R.anim.pulse); topBar = super.createTopBar(R.id.toolshop_topbar); @@ -92,8 +89,7 @@ public class ToolShopScreen extends Screen implements View.OnCli @Override public void prepareToBeShown() { topBar.update(); - levelUpBounties.loadAllForLevel(gameActivity.getUser().getLevel()); - slotSettings.unlockSlotsIfLevelReached(levelUpBounties); + slotSettings.unlockSlotsIfLevelReached(gameActivity.getUser().getLevelUpBounties()); onToolOfferSlotSelected(toolOfferSlots.get(0)); for (int i = 0; i < toolSlotViews.size(); i++) { @@ -102,7 +98,7 @@ public class ToolShopScreen extends Screen implements View.OnCli toolSlotView.setImageResource(toolSlot.getDrawable()); } for (ToolOfferSlot toolOfferSlot : toolOfferSlots) { - boolean locked = levelUpBounties.isToolLocked(toolOfferSlot.getToolType()); + boolean locked = gameActivity.getUser().getLevelUpBounties().isToolLocked(toolOfferSlot.getToolType()); toolOfferSlot.setLocked(locked); toolOfferSlot.updateBackgroundColor(); } @@ -202,11 +198,8 @@ public class ToolShopScreen extends Screen implements View.OnCli .isBought(); } - public LevelUpBounties getLevelUpBounties() { - return levelUpBounties; - } - public ToolType getSelectedToolType() { return selectedToolOfferSlot.getToolType(); } + } diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java index 475ca36..33ba8a0 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java @@ -1,5 +1,6 @@ package de.frajul.endlessroll.main.screens; +import android.view.Gravity; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -29,6 +30,7 @@ public class WorldsScreen extends Screen implements WorldButtonO buttonLayout = (LinearLayout) layout.findViewById(R.id.worlds_layout); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.gravity = Gravity.CENTER_VERTICAL; params.setMargins(25, 0, 25, 0); for (LevelPack levelPack : gameActivity.getLevelManager()) { diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java index a4eeee6..8fe3f2e 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java @@ -9,7 +9,7 @@ import android.support.annotation.StringRes; public class BreakPoint { - public final static float LEVEL_FINISHED_X = -1; + public final static float NONE_X = -1; private float x; private boolean alreadyShown = false; diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/Tutorial.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/Tutorial.java index 6118407..fc16cb9 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/Tutorial.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/Tutorial.java @@ -4,19 +4,20 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import de.frajul.endlessroll.main.GameActivity; + /** * Created by Julian on 14.03.2017. */ public class Tutorial { - private int levelId, levelPackId; + private GameActivity gameActivity; private List breakPoints; protected List currentBreakPoints = new ArrayList<>(); - public Tutorial(int levelId, int levelPackId, BreakPoint... breakPoints) { - this.levelId = levelId; - this.levelPackId = levelPackId; + public Tutorial(GameActivity gameActivity, BreakPoint... breakPoints) { + this.gameActivity = gameActivity; this.breakPoints = Arrays.asList(breakPoints); } @@ -26,47 +27,29 @@ public class Tutorial { currentBreakPoints.clear(); } - public void onLevelFinished() { - currentBreakPoints.clear(); - - for (BreakPoint breakPoint : breakPoints) { - if (breakPoint.getX() == BreakPoint.LEVEL_FINISHED_X) { - breakPoint.setAlreadyShown(true); - currentBreakPoints.add(breakPoint); - } - } - } - public void update(float playerProgress) { playerProgress *= 2f; currentBreakPoints.clear(); + boolean newBreakPoints = false; for (BreakPoint breakPoint : breakPoints) { if (!breakPoint.isAlreadyShown() && playerProgress >= breakPoint.getX() && breakPoint - .getX() != BreakPoint.LEVEL_FINISHED_X) { + .getX() != BreakPoint.NONE_X) { breakPoint.setAlreadyShown(true); currentBreakPoints.add(breakPoint); + newBreakPoints = true; } } + if (newBreakPoints) + showCurrentBreakPoints(); } - public boolean isOverNewBreakPoints() { - return !currentBreakPoints.isEmpty(); + private void showCurrentBreakPoints() { + gameActivity.showTutorial(currentBreakPoints); } - public List getCurrentBreakPoints() { - return currentBreakPoints; + public void showAllBreakPoints() { + gameActivity.showTutorial(breakPoints); } - public List getBreakPoints() { - return breakPoints; - } - - public int getLevelId() { - return levelId; - } - - public int getLevelPackId() { - return levelPackId; - } } \ No newline at end of file diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java index b7db107..e5d2b49 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java @@ -1,12 +1,11 @@ package de.frajul.endlessroll.main.tutorial; -import java.util.Arrays; -import java.util.List; - import de.frajul.endlessroll.R; +import de.frajul.endlessroll.entities.tools.ToolType; import de.frajul.endlessroll.levels.Level; import de.frajul.endlessroll.main.GameActivity; -import de.frajul.endlessroll.main.screens.ToolShopScreen; +import de.frajul.endlessroll.user.User; +import de.frajul.endlessroll.views.TopBar; /** * Created by Julian on 17.03.2017. @@ -14,42 +13,75 @@ import de.frajul.endlessroll.main.screens.ToolShopScreen; public class TutorialManager { - private List gameTutorials; + private final int WELCOME_TUTORIAL_LEVEL = 1; + private final int IN_AIR_TUTORIAL_LEVEL = 5; + private final int SWITCH_TOOLS_TUTORIAL_LEVEL = 10; + + private Tutorial welcomeTutorial; + private Tutorial inAirTutorial; + private Tutorial toToolShopTutorial; private ToolShopTutorial toolShopTutorial; + private Tutorial switchToolsTutorial; public TutorialManager(GameActivity gameActivity) { - Tutorial t11 = new Tutorial(1, 1, new BreakPoint(0, R.string.tutorial_welcome, -1), + welcomeTutorial = new Tutorial(gameActivity, + new BreakPoint(0, R.string.tutorial_welcome, -1), new BreakPoint(0, R.string.tutorial_place_tools, R.drawable.tutorial_place_tools), new BreakPoint(7, R.string.tutorial_place_ramp_gap, R.drawable.tutorial_place_ramp_gap), new BreakPoint(21, R.string.tutorial_place_ramp_obstacle, R.drawable.tutorial_place_ramp_obstacle)); - Tutorial t21 = new Tutorial(2, 1, new BreakPoint(11, R.string.tutorial_place_ramp_air, - R.drawable.tutorial_place_ramp_air_1), + inAirTutorial = new Tutorial(gameActivity, + new BreakPoint(11, R.string.tutorial_place_ramp_air, + R.drawable.tutorial_place_ramp_air_1), new BreakPoint(33, R.string.tutorial_place_ramp_air_2, R.drawable.tutorial_place_ramp_air_2)); - Tutorial t51 = new Tutorial(5, 1, - new BreakPoint(BreakPoint.LEVEL_FINISHED_X, R.string.tutorial_leveled_up, -1), - new BreakPoint(BreakPoint.LEVEL_FINISHED_X, R.string.tutorial_to_toolshop, + toToolShopTutorial = new Tutorial(gameActivity, + new BreakPoint(BreakPoint.NONE_X, R.string.tutorial_leveled_up_to_toolshop, R.drawable.tutorial_to_toolshop)); - - gameTutorials = Arrays.asList(t11, t21, t51); - toolShopTutorial = new ToolShopTutorial(gameActivity); + switchToolsTutorial = new Tutorial(gameActivity, + new BreakPoint(0, R.string.tutorial_switch_tools_two_neccessary, -1), + new BreakPoint(0, R.string.tutorial_switch_tools_switch, -1)); + } + + public void update(Level level, float playerProgress) { + if (level.getPackId() == 1 && level.getId() == WELCOME_TUTORIAL_LEVEL && !level + .isFinished()) { + welcomeTutorial.update(playerProgress); + } else if (level.getPackId() == 1 && level.getId() == IN_AIR_TUTORIAL_LEVEL && !level + .isFinished()) { + inAirTutorial.update(playerProgress); + } else if (level.getPackId() == 1 && level.getId() == SWITCH_TOOLS_TUTORIAL_LEVEL && !level + .isFinished()) { + switchToolsTutorial.update(playerProgress); + } + } + + public void onLvUp(User user) { + boolean springUnlockedOnLvUp = user.getLevelUpBounties() + .getLevelToolIsUnlocked(ToolType.SPRING) == user.getLevel(); + if (springUnlockedOnLvUp) { + toToolShopTutorial.showAllBreakPoints(); + } + } + + public void onTopBarUpdate(TopBar topBar) { + toolShopTutorial.onTopBarUpdate(topBar); } public void resetGameTutorials() { - for (Tutorial tutorial : gameTutorials) - tutorial.reset(); + welcomeTutorial.reset(); + inAirTutorial.reset(); + switchToolsTutorial.reset(); } - public Tutorial getGameTutorial(Level level) { - for (Tutorial tutorial : gameTutorials) { - if (tutorial.getLevelPackId() == level.getPackId() && tutorial.getLevelId() == level - .getId()) - return tutorial; - } - return null; + public void resetAllTutorials() { + welcomeTutorial.reset(); + inAirTutorial.reset(); + switchToolsTutorial.reset(); + toToolShopTutorial.reset(); + toolShopTutorial.setFinished(false); } public ToolShopTutorial getToolShopTutorial() { diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java index 289c0dc..b31b31f 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java +++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java @@ -22,6 +22,7 @@ public class TutorialView implements View.OnClickListener { private ImageView imageView; private GameActivity activity; + private int currentBreakPoint = 0; private List breakPoints; public TutorialView(GameActivity activity) { @@ -43,17 +44,18 @@ public class TutorialView implements View.OnClickListener { public void show(List breakPoints) { this.breakPoints = breakPoints; - if(!breakPoints.isEmpty()) - showFirstBreakPoint(); + currentBreakPoint = 0; + if (!breakPoints.isEmpty()) + showCurrentBreakPoint(); } public boolean isShowingTutorial() { return layout.getVisibility() == View.VISIBLE; } - private void showFirstBreakPoint() { - int textId = breakPoints.get(0).getTextId(); - int imageId = breakPoints.get(0).getImageId(); + private void showCurrentBreakPoint() { + int textId = breakPoints.get(currentBreakPoint).getTextId(); + int imageId = breakPoints.get(currentBreakPoint).getImageId(); if (textId == -1) textView.setVisibility(View.INVISIBLE); @@ -72,14 +74,12 @@ public class TutorialView implements View.OnClickListener { @Override public void onClick(View v) { - if(breakPoints.size() == 0) - return; - breakPoints.remove(0); - if (!breakPoints.isEmpty()) { - showFirstBreakPoint(); - } else { + currentBreakPoint++; + if (breakPoints.size() <= currentBreakPoint) { layout.setVisibility(View.GONE); activity.onTutorialViewHidden(); + } else { + showCurrentBreakPoint(); } } } diff --git a/app/src/main/java/de/frajul/endlessroll/user/User.java b/app/src/main/java/de/frajul/endlessroll/user/User.java index f3d4a40..9d3a705 100644 --- a/app/src/main/java/de/frajul/endlessroll/user/User.java +++ b/app/src/main/java/de/frajul/endlessroll/user/User.java @@ -26,9 +26,6 @@ public class User { private LevelUpBounties levelUpBounties; - private int inLevelCollectedStars; - private int inLevelCollectedEnergy; - public User(LvUpListener lvUpListener, int ep, int level, int starCount, int energyCount, ToolSlotSettings toolSlotSettings, PlayerShape playerShape) { this.lvUpListener = lvUpListener; this.ep = ep; @@ -127,14 +124,6 @@ public class User { return levelUpBounties; } - public int getInLevelCollectedEnergy() { - return inLevelCollectedEnergy; - } - - public int getInLevelCollectedStars() { - return inLevelCollectedStars; - } - //CHEAT public void setLevel(int level) { this.level = level; diff --git a/app/src/main/java/de/frajul/endlessroll/views/Countdown.java b/app/src/main/java/de/frajul/endlessroll/views/Countdown.java index 572176d..844e11f 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/Countdown.java +++ b/app/src/main/java/de/frajul/endlessroll/views/Countdown.java @@ -1,6 +1,7 @@ package de.frajul.endlessroll.views; import android.graphics.Typeface; +import android.view.View; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; diff --git a/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java b/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java index 4e84dec..09abf77 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java +++ b/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java @@ -50,6 +50,14 @@ public class GameOverMessage implements View.OnClickListener { layout.setVisibility(View.VISIBLE); } + public boolean isVisible(){ + return layout.getVisibility() == View.VISIBLE; + } + + public void prepareToBeShown(){ + topBar.update(); + } + private void hide() { layout.clearAnimation(); layout.setVisibility(View.GONE); diff --git a/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java b/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java index 018f754..7897359 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java +++ b/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java @@ -12,6 +12,7 @@ import de.frajul.endlessroll.R; import de.frajul.endlessroll.levels.Level; import de.frajul.endlessroll.levels.LevelPack; import de.frajul.endlessroll.main.GameActivity; +import de.frajul.endlessroll.main.GameLog; import de.frajul.endlessroll.main.game.Game; import de.frajul.endlessroll.main.screens.Screen; @@ -52,22 +53,40 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View. toMenu.setOnClickListener(this); } - public void fadeInWithDelay(LevelPack levelPack, final Level level) { + public void fadeInWithDelay(final LevelPack levelPack, final Level level) { this.levelPack = levelPack; - topBar.update(); - restart.init(R.string.goal_message_restart_format_d, level); - boolean nextLevelVisible = !levelPack.isLastLevel(level); - nextLevel.setVisible(nextLevelVisible); - if (nextLevelVisible) - nextLevel - .init(R.string.goal_message_next_level_format_d, levelPack.getNextLevel(level)); - layout.postDelayed(new Runnable() { + GameLog.i("Level: "+level.getId()); + + gameActivity.runOnUiThread(new Runnable() { @Override public void run() { + topBar.update(); + restart.init(R.string.goal_message_restart_format_d, level); + boolean nextLevelVisible = !levelPack.isLastLevel(level); + nextLevel.setVisible(nextLevelVisible); + if (nextLevelVisible) + nextLevel + .init(R.string.goal_message_next_level_format_d, levelPack.getNextLevel(level)); + layout.startAnimation(fadeIn); } - }, 500); + }); + +// layout.postDelayed(new Runnable() { +// @Override +// public void run() { +// +// } +// }, 500); + } + + public boolean isVisible(){ + return layout.getVisibility() == View.VISIBLE; + } + + public void prepareToBeShown(){ + topBar.update(); } private void hide() { diff --git a/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java b/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java index bcd684c..9c0493f 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java +++ b/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java @@ -69,6 +69,14 @@ public class ShortMenu implements View.OnClickListener { topBar.update(); } + public boolean isVisible(){ + return layout.getVisibility() == View.VISIBLE; + } + + public void prepareToBeShown(){ + topBar.update(); + } + private void startRandomAnimation(View view) { float r = random.nextFloat(); if (r >= 0.5) diff --git a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java index 537f22d..04627b5 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java +++ b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java @@ -47,12 +47,12 @@ public class TopBar implements View.OnClickListener { Typeface typeface = gameActivity.getTypeface(); levelDisplay = (TextView) layout.findViewById(R.id.topbar_leveldisplay); - levelDisplay.setTypeface(typeface); +// levelDisplay.setTypeface(typeface); levelProgress = (ProgressBar) layout.findViewById(R.id.topbar_levelprogress); starCount = (TextView) layout.findViewById(R.id.topbar_starcount); - starCount.setTypeface(typeface); +// starCount.setTypeface(typeface); energyCount = (TextView) layout.findViewById(R.id.topbar_energycount); - energyCount.setTypeface(typeface); +// energyCount.setTypeface(typeface); settingsButton = (Button) layout.findViewById(R.id.topbar_settings); settingsButton.setOnClickListener(this); toolshopButton = (Button) layout.findViewById(R.id.topbar_toolshop); @@ -93,7 +93,7 @@ public class TopBar implements View.OnClickListener { starCount.setText(user.getStarCount() + ""); energyCount.setText(user.getEnergyCount() + ""); - gameActivity.getTutorialManager().getToolShopTutorial().onTopBarUpdate(this); + gameActivity.getTutorialManager().onTopBarUpdate(this); } public void startToolShopButtonPulse(){ diff --git a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java index e49edf4..c2d644f 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java +++ b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java @@ -47,7 +47,7 @@ public class ViewManager implements View.OnClickListener { gameActivity.getUser().getToolSlotSettings(), (LinearLayout) layout.findViewById(R.id.game_toolbuttonbar)); shortMenu = new ShortMenu(game, gameActivity, - (LinearLayout) layout.findViewById(R.id.game_shortmenu)); + layout.findViewById(R.id.game_shortmenu)); gameOverMessage = new GameOverMessage(game, gameActivity, layout.findViewById(R.id.game_game_over_message)); goalMessage = new GoalMessage(game, gameActivity, layout.findViewById(R.id.game_goal_message)); @@ -66,6 +66,15 @@ public class ViewManager implements View.OnClickListener { playerSpeedFormat = game.getContext().getString(R.string.game_playerspeed_format_f); } + public void prepareToBeShown(){ + if(shortMenu.isVisible()) + shortMenu.prepareToBeShown(); + if(gameOverMessage.isVisible()) + gameOverMessage.prepareToBeShown(); + if(goalMessage.isVisible()) + goalMessage.prepareToBeShown(); + } + @Override public void onClick(View v) { game.tryToPause(); diff --git a/app/src/main/res/layout/goal_message.xml b/app/src/main/res/layout/goal_message.xml index 3664527..e420e2a 100644 --- a/app/src/main/res/layout/goal_message.xml +++ b/app/src/main/res/layout/goal_message.xml @@ -1,5 +1,5 @@ - - -