diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index fdd9863..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -EndlessRoll \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 719bb8b..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d9b681d..1fc6312 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,12 +5,11 @@ @@ -24,7 +25,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 17628fd..d4b9daa 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..7d33780 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/EndlessRoll.iml b/EndlessRoll.iml index 83fe3ee..41dfb1a 100644 --- a/EndlessRoll.iml +++ b/EndlessRoll.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 45f2ec0..9e622aa 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -111,6 +111,7 @@ + @@ -121,7 +122,6 @@ - diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index b701472..7b9e05a 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index ab9947a..fe4f7bd 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -#ffffffff#ff9e9e9e#1f000000#8a000000 +"999+"#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -16,13 +16,13 @@ "999+""999+""999 +""999+""999+"#ff424242#ffffffff#b3ffffff127">999""999+""999+""999+"">999""999+""больш за 999""९९९+""999+""999+""999+"">999""999+""999+""999+""၉၉၉+""999+""999+"">999""999+""999+""999+""999+""999+""999+""˃999""999+""999+""+999""999+""۹۹۹+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""999+""+999""999+""+999""999+""999+""999+""999+""৯৯৯+""999+""999+"4dp"999+"">999"false"999+"">999""999+""999+"">999""999+""999+""+999""999+""999+""999+""999+""999+""999+""999+""999+"">999""999+""‎999+‎""999+""999+""‎999+‎"#ff424242#ffffffff#b3ffffff127"मुख्यपृष्ठ पर नेविगेट करें""%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%192dip40px"Zur Startseite""%1$s: %2$s""%1$s, %2$s: %3$s""Nach oben""Weitere Optionen""Fertig""Alle ansehen""App auswählen""Aus""An""Suchen…""Suchanfrage löschen""Suchanfrage""Suchen""Suchanfrage senden""Sprachsuche""Freigeben für""Freigeben für %s""Minimieren""999+""Перейти на главный экран""%1$s, %2$s""%1$s, %2$s, %3$s""Перейти вверх""Другие параметры""Готово""Показать все""Выбрать приложение""ОТКЛ.""ВКЛ.""Поиск""Удалить запрос""Поисковый запрос""Поиск""Отправить запрос""Голосовой поиск""Открыть доступ""Открыть доступ пользователю %s""Свернуть"">999""Pārvietoties uz sākuma ekrānu""%1$s: %2$s""%1$s, %2$s: %3$s""Pārvietoties augšup""Vairāk opciju""Gatavs""Skatīt visu""Izvēlieties lietotni""IZSLĒGTS""IESLĒGTS""Meklējiet…""Notīrīt vaicājumu""Meklēšanas vaicājums""Meklēt""Iesniegt vaicājumu""Meklēšana ar balsi""Kopīgot ar:""Kopīgot ar %s""Sakļaut""999+"truetrue440dp60%90%60%90%55%80%192dip4"ගෙදරට සංචාලනය කරන්න""%1$s, %2$s""%1$s, %2$s, %3$s""ඉහලට සංචාලනය කරන්න""තවත් විකල්ප""අවසාන වූ""සියල්ල බලන්න""යෙදුමක් තෝරන්න""ක්‍රියාවිරහිතයි""ක්‍රියාත්මකයි""සොයන්න...""විමසුම හිස් කරන්න""සෙවුම් විමසුම""සෙවීම""විමසුම යොමු කරන්න""හඬ සෙවීම""සමඟ බෙදාගන්න""%s සමඟ බෙදාගන්න""හකුළන්න""999+""Navigați la ecranul de pornire""%1$s, %2$s""%1$s, %2$s, %3$s""Navigați în sus""Mai multe opțiuni""Terminat""Afișați-le pe toate""Alegeți o aplicație""DEZACTIVAȚI""ACTIVAȚI""Căutați…""Ștergeți interogarea""Interogare de căutare""Căutați""Trimiteți interogarea""Căutare vocală""Trimiteți la""Trimiteți la %s""Restrângeți""˃999" + World zer0 Grasslands Icy Mountains Testcave - Setze die Bombe auf ein HindernisDrück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNeustart: Level %dNächstes Level: %dNächste Welt:\n%sLÄDT...WeiterBeendenSpielenErste Welt abschließen!Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neuer Look und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetze die Rampe vor die Lückevon FrajulTESTERMUSIKMusikFps anzeigenIch bin blauWarum bin ich blau? + Setze die Bombe auf ein HindernisDrück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNeustart: Level %dNächstes Level: %dNächste Welt:\n%sLÄDT...WeiterBeendenSpielenErste Welt abschließen!Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neuer Look und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetze die Rampe vor die Lückevon FrajulTESTERMUSIKMusikFps anzeigenIch bin blauWarum bin ich blau? diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index a2fab00..5554e90 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index 8ff1d3f..a2ca818 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,196 +1,196 @@ -- Merging decision tree log --- manifest -ADDED 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 -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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:17:1-24:12 -MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:17:1-25:12 -MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:17:1-24:12 -MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:17:1-36:12 -MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:2:1-9:12 -MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:17:1-28:12 -MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:17:1-31:12 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:17:1-28:12 -MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:17:1-31:12 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:17:1-31:12 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:17:1-31:12 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:17:1-31:12 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:17:1-31:12 -MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:17:1-30: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 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:17:1-24:12 +MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:17:1-25:12 +MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:17:1-24:12 +MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:17:1-36:12 +MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:2:1-9:12 +MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:17:1-28:12 +MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:17:1-31:12 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:17:1-28:12 +MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:17:1-31:12 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:17:1-31:12 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:17:1-31:12 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:17:1-31:12 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:17:1-31:12 +MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:17:1-30:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 package - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:3:5-36 - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:3:5-36 + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml android:versionName - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - ADDED 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 + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml android:versionCode - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - ADDED 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 + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12 + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml xmlns:android - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:11-69 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:11-69 uses-feature#0x00020000 -ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:5:5-7:35 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:5:5-7:35 android:glEsVersion - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:6:9-41 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:6:9-41 android:required - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32 + ADDED from /mnt/FE6CC35E6CC31077/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\d874715e6054e786cbcfdf9c2b37e7ce\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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20 -MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:22:5-20 -MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:22:5-20 -MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:26:5-34:19 -MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:26:5-34:19 -MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:7:5-20 -MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:7:5-20 -MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:22:5-26:19 -MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:22:5-26:19 -MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:22:5-26:19 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:22:5-26:19 -MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:22:5-20 -MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:22:5-20 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:25:5-29:19 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:25:5-29:19 -MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:24:5-28:19 -MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:24:5-28:19 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:5-26:19 +MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:22:5-20 +MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:22:5-20 +MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:22:5-20 +MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:26:5-34:19 +MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:26:5-34:19 +MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:7:5-20 +MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:7:5-20 +MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:22:5-26:19 +MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:22:5-26:19 +MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:22:5-26:19 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:22:5-26:19 +MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:22:5-20 +MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:25:5-29:19 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:25:5-29:19 +MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:24:5-28:19 +MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:24:5-28:19 android:supportsRtl - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:13:9-35 android:label - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:12:9-41 android:icon - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:11:9-43 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:11:9-43 android:allowBackup - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:10:9-35 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:10:9-35 android:theme - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:14:9-40 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:14:9-40 activity#de.frajul.endlessroll.main.GameActivity -ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:16:9-25:20 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:16:9-25:20 android:screenOrientation - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:19:13-50 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:19:13-50 android:configChanges - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:18:13-74 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:18:13-74 android:name - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:17:13-46 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:17:13-46 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:20:13-24:29 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:20:13-24:29 action#android.intent.action.MAIN -ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:17-69 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:17-69 android:name - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:25-66 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:17-77 +ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:17-77 android:name - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:27-74 + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:27-74 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\d874715e6054e786cbcfdf9c2b37e7ce\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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43 -MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:21:5-23:62 -MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:21:5-23:62 -MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:5:5-44 -MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:5:5-44 -MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:21:5-23:54 -MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:21:5-23:54 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:20:5-44 -MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:21:5-23:63 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:21:5-23:63 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:21:5-23:60 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:21:5-23:60 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:21:5-23:61 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:21:5-23:61 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:21:5-23:58 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:21:5-23:58 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:21:5-23:58 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:21:5-23:58 -MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:20:5-22:41 -MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:20:5-22:41 -INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml -INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml +MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:20:5-43 +MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:21:5-23:62 +MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:21:5-23:62 +MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:5:5-44 +MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:5:5-44 +MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:21:5-23:54 +MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:21:5-23:54 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:20:5-44 +MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:21:5-23:63 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:21:5-23:63 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:21:5-23:60 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:21:5-23:60 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:21:5-23:61 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:21:5-23:61 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:21:5-23:58 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:21:5-23:58 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:21:5-23:58 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:21:5-23:58 +MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:20:5-22:41 +MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:20:5-22:41 +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml +INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml tools:overrideLibrary - ADDED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:23:9-59 + ADDED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:23:9-59 android:targetSdkVersion - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml + INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml uses-permission#android.permission.INTERNET -ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:23:5-67 +ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:23:5-67 android:name - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:23:22-64 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:23:22-64 uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:24:5-79 +ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:24:5-79 android:name - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:24:22-76 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:24:22-76 activity#com.google.android.gms.ads.AdActivity -ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:29:9-33:64 +ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:29:9-33:64 android:exported - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:32:13-37 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:32:13-37 android:configChanges - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:31:13-122 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:31:13-122 android:theme - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:33:13-61 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:33:13-61 android:name - ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:30:13-65 + ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:30:13-65 meta-data#com.google.android.gms.version -ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:23:9-25:69 +ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:23:9-25:69 android:value - ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:25:13-66 + ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:25:13-66 android:name - ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:24:13-58 + ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:24:13-58 meta-data#android.support.VERSION -ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:23:9-25:38 -MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:23:9-25:38 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:26:9-28:38 -MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:26:9-28:38 +ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:23:9-25:38 +MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:23:9-25:38 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:26:9-28:38 +MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:26:9-28:38 android:value - ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:28:13-35 + ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:28:13-35 android:name - ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:27:13-51 + ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:27:13-51 meta-data#android.arch.lifecycle.VERSION -ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:25:9-27:47 +ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:25:9-27:47 android:value - ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:27:13-44 + ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:27:13-44 android:name - ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:26:13-58 + ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:26:13-58 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 6f660a1..30565bc 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java +++ b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java @@ -8,6 +8,7 @@ import android.content.res.Configuration; import android.graphics.Typeface; import android.os.Bundle; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.Window; import android.view.WindowManager; import android.widget.RelativeLayout; diff --git a/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java b/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java index 179be6a..283a907 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java +++ b/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java @@ -2,8 +2,8 @@ package de.frajul.endlessroll.main; import android.content.Context; import android.opengl.GLSurfaceView; +import android.view.MotionEvent; -import de.frajul.endlessroll.rendering.Rendering; import de.frajul.endlessroll.rendering.renderer.GameRenderer; /** @@ -13,20 +13,21 @@ public class MyGlSurfaceView extends GLSurfaceView { private GameRenderer renderer; - public MyGlSurfaceView(Context context, GameRenderer gameRenderer) throws Exception { + public MyGlSurfaceView(Context context, GameRenderer gameRenderer) { super(context); this.renderer = gameRenderer; super.setEGLContextClientVersion(2); super.setRenderer(renderer); } - public void addRendering(Rendering rendering) { - renderer.addRendering(rendering); + public GameRenderer getRenderer() { + return renderer; } - public void setCurrentRendering(Rendering currentRendering) { - super.setOnTouchListener(currentRendering); - renderer.setCurrentRendering(currentRendering); + @Override + public boolean onTouchEvent(MotionEvent event) { + renderer.getCurrentRendering().onTouch(event.getX(), event.getY()); + return true; } @Override 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 155ca35..333a45d 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 @@ -1,8 +1,5 @@ package de.frajul.endlessroll.main.game; -import android.view.MotionEvent; -import android.view.View; - import java.util.ArrayList; import java.util.List; @@ -32,6 +29,7 @@ import de.frajul.endlessroll.main.physics.Physics; import de.frajul.endlessroll.main.screens.GameScreen; import de.frajul.endlessroll.main.screens.Screen; import de.frajul.endlessroll.rendering.Rendering; +import de.frajul.endlessroll.rendering.renderer.GameRenderer; import de.frajul.endlessroll.sqlDatabase.MyDatabase; import de.frajul.endlessroll.views.ViewManager; @@ -61,8 +59,8 @@ public class Game extends Rendering { private List collectedStars = new ArrayList<>(); private boolean energyCollected; - public Game(GameHandler handler, GameScreen gameScreen, GameActivity gameActivity) throws Exception { - super(gameActivity); + public Game(GameHandler handler, GameScreen gameScreen, GameActivity gameActivity, GameRenderer gameRenderer) throws Exception { + super(gameActivity, gameRenderer); this.handler = handler; this.gameActivity = gameActivity; physics = new Physics(); @@ -131,15 +129,10 @@ public class Game extends Rendering { gameState = GameState.RUNNING; } - @Override - public void setScreenSize(int width, int height) { - Vector screenSize = new Vector(width, height); - scene.setScreenSize(screenSize); - } - @Override public void update() { try { + GameLog.i("FrameTimeMilliseconds: " + timer.getFrameTimeMilliseconds()); particleSystem.update(timer); if (scene == null || player == null) return; @@ -175,10 +168,10 @@ public class Game extends Rendering { } @Override - public boolean onTouch(View v, MotionEvent event) { + public void onTouch(float x, float y) { try { - if (gameState == GameState.RUNNING && event.getAction() == MotionEvent.ACTION_DOWN) { - Vector touchPoint = scene.calcWorldFromScreenCoords(event.getX(), event.getY()); + if (gameState == GameState.RUNNING) { + Vector touchPoint = scene.calcWorldFromScreenCoords(x, y); for (ToolButton toolButton : toolButtonBar.getToolButtons()) { ToolType toolType = toolButton.getToolType(); @@ -186,7 +179,7 @@ public class Game extends Rendering { toolButton.getBorder()) && toolType != null) { toolButtonBar.setActive(toolType); setCurrentTool(toolType, toolButton.hasFinishedLoading()); - return true; + return; } } touchPoint.translate(scene.camera.getX(), scene.camera.getY()); @@ -196,26 +189,23 @@ public class Game extends Rendering { if (currentTool == ToolType.BOMB) { Obstacle selectedObstacle = scene.getObstacleAtPoint(touchPoint); if (selectedObstacle == null) { - viewManager.showBombErrorMessage(event.getX(), event.getY()); - return true; + viewManager.showBombErrorMessage(x, y); + return; } else { currentToolButton.setProgress(0); scene.getBombSelected().set(false); Tool tool = addTool(touchPoint); if (tool != null && tool instanceof Bomb) ((Bomb) tool).setAttachedObstacle(selectedObstacle); - return true; + return; } } currentToolButton.setProgress(0); addTool(touchPoint); - return true; } } - return false; } catch (Exception e) { onException(e); - return false; } } @@ -370,7 +360,6 @@ public class Game extends Rendering { } } - @Override public void onException(Exception e) { handler.onException(e); } diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java b/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java index 51b1af0..542e132 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java +++ b/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import de.frajul.endlessroll.data.Vector; import de.frajul.endlessroll.entities.AnimatedEntity; @@ -23,7 +24,6 @@ import de.frajul.endlessroll.entities.tileLists.Terrain; import de.frajul.endlessroll.entities.tools.Tool; import de.frajul.endlessroll.levels.worlds.World; import de.frajul.endlessroll.main.GameActivity; -import de.frajul.endlessroll.main.GameLog; /** * Created by Julian on 20.07.2016. @@ -36,8 +36,8 @@ public abstract class Scene { private GameActivity gameActivity; protected Camera camera; - private Vector screenSize; private Entity playerArrow; + private AtomicInteger screenWidth, screenHeight; protected ParticleSystem particleSystem; protected TexturePack textures; @@ -66,6 +66,8 @@ public abstract class Scene { ceiling = new Ceiling(World.GRASSLANDS.getTerrainTexture()); player = new Player(); bombSelected = new AtomicBoolean(false); + screenWidth = new AtomicInteger(); + screenHeight = new AtomicInteger(); } public void setTexturePack(TexturePack texturePack) { @@ -153,16 +155,17 @@ public abstract class Scene { } protected Vector calcWorldFromScreenCoords(float screenX, float screenY) throws Exception { - if (screenSize == null) + if (screenWidth.get() == 0 || screenHeight.get() == 0) throw new Exception("ScreenSize not set"); - float glCoordWidth = (2f * screenSize.x / screenSize.y); - float x = ((screenX / screenSize.x) * 2f - 1f) * glCoordWidth / 2; - float y = -((screenY / screenSize.y) * 2f - 1f); + float glCoordWidth = (2f * screenWidth.get() / (float) screenHeight.get()); + float x = ((screenX / (float) screenWidth.get()) * 2f - 1f) * glCoordWidth / 2; + float y = -((screenY / (float) screenHeight.get()) * 2f - 1f); return new Vector(x, y); } - public void setScreenSize(Vector screenSize) { - this.screenSize = screenSize; + public void setScreenSize(int width, int height) { + this.screenWidth.set(width); + this.screenHeight.set(height); } public synchronized Background getBackground() { diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java index 2045e45..00dc32b 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java @@ -5,17 +5,18 @@ import android.view.ViewGroup; import de.frajul.endlessroll.main.GameActivity; import de.frajul.endlessroll.main.MyGlSurfaceView; +import de.frajul.endlessroll.rendering.renderer.GameRenderer; /** * Created by Julian on 30.07.2016. */ public abstract class GLScreen extends Screen { - protected MyGlSurfaceView glView; + protected GameRenderer gameRenderer; public GLScreen(ScreenType type, GameActivity gameActivity, @LayoutRes int layoutId, MyGlSurfaceView glView) { super(type, gameActivity, layoutId); - this.glView = glView; + this.gameRenderer = glView.getRenderer(); } } diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java index 2cd8490..02d56b9 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java @@ -17,15 +17,14 @@ public class GLTestScreen extends GLScreen { public GLTestScreen(GameActivity gameActivity, MyGlSurfaceView glView) throws Exception{ super(ScreenType.GL_TEST, gameActivity, R.layout.gl_test_screen, glView); - rendering = new TestScreenRendering(gameActivity); - glView.addRendering(rendering); + rendering = new TestScreenRendering(gameActivity, gameRenderer); } @Override public void prepareToBeShown() { gameActivity.getSoundManager().menuMusic.start(); - glView.setCurrentRendering(rendering); + gameRenderer.setCurrentRendering(rendering); } @Override 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 56e3882..3168174 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 @@ -24,15 +24,14 @@ public class GameScreen extends GLScreen { public GameScreen(GameActivity gameActivity, MyGlSurfaceView glSurfaceView) throws Exception { super(ScreenType.GAME, gameActivity, R.layout.game, glSurfaceView); - game = new Game(gameViewHandler, this, gameActivity); - glView.addRendering(game); + game = new Game(gameViewHandler, this, gameActivity, gameRenderer); } @Override public void prepareToBeShown() { gameActivity.getSoundManager().menuMusic.stop(); - glView.setCurrentRendering(game); + gameRenderer.setCurrentRendering(game); game.getViewManager().prepareToBeShown(); } @@ -77,7 +76,7 @@ public class GameScreen extends GLScreen { @Override public void toScreen(ScreenType screen) { - glView.setCurrentRendering(null); + gameRenderer.setCurrentRendering(null); gameActivity.flipToScreen(screen); } diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java index fc958fc..252473b 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java @@ -45,8 +45,7 @@ public class StartScreen extends GLScreen implements View.OnClic confirmDialog = new ConfirmDialog(gameActivity, this); - rendering = new StartScreenRendering(gameActivity); - glView.addRendering(rendering); + rendering = new StartScreenRendering(gameActivity, gameRenderer); } private Button createButton(@IdRes int id, Typeface typeface) { @@ -62,7 +61,7 @@ public class StartScreen extends GLScreen implements View.OnClic ((StartScene) rendering.getScene()).randomizeWorld(); ((StartScene) rendering.getScene()).loadTexturesForCurrentWorld(); - glView.setCurrentRendering(rendering); + gameRenderer.setCurrentRendering(rendering); } @Override @@ -74,7 +73,7 @@ public class StartScreen extends GLScreen implements View.OnClic public void onClick(View v) { if (v.equals(play)) { gameActivity.flipToScreen(ScreenType.WORLDS); - glView.setCurrentRendering(null); + gameRenderer.setCurrentRendering(null); } else if (v.equals(gain90EP)) { gameActivity.getUser().gainEp(90, true); } else if (v.equals(unlockLevels)) { diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java index 36fb03b..fef5111 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java @@ -10,6 +10,7 @@ import de.frajul.endlessroll.main.GameLog; import de.frajul.endlessroll.main.game.StartScene; import de.frajul.endlessroll.main.game.Timer; import de.frajul.endlessroll.rendering.Rendering; +import de.frajul.endlessroll.rendering.renderer.GameRenderer; /** * Created by Julian on 20.07.2016. @@ -20,8 +21,8 @@ public class StartScreenRendering extends Rendering { private Timer timer; private ParticleSystem particleSystem; - public StartScreenRendering(GameActivity gameActivity) throws Exception { - super(gameActivity); + public StartScreenRendering(GameActivity gameActivity, GameRenderer gameRenderer) throws Exception { + super(gameActivity, gameRenderer); this.gameActivity = gameActivity; this.particleSystem = new ParticleSystem(gameActivity); } @@ -49,8 +50,6 @@ public class StartScreenRendering extends Rendering { } @Override - public boolean onTouch(View v, MotionEvent event) { - return false; + public void onTouch(float x, float y) { } - } diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java b/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java index 8ded0e3..0b31141 100644 --- a/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java +++ b/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java @@ -10,6 +10,7 @@ import de.frajul.endlessroll.main.GameLog; import de.frajul.endlessroll.main.game.TestScreenScene; import de.frajul.endlessroll.main.game.Timer; import de.frajul.endlessroll.rendering.Rendering; +import de.frajul.endlessroll.rendering.renderer.GameRenderer; /** * Created by Julian on 20.07.2016. @@ -20,8 +21,8 @@ public class TestScreenRendering extends Rendering { private Timer timer; private ParticleSystem particleSystem; - public TestScreenRendering(GameActivity gameActivity) throws Exception{ - super(gameActivity); + public TestScreenRendering(GameActivity gameActivity, GameRenderer gameRenderer) throws Exception{ + super(gameActivity, gameRenderer); this.gameActivity = gameActivity; particleSystem = new ParticleSystem(gameActivity); } @@ -51,8 +52,7 @@ public class TestScreenRendering extends Rendering { } @Override - public boolean onTouch(View v, MotionEvent event) { - return false; + public void onTouch(float x, float y) { } } 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 5b3afbb..4e3593d 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 @@ -58,7 +58,7 @@ public class TutorialView implements View.OnClickListener { int imageId = breakPoints.get(currentBreakPoint).getImageId(); if (textId == -1) - textView.setVisibility(View.INVISIBLE); + textView.setVisibility(View.GONE); else { textView.setVisibility(View.VISIBLE); textView.setText(textId); diff --git a/app/src/main/java/de/frajul/endlessroll/rendering/Rendering.java b/app/src/main/java/de/frajul/endlessroll/rendering/Rendering.java index eaefeac..a1a2622 100644 --- a/app/src/main/java/de/frajul/endlessroll/rendering/Rendering.java +++ b/app/src/main/java/de/frajul/endlessroll/rendering/Rendering.java @@ -3,23 +3,24 @@ package de.frajul.endlessroll.rendering; import android.content.Context; import android.view.View; -import de.frajul.endlessroll.data.Vector; import de.frajul.endlessroll.entities.textures.TexturePack; import de.frajul.endlessroll.main.GameActivity; import de.frajul.endlessroll.main.game.Scene; import de.frajul.endlessroll.main.game.Timer; +import de.frajul.endlessroll.rendering.renderer.GameRenderer; /** * Created by Julian on 26.11.2015. */ -public abstract class Rendering implements View.OnTouchListener { +public abstract class Rendering { protected S scene; private GameActivity gameActivity; private boolean alreadyInitiated = false; - public Rendering(GameActivity gameActivity) { + public Rendering(GameActivity gameActivity, GameRenderer gameRenderer) { this.gameActivity = gameActivity; + gameRenderer.addRenderTarget(this); } public void initiate(TexturePack texturePack, Timer timer) { @@ -31,13 +32,11 @@ public abstract class Rendering implements View.OnTouchListener public abstract void update(); - public void onException(Exception e) { - gameActivity.onException(e); - } + public abstract void onTouch(float x, float y); public void setScreenSize(int width, int height) { if (scene != null) - scene.setScreenSize(new Vector(width, height)); + scene.setScreenSize(width, height); } public Scene getScene() { diff --git a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java index f8db0fb..2fcd726 100644 --- a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java +++ b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java @@ -50,7 +50,6 @@ public class GameRenderer implements GLSurfaceView.Renderer { private TerrainShader terrainShader; private SimpleShader simpleShader; private GuiShader guiShader; - private TexturePack texturePack; private Timer timer; @@ -61,14 +60,18 @@ public class GameRenderer implements GLSurfaceView.Renderer { particleRenderer = new ParticleRenderer(activity, quad, matrixCreator); } - public void addRendering(Rendering rendering) { - renderTargets.add(rendering); + public void addRenderTarget(Rendering renderTarget){ + renderTargets.add(renderTarget); } - public synchronized void setCurrentRendering(Rendering currentRendering) { + public void setCurrentRendering(Rendering currentRendering) { this.currentRendering = currentRendering; } + public Rendering getCurrentRendering() { + return currentRendering; + } + @Override public void onSurfaceCreated(GL10 gl, EGLConfig config) { GameLog.d("onSurfaceCreated"); @@ -77,7 +80,7 @@ public class GameRenderer implements GLSurfaceView.Renderer { gl.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA); try { - particleRenderer.createContext(); + particleRenderer.createShader(); entityShader = new EntityShader(activity); obstacleShader = new ObstacleShader(activity); terrainShader = new TerrainShader(activity); @@ -86,12 +89,10 @@ public class GameRenderer implements GLSurfaceView.Renderer { texturePack = new TexturePack(activity); timer = new Timer(); } catch (Exception e) { - for (Rendering rendering : renderTargets) - rendering.onException(e); - } - for (Rendering rendering : renderTargets) { - rendering.initiate(texturePack, timer); + activity.onException(e); } + for(Rendering renderTarget : renderTargets) + renderTarget.initiate(texturePack, timer); } @Override @@ -100,8 +101,8 @@ public class GameRenderer implements GLSurfaceView.Renderer { particleRenderer.createFbo(width, height); GLES20.glViewport(0, 0, width, height); matrixCreator.setMVPMSize(width, height); - for (Rendering rendering : renderTargets) - rendering.setScreenSize(width, height); + for(Rendering renderTarget : renderTargets) + renderTarget.setScreenSize(width, height); activity.onSurfaceChanged(); } diff --git a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/ParticleRenderer.java b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/ParticleRenderer.java index 313ae1b..81b6e07 100644 --- a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/ParticleRenderer.java +++ b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/ParticleRenderer.java @@ -33,7 +33,7 @@ public class ParticleRenderer { this.matrixCreator = matrixCreator; } - public void createContext() throws Exception { + public void createShader() throws Exception { particleShader = new ParticleShader(context); } diff --git a/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java b/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java index a7c0ba6..36477d4 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java +++ b/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java @@ -47,7 +47,7 @@ public class GoalMessageLevelButton implements View.OnClickListener { } public void setVisible(boolean visible) { - layout.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); + layout.setVisibility(visible ? View.VISIBLE : View.GONE); } public void init(@StringRes int textId, Level level) { 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 bcf3b72..74d1f1e 100644 --- a/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java +++ b/app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java @@ -63,7 +63,7 @@ public class ShortMenu implements View.OnClickListener { } public void setVisible(boolean visible) { - layout.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); + layout.setVisibility(visible ? View.VISIBLE : View.GONE); if (visible) topBar.update(); } diff --git a/app/src/main/res/layout/game.xml b/app/src/main/res/layout/game.xml index 4cafba7..ffdaf0e 100644 --- a/app/src/main/res/layout/game.xml +++ b/app/src/main/res/layout/game.xml @@ -1,8 +1,7 @@ + android:layout_height="match_parent"> + android:visibility="gone"/> + android:visibility="gone"/> + android:visibility="gone"/> \ No newline at end of file diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml index f89d79c..0e82328 100644 --- a/app/src/main/res/layout/topbar.xml +++ b/app/src/main/res/layout/topbar.xml @@ -132,7 +132,7 @@ android:layout_centerVertical="true" android:text="@string/placeholder_number" android:textSize="20sp" - android:visibility="invisible"/> + android:visibility="gone"/> + android:visibility="gone"/> \ No newline at end of file diff --git a/particlelab/particlelab.iml b/particlelab/particlelab.iml index f8d3fae..9ba53bb 100644 --- a/particlelab/particlelab.iml +++ b/particlelab/particlelab.iml @@ -1,5 +1,5 @@ - + @@ -49,13 +49,6 @@ - - - - - - - @@ -63,6 +56,13 @@ + + + + + + + @@ -70,13 +70,6 @@ - - - - - - - @@ -84,6 +77,13 @@ + + + + + + +