From f1b20d97e8a05ecc9376be66b044133494e3e195 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 14 Mar 2017 16:47:46 +0100 Subject: [PATCH] Test-Tutorial screen added --- .idea/gradle.xml | 5 +- .idea/misc.xml | 2 +- app/app.iml | 22 +- app/build.gradle | 2 +- .../debug/android/support/v7/appcompat/R.java | 2492 ++++++++--------- .../com/example/julian/endlessroll/R.java | 84 +- .../assets/debug/levelpacks/Grasslands.xml | 26 +- .../assets/debug/levelpacks/Testcave.xml | 12 +- .../blame/res/debug/multi/values-af.json | 40 +- .../blame/res/debug/multi/values-am.json | 40 +- .../blame/res/debug/multi/values-ar.json | 40 +- .../blame/res/debug/multi/values-az-rAZ.json | 38 +- .../blame/res/debug/multi/values-bg.json | 40 +- .../blame/res/debug/multi/values-bn-rBD.json | 40 +- .../blame/res/debug/multi/values-ca.json | 40 +- .../blame/res/debug/multi/values-cs.json | 40 +- .../blame/res/debug/multi/values-da.json | 40 +- .../blame/res/debug/multi/values-de.json | 40 +- .../blame/res/debug/multi/values-el.json | 40 +- .../blame/res/debug/multi/values-en-rAU.json | 40 +- .../blame/res/debug/multi/values-en-rGB.json | 40 +- .../blame/res/debug/multi/values-en-rIN.json | 40 +- .../blame/res/debug/multi/values-es-rUS.json | 40 +- .../blame/res/debug/multi/values-es.json | 40 +- .../blame/res/debug/multi/values-et-rEE.json | 40 +- .../blame/res/debug/multi/values-eu-rES.json | 40 +- .../blame/res/debug/multi/values-fa.json | 40 +- .../blame/res/debug/multi/values-fi.json | 40 +- .../blame/res/debug/multi/values-fr-rCA.json | 40 +- .../blame/res/debug/multi/values-fr.json | 40 +- .../blame/res/debug/multi/values-gl-rES.json | 40 +- .../blame/res/debug/multi/values-gu-rIN.json | 40 +- .../res/debug/multi/values-h320dp-v13.json | 2 +- .../res/debug/multi/values-h720dp-v13.json | 2 +- .../blame/res/debug/multi/values-hdpi-v4.json | 2 +- .../blame/res/debug/multi/values-hi.json | 40 +- .../blame/res/debug/multi/values-hr.json | 40 +- .../blame/res/debug/multi/values-hu.json | 40 +- .../blame/res/debug/multi/values-hy-rAM.json | 40 +- .../blame/res/debug/multi/values-in.json | 40 +- .../blame/res/debug/multi/values-is-rIS.json | 40 +- .../blame/res/debug/multi/values-it.json | 40 +- .../blame/res/debug/multi/values-iw.json | 40 +- .../blame/res/debug/multi/values-ja.json | 40 +- .../blame/res/debug/multi/values-ka-rGE.json | 40 +- .../blame/res/debug/multi/values-kk-rKZ.json | 40 +- .../blame/res/debug/multi/values-km-rKH.json | 40 +- .../blame/res/debug/multi/values-kn-rIN.json | 40 +- .../blame/res/debug/multi/values-ko.json | 40 +- .../blame/res/debug/multi/values-ky-rKG.json | 40 +- .../blame/res/debug/multi/values-land.json | 12 +- .../res/debug/multi/values-large-v4.json | 26 +- .../res/debug/multi/values-ldltr-v21.json | 2 +- .../res/debug/multi/values-ldrtl-v23.json | 2 +- .../blame/res/debug/multi/values-lo-rLA.json | 40 +- .../blame/res/debug/multi/values-lt.json | 40 +- .../blame/res/debug/multi/values-lv.json | 40 +- .../blame/res/debug/multi/values-mk-rMK.json | 36 +- .../blame/res/debug/multi/values-ml-rIN.json | 40 +- .../blame/res/debug/multi/values-mn-rMN.json | 40 +- .../blame/res/debug/multi/values-mr-rIN.json | 40 +- .../blame/res/debug/multi/values-ms-rMY.json | 40 +- .../blame/res/debug/multi/values-my-rMM.json | 40 +- .../blame/res/debug/multi/values-nb.json | 40 +- .../blame/res/debug/multi/values-ne-rNP.json | 40 +- .../blame/res/debug/multi/values-nl.json | 40 +- .../blame/res/debug/multi/values-pa-rIN.json | 40 +- .../blame/res/debug/multi/values-pl.json | 40 +- .../blame/res/debug/multi/values-port.json | 2 +- .../blame/res/debug/multi/values-pt-rBR.json | 40 +- .../blame/res/debug/multi/values-pt-rPT.json | 40 +- .../blame/res/debug/multi/values-pt.json | 40 +- .../blame/res/debug/multi/values-ro.json | 40 +- .../blame/res/debug/multi/values-ru.json | 40 +- .../blame/res/debug/multi/values-si-rLK.json | 40 +- .../blame/res/debug/multi/values-sk.json | 40 +- .../blame/res/debug/multi/values-sl.json | 40 +- .../blame/res/debug/multi/values-sq-rAL.json | 40 +- .../blame/res/debug/multi/values-sr.json | 40 +- .../blame/res/debug/multi/values-sv.json | 40 +- .../blame/res/debug/multi/values-sw.json | 40 +- .../res/debug/multi/values-sw600dp-v13.json | 16 +- .../blame/res/debug/multi/values-ta-rIN.json | 40 +- .../blame/res/debug/multi/values-te-rIN.json | 40 +- .../blame/res/debug/multi/values-th.json | 40 +- .../blame/res/debug/multi/values-tl.json | 40 +- .../blame/res/debug/multi/values-tr.json | 40 +- .../blame/res/debug/multi/values-uk.json | 40 +- .../blame/res/debug/multi/values-ur-rPK.json | 40 +- .../blame/res/debug/multi/values-uz-rUZ.json | 38 +- .../blame/res/debug/multi/values-v11.json | 34 +- .../blame/res/debug/multi/values-v12.json | 8 +- .../blame/res/debug/multi/values-v14.json | 20 +- .../blame/res/debug/multi/values-v17.json | 28 +- .../blame/res/debug/multi/values-v18.json | 2 +- .../blame/res/debug/multi/values-v21.json | 170 +- .../blame/res/debug/multi/values-v22.json | 8 +- .../blame/res/debug/multi/values-v23.json | 12 +- .../blame/res/debug/multi/values-vi.json | 40 +- .../res/debug/multi/values-w360dp-v13.json | 2 +- .../res/debug/multi/values-w480dp-v13.json | 4 +- .../res/debug/multi/values-w500dp-v13.json | 2 +- .../res/debug/multi/values-w600dp-v13.json | 4 +- .../res/debug/multi/values-w720dp-v13.json | 2 +- .../debug/multi/values-xlarge-land-v4.json | 2 +- .../res/debug/multi/values-xlarge-v4.json | 18 +- .../blame/res/debug/multi/values-zh-rCN.json | 40 +- .../blame/res/debug/multi/values-zh-rHK.json | 40 +- .../blame/res/debug/multi/values-zh-rTW.json | 40 +- .../blame/res/debug/multi/values-zu.json | 40 +- .../blame/res/debug/multi/values.json | 942 +++---- .../blame/res/debug/single/anim.json | 20 +- .../blame/res/debug/single/color-v11.json | 4 +- .../blame/res/debug/single/color-v23.json | 2 +- .../blame/res/debug/single/color.json | 18 +- .../blame/res/debug/single/drawable-v21.json | 4 +- .../blame/res/debug/single/drawable-v23.json | 2 +- .../blame/res/debug/single/drawable.json | 52 +- .../blame/res/debug/single/layout.json | 88 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugResources/merger.xml | 22 +- .../res/merged/debug/drawable/ramp.png | Bin 5161 -> 5024 bytes .../res/merged/debug/drawable/rampbutton.png | Bin 48757 -> 47711 bytes .../res/merged/debug/layout/test.xml | 12 - .../res/resources-debug-androidTest.ap_ | Bin 774 -> 774 bytes .../intermediates/res/resources-debug.ap_ | Bin 2311311 -> 2267307 bytes app/build/intermediates/symbols/debug/R.txt | 84 +- .../logs/manifest-merger-debug-report.txt | 8 +- app/src/main/assets/levelpacks/Grasslands.xml | 26 +- app/src/main/assets/levelpacks/Testcave.xml | 12 +- .../assets/particleEffects/collectEnergy.pe | 144 + .../endlessroll/entities/DestroyEffect.java | 4 +- .../entities/particles/ParticleSystem.java | 4 +- .../julian/endlessroll/main/DataSafer.java | 2 +- .../endlessroll/main/DataStorageHandler.java | 4 +- .../julian/endlessroll/main/GameActivity.java | 22 +- .../julian/endlessroll/main/GameHandler.java | 5 + .../julian/endlessroll/main/game/Game.java | 27 +- .../endlessroll/main/game/GameScene.java | 2 +- .../endlessroll/main/screens/GameScreen.java | 11 + .../endlessroll/main/screens/StartScreen.java | 2 +- .../main/screens/ToolShopScreen.java | 6 +- .../endlessroll/main/tutorial/BreakPoint.java | 29 + .../endlessroll/main/tutorial/Tutorial.java | 39 + .../main/tutorial/TutorialView.java | 48 + .../julian/endlessroll/user/LevelBounty.java | 59 + .../levelup => user}/LevelUpBounties.java | 2 +- .../tools => user}/ToolSlotSettings.java | 6 +- .../endlessroll/{main/game => user}/User.java | 7 +- .../endlessroll/views/LevelupMessage.java | 7 +- .../endlessroll/views/ToolButtonBar.java | 2 +- .../julian/endlessroll/views/TopBarData.java | 2 +- .../xml_tutorial_speechbubble_background.xml | 15 + app/src/main/res/layout/test.xml | 12 - app/src/main/res/layout/tutorial_test.xml | 20 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- particlelab/build.gradle | 2 +- particlelab/particlelab.iml | 8 - 159 files changed, 4155 insertions(+), 3779 deletions(-) delete mode 100644 app/build/intermediates/res/merged/debug/layout/test.xml create mode 100644 app/src/main/assets/particleEffects/collectEnergy.pe create mode 100644 app/src/main/java/com/example/julian/endlessroll/main/tutorial/BreakPoint.java create mode 100644 app/src/main/java/com/example/julian/endlessroll/main/tutorial/Tutorial.java create mode 100644 app/src/main/java/com/example/julian/endlessroll/main/tutorial/TutorialView.java create mode 100644 app/src/main/java/com/example/julian/endlessroll/user/LevelBounty.java rename app/src/main/java/com/example/julian/endlessroll/{levels/levelup => user}/LevelUpBounties.java (96%) rename app/src/main/java/com/example/julian/endlessroll/{entities/tools => user}/ToolSlotSettings.java (86%) rename app/src/main/java/com/example/julian/endlessroll/{main/game => user}/User.java (90%) create mode 100644 app/src/main/res/drawable/xml_tutorial_speechbubble_background.xml delete mode 100644 app/src/main/res/layout/test.xml create mode 100644 app/src/main/res/layout/tutorial_test.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f002ae9..d9b681d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,10 +3,9 @@ - + diff --git a/app/app.iml b/app/app.iml index 7e28fff..8ef3d7f 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,7 +9,6 @@