From a327ea6b8234cddf7cb8d9afe4cd5d14fdcf5e61 Mon Sep 17 00:00:00 2001 From: "julian.mutter@comumail.de" Date: Thu, 3 Oct 2019 10:32:55 +0200 Subject: [PATCH] Updated Android Studio --- .idea/assetWizardSettings.xml | 85 ---------- .idea/caches/build_file_checksums.ser | Bin 795 -> 588 bytes .idea/caches/gradle_models.ser | Bin 0 -> 145598 bytes .idea/codeStyles/Project.xml | 29 ---- .idea/copyright/Frajul.xml | 6 - .idea/copyright/profiles_settings.xml | 7 - .idea/dictionaries/julian.xml | 3 - .idea/encodings.xml | 4 + .idea/gradle.xml | 10 +- .idea/misc.xml | 28 +--- .idea/modules.xml | 6 +- .idea/vcs.xml | 3 +- EndlessRoll.iml | 2 +- app/app.iml | 190 +++++++++++----------- app/build.gradle | 1 - app/src/main/assets/fontBaron.fnt | 197 +++++++++++++++++++++++ app/src/main/assets/fontBaron.png | Bin 0 -> 17295 bytes app/src/main/res/values/colors.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 11 +- particlelab/build.gradle | 1 - particlelab/particlelab.iml | 48 +++--- 22 files changed, 346 insertions(+), 289 deletions(-) delete mode 100644 .idea/assetWizardSettings.xml create mode 100644 .idea/caches/gradle_models.ser delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/copyright/Frajul.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/dictionaries/julian.xml create mode 100644 .idea/encodings.xml create mode 100644 app/src/main/assets/fontBaron.fnt create mode 100644 app/src/main/assets/fontBaron.png diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index dc9da39..0000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 493155b3dc0898a684b9184f2922a933c75c72f3..f573ee24c862e9996331b297838ce502b8dc67b4 100644 GIT binary patch delta 134 zcmbQuc7|obbk^)In^sJmIOjB@#N=H}N|x!~8hzRSCvb@EJ^i^Nca}m415Z+EW=@J; zdQoCZPHJf(LmdMf0|SGA5jXGZ8BN6oJ#~hDd(HQ_Prl5kKlvS#j$R3aKw?3GK6YKf Vf+=>N&71X4e{YGp6Chhy0RWPHF<1Zq delta 338 zcmX@ZGMjC}bk@`jhmw~}oO8N9P(L@XMBmNT%-Px46igZ#n49Z|7N-^!>wA^vWG3e6 zJLaVnKND< z7#IW&PD?zrN1OF}xL32nvc?DAB@6;N`N@endId%K1*t_PnW@E-uQAHFg;K>0lNFhy zBHY~Lr)Z0Je&KMBKD6YgReA|SEOiXeU{n&A-gCC9ZDwP$kmL`^DU+YcPX55C$5;UX DzTA3} diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000000000000000000000000000000000000..55d01c848b1f5e415be53a5b6f97e57694a4764a GIT binary patch literal 145598 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 - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/Frajul.xml b/.idea/copyright/Frajul.xml deleted file mode 100644 index c1af2ac..0000000 --- a/.idea/copyright/Frajul.xml +++ /dev/null @@ -1,6 +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 aaa3154..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/julian.xml b/.idea/dictionaries/julian.xml deleted file mode 100644 index 4a52e94..0000000 --- a/.idea/dictionaries/julian.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1fc6312..2996d53 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,15 +3,11 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 99ed2ed..5569847 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,29 +1,9 @@ - - - + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index d4b9daa..17628fd 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 7d33780..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ - - + \ No newline at end of file diff --git a/EndlessRoll.iml b/EndlessRoll.iml index 41dfb1a..83fe3ee 100644 --- a/EndlessRoll.iml +++ b/EndlessRoll.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 80bd210..8a31656 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -8,82 +8,81 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112,13 +111,6 @@ - - - - - - - @@ -126,13 +118,26 @@ + + + + + + + + + + + + + @@ -141,11 +146,16 @@ + + + + + @@ -164,28 +174,28 @@ - - - + + - - + - - - - - + + + + + + + - - - + + + + + - - - - - + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1d73df9..78b6839 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,6 @@ android { signingConfigs { } compileSdkVersion 26 - buildToolsVersion '27.0.3' defaultConfig { applicationId 'de.frajul.endlessroll' minSdkVersion 14 diff --git a/app/src/main/assets/fontBaron.fnt b/app/src/main/assets/fontBaron.fnt new file mode 100644 index 0000000..27d535b --- /dev/null +++ b/app/src/main/assets/fontBaron.fnt @@ -0,0 +1,197 @@ +info face="fontBaron" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0 +common lineHeight=17 base=12 scaleW=505 scaleH=60 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="fontBaron.png" +chars count=192 +char id=0 x=2 y=2 width=5 height=11 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0 +char id=33 x=416 y=21 width=3 height=12 xoffset=-1 yoffset=0 xadvance=4 page=0 chnl=0 +char id=34 x=311 y=50 width=5 height=4 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0 +char id=35 x=35 y=36 width=10 height=12 xoffset=-1 yoffset=0 xadvance=10 page=0 chnl=0 +char id=36 x=70 y=2 width=8 height=16 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=37 x=142 y=21 width=13 height=13 xoffset=-1 yoffset=0 xadvance=14 page=0 chnl=0 +char id=38 x=47 y=36 width=9 height=12 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=39 x=287 y=50 width=2 height=5 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0 +char id=40 x=31 y=2 width=5 height=16 xoffset=-1 yoffset=0 xadvance=6 page=0 chnl=0 +char id=41 x=58 y=2 width=4 height=16 xoffset=0 yoffset=0 xadvance=6 page=0 chnl=0 +char id=42 x=218 y=50 width=5 height=6 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=43 x=446 y=36 width=9 height=9 xoffset=-1 yoffset=3 xadvance=10 page=0 chnl=0 +char id=44 x=225 y=50 width=3 height=6 xoffset=0 yoffset=9 xadvance=4 page=0 chnl=0 +char id=45 x=339 y=50 width=6 height=2 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0 +char id=46 x=354 y=50 width=2 height=2 xoffset=-1 yoffset=10 xadvance=3 page=0 chnl=0 +char id=47 x=491 y=21 width=6 height=12 xoffset=-1 yoffset=0 xadvance=6 page=0 chnl=0 +char id=48 x=314 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=49 x=410 y=36 width=3 height=11 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=0 +char id=50 x=399 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=51 x=389 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=52 x=378 y=36 width=9 height=11 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=53 x=394 y=21 width=9 height=12 xoffset=-1 yoffset=0 xadvance=10 page=0 chnl=0 +char id=54 x=405 y=21 width=9 height=12 xoffset=-1 yoffset=0 xadvance=10 page=0 chnl=0 +char id=55 x=345 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=56 x=334 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=57 x=324 y=36 width=8 height=11 xoffset=0 yoffset=1 xadvance=10 page=0 chnl=0 +char id=58 x=502 y=36 width=2 height=8 xoffset=0 yoffset=4 xadvance=4 page=0 chnl=0 +char id=59 x=251 y=36 width=3 height=11 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0 +char id=60 x=490 y=36 width=10 height=9 xoffset=-1 yoffset=3 xadvance=10 page=0 chnl=0 +char id=61 x=276 y=50 width=9 height=5 xoffset=-1 yoffset=6 xadvance=10 page=0 chnl=0 +char id=62 x=479 y=36 width=9 height=9 xoffset=-1 yoffset=3 xadvance=10 page=0 chnl=0 +char id=63 x=291 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=64 x=0 y=36 width=13 height=12 xoffset=-1 yoffset=0 xadvance=14 page=0 chnl=0 +char id=65 x=58 y=36 width=12 height=11 xoffset=-1 yoffset=1 xadvance=12 page=0 chnl=0 +char id=66 x=72 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=67 x=468 y=2 width=10 height=13 xoffset=-1 yoffset=0 xadvance=11 page=0 chnl=0 +char id=68 x=83 y=36 width=9 height=11 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=69 x=178 y=21 width=9 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=70 x=189 y=21 width=9 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=71 x=115 y=36 width=12 height=11 xoffset=-1 yoffset=1 xadvance=12 page=0 chnl=0 +char id=72 x=200 y=21 width=10 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=73 x=212 y=21 width=3 height=12 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=0 +char id=74 x=141 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=75 x=217 y=21 width=9 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=76 x=228 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=77 x=238 y=21 width=12 height=12 xoffset=-1 yoffset=0 xadvance=13 page=0 chnl=0 +char id=78 x=480 y=2 width=10 height=13 xoffset=-1 yoffset=0 xadvance=11 page=0 chnl=0 +char id=79 x=151 y=36 width=11 height=11 xoffset=-1 yoffset=1 xadvance=12 page=0 chnl=0 +char id=80 x=164 y=36 width=9 height=11 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=81 x=252 y=21 width=12 height=12 xoffset=0 yoffset=1 xadvance=14 page=0 chnl=0 +char id=82 x=266 y=21 width=10 height=12 xoffset=0 yoffset=1 xadvance=12 page=0 chnl=0 +char id=83 x=175 y=36 width=10 height=11 xoffset=-1 yoffset=1 xadvance=11 page=0 chnl=0 +char id=84 x=198 y=36 width=9 height=11 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=85 x=239 y=36 width=10 height=11 xoffset=-1 yoffset=1 xadvance=11 page=0 chnl=0 +char id=86 x=492 y=2 width=11 height=13 xoffset=-1 yoffset=0 xadvance=11 page=0 chnl=0 +char id=87 x=299 y=21 width=12 height=12 xoffset=-1 yoffset=0 xadvance=13 page=0 chnl=0 +char id=88 x=313 y=21 width=9 height=12 xoffset=0 yoffset=0 xadvance=11 page=0 chnl=0 +char id=89 x=256 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=90 x=267 y=36 width=10 height=11 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=91 x=229 y=2 width=5 height=15 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0 +char id=92 x=15 y=36 width=7 height=12 xoffset=-1 yoffset=0 xadvance=8 page=0 chnl=0 +char id=93 x=64 y=2 width=4 height=16 xoffset=-1 yoffset=0 xadvance=5 page=0 chnl=0 +char id=94 x=98 y=50 width=7 height=8 xoffset=0 yoffset=0 xadvance=9 page=0 chnl=0 +char id=95 x=358 y=50 width=10 height=2 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0 +char id=96 x=270 y=50 width=4 height=5 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0 +char id=97 x=162 y=50 width=8 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=98 x=0 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=99 x=152 y=50 width=8 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=100 x=10 y=21 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=101 x=142 y=50 width=8 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=102 x=334 y=21 width=6 height=12 xoffset=-1 yoffset=0 xadvance=6 page=0 chnl=0 +char id=103 x=342 y=21 width=10 height=12 xoffset=-1 yoffset=3 xadvance=10 page=0 chnl=0 +char id=104 x=28 y=21 width=8 height=13 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=105 x=301 y=36 width=2 height=11 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0 +char id=106 x=375 y=2 width=3 height=14 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0 +char id=107 x=38 y=21 width=8 height=13 xoffset=0 yoffset=0 xadvance=9 page=0 chnl=0 +char id=108 x=80 y=21 width=3 height=13 xoffset=-1 yoffset=-1 xadvance=3 page=0 chnl=0 +char id=109 x=54 y=50 width=12 height=9 xoffset=-1 yoffset=4 xadvance=13 page=0 chnl=0 +char id=110 x=44 y=50 width=8 height=9 xoffset=-1 yoffset=3 xadvance=9 page=0 chnl=0 +char id=111 x=131 y=50 width=9 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=112 x=374 y=21 width=8 height=12 xoffset=-1 yoffset=3 xadvance=9 page=0 chnl=0 +char id=113 x=356 y=36 width=10 height=11 xoffset=-1 yoffset=4 xadvance=11 page=0 chnl=0 +char id=114 x=0 y=50 width=7 height=9 xoffset=-1 yoffset=3 xadvance=7 page=0 chnl=0 +char id=115 x=107 y=50 width=9 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=116 x=85 y=21 width=5 height=13 xoffset=-1 yoffset=0 xadvance=5 page=0 chnl=0 +char id=117 x=77 y=50 width=8 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=118 x=457 y=36 width=9 height=9 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=119 x=118 y=50 width=11 height=8 xoffset=-1 yoffset=4 xadvance=12 page=0 chnl=0 +char id=120 x=68 y=50 width=7 height=9 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0 +char id=121 x=384 y=21 width=8 height=12 xoffset=-1 yoffset=3 xadvance=9 page=0 chnl=0 +char id=122 x=87 y=50 width=9 height=8 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=123 x=392 y=2 width=5 height=14 xoffset=0 yoffset=1 xadvance=7 page=0 chnl=0 +char id=124 x=243 y=2 width=2 height=15 xoffset=-1 yoffset=-1 xadvance=3 page=0 chnl=0 +char id=125 x=236 y=2 width=5 height=15 xoffset=0 yoffset=0 xadvance=6 page=0 chnl=0 +char id=126 x=291 y=50 width=10 height=4 xoffset=-1 yoffset=6 xadvance=10 page=0 chnl=0 +char id=161 x=157 y=21 width=2 height=13 xoffset=0 yoffset=-1 xadvance=4 page=0 chnl=0 +char id=162 x=470 y=21 width=8 height=12 xoffset=0 yoffset=0 xadvance=10 page=0 chnl=0 +char id=163 x=187 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=164 x=24 y=50 width=9 height=9 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=165 x=443 y=21 width=9 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=166 x=247 y=2 width=3 height=15 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0 +char id=167 x=305 y=36 width=7 height=11 xoffset=0 yoffset=1 xadvance=9 page=0 chnl=0 +char id=168 x=347 y=50 width=5 height=2 xoffset=1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=169 x=434 y=36 width=10 height=10 xoffset=-1 yoffset=-1 xadvance=11 page=0 chnl=0 +char id=170 x=180 y=50 width=7 height=7 xoffset=-1 yoffset=-2 xadvance=8 page=0 chnl=0 +char id=171 x=200 y=50 width=8 height=7 xoffset=0 yoffset=4 xadvance=9 page=0 chnl=0 +char id=172 x=303 y=50 width=6 height=4 xoffset=1 yoffset=6 xadvance=10 page=0 chnl=0 +char id=173 x=329 y=50 width=8 height=2 xoffset=0 yoffset=8 xadvance=10 page=0 chnl=0 +char id=174 x=422 y=36 width=10 height=10 xoffset=-1 yoffset=-1 xadvance=11 page=0 chnl=0 +char id=175 x=370 y=50 width=8 height=2 xoffset=0 yoffset=-3 xadvance=10 page=0 chnl=0 +char id=176 x=210 y=50 width=6 height=7 xoffset=-1 yoffset=-2 xadvance=7 page=0 chnl=0 +char id=177 x=35 y=50 width=7 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0 +char id=178 x=253 y=50 width=4 height=6 xoffset=0 yoffset=-3 xadvance=6 page=0 chnl=0 +char id=179 x=240 y=50 width=4 height=6 xoffset=0 yoffset=-2 xadvance=6 page=0 chnl=0 +char id=180 x=318 y=50 width=5 height=4 xoffset=1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=181 x=278 y=21 width=9 height=12 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=0 +char id=182 x=399 y=2 width=9 height=14 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=183 x=325 y=50 width=2 height=2 xoffset=-1 yoffset=5 xadvance=3 page=0 chnl=0 +char id=184 x=264 y=50 width=4 height=6 xoffset=-1 yoffset=10 xadvance=6 page=0 chnl=0 +char id=185 x=259 y=50 width=3 height=6 xoffset=0 yoffset=-3 xadvance=5 page=0 chnl=0 +char id=186 x=246 y=50 width=5 height=6 xoffset=0 yoffset=-2 xadvance=7 page=0 chnl=0 +char id=187 x=230 y=50 width=8 height=6 xoffset=0 yoffset=5 xadvance=9 page=0 chnl=0 +char id=188 x=80 y=2 width=6 height=16 xoffset=1 yoffset=-1 xadvance=10 page=0 chnl=0 +char id=189 x=252 y=2 width=6 height=15 xoffset=1 yoffset=-1 xadvance=10 page=0 chnl=0 +char id=190 x=260 y=2 width=7 height=15 xoffset=0 yoffset=0 xadvance=10 page=0 chnl=0 +char id=191 x=219 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=192 x=88 y=2 width=12 height=16 xoffset=-1 yoffset=-4 xadvance=12 page=0 chnl=0 +char id=193 x=102 y=2 width=12 height=16 xoffset=-1 yoffset=-4 xadvance=12 page=0 chnl=0 +char id=194 x=116 y=2 width=12 height=16 xoffset=-1 yoffset=-4 xadvance=12 page=0 chnl=0 +char id=195 x=269 y=2 width=12 height=15 xoffset=0 yoffset=-3 xadvance=13 page=0 chnl=0 +char id=196 x=410 y=2 width=12 height=14 xoffset=0 yoffset=-2 xadvance=13 page=0 chnl=0 +char id=197 x=130 y=2 width=12 height=16 xoffset=0 yoffset=-4 xadvance=13 page=0 chnl=0 +char id=198 x=431 y=21 width=10 height=12 xoffset=-1 yoffset=1 xadvance=10 page=0 chnl=0 +char id=199 x=283 y=2 width=10 height=15 xoffset=-1 yoffset=0 xadvance=11 page=0 chnl=0 +char id=200 x=9 y=2 width=9 height=17 xoffset=0 yoffset=-4 xadvance=11 page=0 chnl=0 +char id=201 x=20 y=2 width=9 height=17 xoffset=0 yoffset=-4 xadvance=11 page=0 chnl=0 +char id=202 x=144 y=2 width=9 height=16 xoffset=0 yoffset=-3 xadvance=11 page=0 chnl=0 +char id=203 x=433 y=2 width=9 height=14 xoffset=0 yoffset=-1 xadvance=11 page=0 chnl=0 +char id=204 x=155 y=2 width=4 height=16 xoffset=0 yoffset=-4 xadvance=5 page=0 chnl=0 +char id=205 x=161 y=2 width=4 height=16 xoffset=0 yoffset=-4 xadvance=5 page=0 chnl=0 +char id=206 x=295 y=2 width=5 height=15 xoffset=0 yoffset=-3 xadvance=7 page=0 chnl=0 +char id=207 x=21 y=21 width=5 height=13 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=208 x=279 y=36 width=10 height=11 xoffset=-2 yoffset=1 xadvance=10 page=0 chnl=0 +char id=209 x=167 y=2 width=10 height=16 xoffset=-1 yoffset=-3 xadvance=11 page=0 chnl=0 +char id=210 x=179 y=2 width=11 height=16 xoffset=-1 yoffset=-4 xadvance=12 page=0 chnl=0 +char id=211 x=192 y=2 width=11 height=16 xoffset=-1 yoffset=-4 xadvance=12 page=0 chnl=0 +char id=212 x=302 y=2 width=11 height=15 xoffset=-1 yoffset=-3 xadvance=12 page=0 chnl=0 +char id=213 x=315 y=2 width=11 height=15 xoffset=-1 yoffset=-3 xadvance=12 page=0 chnl=0 +char id=214 x=444 y=2 width=11 height=14 xoffset=-1 yoffset=-2 xadvance=12 page=0 chnl=0 +char id=215 x=172 y=50 width=6 height=7 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0 +char id=216 x=328 y=2 width=12 height=15 xoffset=-1 yoffset=-1 xadvance=13 page=0 chnl=0 +char id=217 x=205 y=2 width=10 height=16 xoffset=-1 yoffset=-4 xadvance=11 page=0 chnl=0 +char id=218 x=217 y=2 width=10 height=16 xoffset=-1 yoffset=-4 xadvance=11 page=0 chnl=0 +char id=219 x=342 y=2 width=10 height=15 xoffset=-1 yoffset=-3 xadvance=11 page=0 chnl=0 +char id=220 x=380 y=2 width=10 height=14 xoffset=-1 yoffset=-2 xadvance=11 page=0 chnl=0 +char id=221 x=354 y=2 width=9 height=15 xoffset=-1 yoffset=-3 xadvance=10 page=0 chnl=0 +char id=222 x=365 y=2 width=8 height=15 xoffset=0 yoffset=-2 xadvance=11 page=0 chnl=0 +char id=223 x=364 y=21 width=8 height=12 xoffset=0 yoffset=1 xadvance=11 page=0 chnl=0 +char id=224 x=122 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=225 x=59 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=226 x=289 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=227 x=324 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=228 x=368 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=229 x=132 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=230 x=9 y=50 width=13 height=9 xoffset=-1 yoffset=3 xadvance=13 page=0 chnl=0 +char id=231 x=94 y=36 width=8 height=11 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=232 x=161 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=233 x=102 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=234 x=460 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=235 x=209 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=236 x=454 y=21 width=4 height=12 xoffset=-1 yoffset=0 xadvance=3 page=0 chnl=0 +char id=237 x=171 y=21 width=5 height=13 xoffset=-1 yoffset=-1 xadvance=4 page=0 chnl=0 +char id=238 x=499 y=21 width=6 height=11 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0 +char id=239 x=415 y=36 width=5 height=10 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0 +char id=240 x=457 y=2 width=9 height=14 xoffset=-1 yoffset=1 xadvance=16 page=0 chnl=0 +char id=241 x=354 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=242 x=48 y=21 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=243 x=69 y=21 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=244 x=480 y=21 width=9 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=245 x=24 y=36 width=9 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=246 x=104 y=36 width=9 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=247 x=189 y=50 width=9 height=7 xoffset=-1 yoffset=3 xadvance=9 page=0 chnl=0 +char id=248 x=468 y=36 width=9 height=9 xoffset=-1 yoffset=4 xadvance=9 page=0 chnl=0 +char id=249 x=112 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=250 x=92 y=21 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=251 x=421 y=21 width=8 height=12 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=252 x=229 y=36 width=8 height=11 xoffset=-1 yoffset=1 xadvance=9 page=0 chnl=0 +char id=253 x=48 y=2 width=8 height=16 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0 +char id=254 x=38 y=2 width=8 height=16 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0 +char id=255 x=424 y=2 width=7 height=14 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0 +char id=8364 x=129 y=36 width=10 height=11 xoffset=-2 yoffset=1 xadvance=9 page=0 chnl=0 +kernings count=0 diff --git a/app/src/main/assets/fontBaron.png b/app/src/main/assets/fontBaron.png new file mode 100644 index 0000000000000000000000000000000000000000..b7415d1f5fc7d978e07f8bc738d8b7a9e64daf5f GIT binary patch literal 17295 zcmV*BKyJT@P)`002A)1^@s6W#q$G002W)Nkl z3;b@?nE0QQ({V&6B}tN#YSbV~a>;NKk;@+?Ld;=|ON^1*xQrYILvBL}xuy9xrWCo$ zZB9nhzcFZXDUnW*6eY3V z|K5`3y4K!k%1Wl}1Z2wY(p-Bs&puI7PwDqexqX^HKW?t8yWa1p_mJi~t)tvQ&2>_9 zZPQcF5zY0b=KA5lem$nSKHpq7R=mf&p4nV$D!zA4bKSGK-q&0&D17hM&Gn<^y1cpW z-CQ@gvYR!3)^^mfQ*&J!+^7B9N<02FeK;ufvJ9T zXJN|n6a3c!Yi5nUV>NjY+)mclIx6`^b3Int#Zd}pG}jlK>us6m|I=L0a1Fhtxo%bQ z4SnyY&Gl4inW+Mk_ixSh7eV>oNsCB)|HCo~wBeNIx>@F%+ey19OW+6663^R8+rJuk zQFFbaxwa}SPoF@{yGh%}U8NnHK7eV#q#@qll7Ptv08{vGbA46X#mFLuY5&rcVPU+s zxjquS|Fq`%K>D_YziF=bHrLOkoxhh!i$hyTVqg+5*aX|9GTU^N$pH+5c{;hTptSwD zg|us;2Hq$wqj^y9jB&c1wBu+6n+Hp~j_xWgE?Hpgu4=B$)9=Np4i6>xO5L|_u49|) zEtxV98yMFSslL6W9p~G0)C)8IthCHET2GIV5na(azE0Y)LZFxs@)|&Zhd`f}+Q1mx zNxBIk%>0AR^(<-U7<^}q+`8kPF8G+Vg2kc1GsfrL&GjZ}*AjESuNXnZ0qgEv(&Bbh zhIRd)sh&Pq((&wGJ-;o$4<0EaCadrt=70Lf96dgj&B4AszdbMpi`~85gK{`%?=;sJGG!U_Q>EpnHxHg4-CX}*et*5W{?J_e%jA5+pRSP6nquyME$teQ z)&c+?-%`?C4K>%pG%k>KL7i7n9wG=)Iw#Mi6#6gC zwYRj4OM!u6z>w6?`Ye-YvQB8Ohe$iP5U}f|U9hh-<*sb5J2ux(3flLT=E6d9nY7G0 zH&Grym^VvHv`ZKkZtS`03rn;+QXEg50^-b zJLj1D5Lm|jjzPUEq!rB2v=AC#5N}P-U_M=A0p2|_?=JjgjCM<9KA*nbH^$8U z@zT!AwLy9NJ=W=qrJYB{ig|g6E6+F2l9pM2Al-xEo-VCGlmmp%yQS~#+tYSv2G$I4 zXn}hMasI8eb9T$%UFHaU1;-grET-qBe&vKGXbTJ+MsnBSIp4Zx=G_eed=C}UD|MFf zGIpDEjNgiLoahN=c%hf?S zi{p&pUrM_c;8_Q_vOKqfCw0N&9-F@50ouU&UN4LdW%5WhNF6Y&+xC%;;rY@^Sve^ZiTdNswbb3GT`*m5H8@{d?Evipb2kK8wNww=RJ0R`7sgXUkQE>_ zduF~J0R(@Aw3--ziSSd>j!z$88bf+SV*GaD_qK4qBkdod1AO>~w1So511{Ven0$Q~~0Bgt^ z8j9k#Z|V#49tjVOb&2&;`$Aix?ag06RqG!mX7bQFtAI`wc!&9>kHG_I)exJU z#)V{bp|p#^15z`B#Qy33>(lQ;Tzx9(u_%s}JRs@g6WgWZdlsmd$x`Njt>jIB*LQq3 zf{#{~|Ch@0w9}8pS1R5IQF8>w1Gw;4<~Iu#NfNgXrcg`Nk$^3O2XYJq_+qN>q2?X^ z%L2tryH8L1UeWX1!{aK;1B`bm;f08-H>V8%2+i*b%0;F^g+6@6#q!qzB{{8G-;( z(9<*DRPesxKHyt9ANx=V_NMS2 z^QKymdM|fxV-Wr!1l*Uup`&~sunzjH1pt->FSsgn;VZy+Ac(AyNn$>fVAoi#6mV-G z)O!XmGK^Rcc_-IyESlg1F(R*a&uW<|zjM}=#WKlo7EkzOvp&EMJY`&9vZ|@$Mza0fv8P@OrIsW=7x?^NC9U?Zb+FS3_wPq5>g@v* z9bCD%bi3jZR!GasER!ep;K{yVDU+`u7d}kHGbJzBX&K$8-K9;} z5bQ;navKtc%$tA5{zh}hJdft8O3M&8L zK6x7BbXEH6$84SC>4*khLgQiP_^_=7i?M>)v6IKU6-t9`J=nG^>S!BUH~isirfltY zT@TDPF*mI7^E=A1^$sg2g3Obo4Gf)FtEH1xL&$5&(jW#Tw?#sc!TVplhVCUjh5H6| z5_$il!uDw!uSoyH+%8 z@Qvu}zBVC<;)1XQm3d{3aeLsJA@9O_+nigbMew%;-{=D9E~a!JoqYbv!#dXR1|ab>)uhi1K6VtAp9_E`@B zFLZ!-m`aeU@P*G8LAlL7gpxB<*;g#4vkXJ8whYQO3f)bOcO% zvoChu<> zL#!e-LYB7#=j!u)&h?MAVzZZ`5W?tlI1ZFpv*2fJmBVtG!!3ei|6STOh0q`F3R=(P z7c5v1r6yFUA>_40ACou>C&%Q`^4G~|&>8IeWXdYC1pv$a&8yV*z z+HU6FT5#YeFxVfuvcz&RhPg3&wv7DywDp&na%>$Z(bF3;&*>K_kg?tzDH*<3o0Q@;jOk@K8+HzKrI{xG?YRh=Td}RL;7M5)06!!8g>MurU1}ZSN#tx+HiN zoXZKHx&8V8nchy6RuS<6D%?)cHmRGi*U6#J3V}NCZE!|#$K(WMCv!#sI1%Llh zCfDMtWpYbp4)|_vD=u*meYELRiId{2hf*eAL&%2^eYAcwL~=>n#i#W!h|~J=@NGR# z;#~N&nJiSR+fo+%;14d;$I{%*`-+%N#cr z;jbm&LkK=*bc9L-PZ)>|o?~DC&pYZkr*>T^lgWzagJ3fr z_z@ALeQ;nY3?bIF?{E(W5A(3hOB0rKDIK-Uv=pM;1rg9j7{C+UeHa!D5n2V)Ql<#q zU_M?N)WvwMlGY{py`VjoHr`$)Axh2_0Xukd+d@~T??*tp?@&-b09|KmAOY0mrm%bv z;g)&xV}^A}abAPVvxicZ!iFvnlrs4mLOz7(la+{k(?~@}rF$9xRs&s<9@@i)WO7lm z5I}AvrnU9bPu*gXBZwu3UQquQrhS{@y`hA=MvAV1oGFX>APEHo)Dy~$LHL1M0$yAG z;Ph>9%LW;OuWTiJs!W0=oKk=YMW#NsL$OPQ-3p9lB)n1=>++2~_2xc;Rk97cyW0{R3-$RM7Tq%K=W*kn5=oJo}*kD{yZsNQ62Ut0>FgXah?cv@80rM z{#Xg{a!O)d^A2NBy^~`KW@_Q6=w>QA?KZ6${Fy)vldmy{6qW6gz?x?u@p0J#`8vXV zg}HB4+&`nI+_VHSl9K-z-|LgKv(S_!UE@R!{*L>7RgMw5jY#-`+B5w{EcIVmtFJIyN!-Ugt?)LA%sXIT6@b*oWeBLD{+SbN9wh7Mt%jl=gp$ zasUS}u)T?(MB)wJP%}me2p;>T`v&_M7Qc0&_&b8Tm8b5|rbN0RkZ}PUQ(6We(mbqa;~# zw4-_Nc2l;cq}2{an4no=EY5J{z&G5Ni_$yn zpy7z^wXR$)S(VU0Yzm!ZaT=ux$ucL^~5?c~QDod-@?kaO69P60g|cNfzkiB~Kj4plD+m zqGNMmM1K*yOTZx+R^Wp=~*FC;K!p} z8Rpm~U13)Qxy+v-qeM>NuB9<6q+N^8lS%k#YNJhw${4Wsow*=M*PEpsE9UthTwkCE ztPzwXA9PE$RF;ILI{*;PY4m8DbAI+OzxR+|Y{zYD&A zWB(-W5#2VyjR*R-L*|(R@n_^*c}e;_`=naQHFpywM{Oe{Diq$_)$1ttoqr;ovtuO0+=aPX`&#ptwc=qp#+|I%{m z%DEI?orCwni0Q(%L0Es9-oMD)uQ~ltGx(h?{g6A# zSli-(@raJi^?(%tLXH4p+gvIf(q9-ngn-2yF?q(3-7E;<%H(M?`66`tnun`X`H4Wt z1m5Duetoo#?*wIG`aVM<%pKhDiI>o!69g7ycKMPS%F zz2gBP1Ux2zl08Z7A5%Mg&T|+!YaM0^@nxLAe=n$Mf-WyWD$sZE`6;Q*)Wa?v1WZp8 z5hNIQEE(i0M^k4l!I*b*Wf8te>#PDA>&|bfQ>6`Dw9E^E0NSiVWa&}eT8{7BXv+8H z!dRTX2LmDzS?O8#Fg%1C6h;&W^0Kqll7uw6wwQnBPmiD0w&)y3!O{ql$ECUz$hWcF zl>-OCEpWi+NT4kUHOvch%JJJUdiaE0AK*D@+xL_4{4ofNc6}l6p-4aruza&s6nw_g zc1q9(fcZxmvO)~w!untg81FgSs}na(v|KL9hZ4K_WbiC_1}#cx1F*=ETp6&=EI`s~ z3rKZcTjKx*69$I#T}tRnp|lO9f>vA`f|FLU>6PCx8ARmwwG+)9+=x}*&daF`i5HFVFdej5e|4tfT+OxpGL zSsBMs9jC4w6uG_gIbi;89^8i^cg5&q`M<=qZ(NclTjDQTo>-%{LKVZzFLcA!Xh=2F&e; zW#qmPb02u9yARXa+Wf9Ls=GER8Nv#hFiJq}34|yJ?~~D(!1Okk@%82FE1|_$2EZ3g z{NM#zJY(?5pe&XYc8PgwfIkrsE5cU6`zROhP384G7r^ISfL2=fHR~y|{8@kw{ zV507Dgt$4J*pPvDUBnKdVx_c6IhZ(*42@tP$?r*}(d5*=ch5KPRMz)dN&~ zQYskAX70E8`u#y4x^FALl~>io-~y!Z1; zDi`^7Hw`iT7gz%*AqP&Hvyy_>?>OOo2Lw9Mye;jMmJ$bio^- zJys#Yz%kY6bEp8yFyd;&gCRL<;%xW)?mMATg)-;Dn5~hmvg875_ zBQ2}%Y>jJ2Oxep>vsZz+7=gEduN zlzt5jnIU34tKFXD*#-4ex|;O(+zFVg+(MjLQ2{HbY;1|ZtkJcBJKGo***x9`^)6O zfTRo@COJ9)uQsMp#W} z>dnAxm7@PAWZDjn9FyKd!;A#C(zXCy_{jV$lh$H`e_bs^^gUc?C z9#rYuB0Z0+y$VN2i#yCM77`6q^L?IRmZq%{ER|N!P+%-0AgEz-Aq zjFhc!?0a24MI<7-2y#*6Kk2BW7JO$JBz%~Mr{DOcU**cw4pPYiuB~&vz<#q7nM&&e zN{QD2sT|*0*ip^{n!9R9d|OS(XyYF-<#PUg4}9PDHMj7zj#Bg3G$!l$0<0VOkYNHo zdb$Sm^gNi?f2Dg6-P1GWyH4H1uMS~;j+6&U5v7dzU9AWTSXICqG(#A}4l;7l{I{!v zxx_X;v_QPgkgAk{43nt`7$ z@ZT&!rqcRq2SzH4peeGI!HK!kL3|uY&m^|7yTiR4Btr0+2 z4=__K0ch^Hksy2sbMNeUPq&7_Xs(bEv%hnCM(j!7zGnsI1K&6}W0eB7_h5w~W(PWh zP|VgQgb%;nPc1pomPU)is*yfWVvTL3v|95cWpXWHVcJVZ76+^yXvA-pae=+GEn2pO zIe9k+=4#?~hA?^DFPa13Nv00kmNVg&x>AM$G{iC%#it0Dp`D&SU=1iasSseM*_(S9zG@%d-Y5I{)OW0TTYKqFj?(u z&JDM%#6gU9H^R?le0Nbqmuc4*JHEwpb&sEr%1{?B=_NAmKI1n6Vt80u0(iD{d#;}_ zD#f3AS^B+QD)?`%0we^a$CG8m2tU>F!3c6^gwxSWTscovK;+-Mdo_bpx`1oy?1E^) zlp=5`GS$>q(swPlPb#OxqiY{J%oT=Y7cbf=K2jL>_33vGO8c5ycnUQqB}RLdBUmHj znZ*1vAL$<*n;Vr=KpV9_Qu<4fBmP1kG{>G>E5*aitk45NgNWL#HPL!w3=fiSK;wO( z`CeBa0H3n=QfY;<5}?lnq><>vn_z$Fe&gEcO67}?;R9pI63Ny&?_z@);9f$Y(b$ig zwjj8knP~?AP4&ru6kg$e=Y%MKAG5ztFcmR)-n$~W-vwPqbpvR}dk6Q4lk!`|zz3Kc znzPlmald*O2|_f&1`1LUtsT3A;m9#kfPMP&UCxii9<#NAvuPgFqWh&Y!HQq2M`tuwcn=+9$= z`=tn6icF>TmG)iBu|T(WZs*WAL}U?(Nko~jrfn>*lp zZ<9%47M1gY6YJI|pBYa&N7@=*zIDiwM?=3j0`=jaVD+g2sDmL%Er{nScr)Ud; z%;6o+A-F{Y*Obo*QDgT@=ONYCmrAwvsP3+9vA!&>z25A0sq9w4JuFh5{zUHzr6jrtO~z%JZibflHC8w7$~5*AU!lXx>GTc$)dmpOU_Y3vUK9n86HY z5X0=K*%{1W1~Zt!4E{u6Vac(89!icBoTnoSHQB-?>3_7iV}kPR-^TxpR!thk^%}G* zoAW8n6_M7rM6ifGiV>FsQJ4fgY;MZq;=onG@sg{}H!z2jFvzO9_|)*Tp6J?x84j~J zS-{k9MITgM;rKt&2>()huwod0{HuIliW_?0K&Nw(lXV*Y|1g-1ZLeS(-!)5VDrvd<{kWw-ZDYIi4k~EQ}#MjmN8_{C}X&} zOv09~Jb;DfYpK1AH|F)Z8~~<|1Zs7~5xl1Gga6CA(US6}CG z%#tz$Hs!ZB^~`jT0<3)QZUy2%_6z#USQ9T`*94X_*2GD! zEd&mMcRp%*=ce41rrryh-@Ci-0Aq0+t}Wp9N@;W6gDV8T;WOVinL@Q3L4^1<^(+R~ z05s^}rrdYkH;I9Gp^OwJVunaybF}$3L1piahitCy+cjmcG4v2Gw#Ef5lgYJP zi+hVwf1s_b^DhNs6)ke^ab)w8T%E+8&_|7hSewSg(`wwhXE*l_P4{$bA@fK8;V+wK zN15`t?pWJwm9#lsm^WOcPiV@YGe!AMaCoWXsNl=d;EpLVqF{O0!_R+Gmcj~|_bLGZnUFuE@l#KBa`9`(+GQB|vSWKE9nYOS+=m1lm{gzwFDB5$g^j%EqjNv(^?2l60kCXA}bw8H0 z*ZZoY!#ea|m86z9=%D zATh?=;sM|EV@TWBa(1eW2bQsz-jnV@C~e!$>EUB;WIOZtpp?5)1CKp&39SaSO@DcL>O!25pJ?yT4T4_QS#+BeP z_WQDxOm}iHrU-+&vqHz1bEK=9W-^(T5=F`f%^@%_Ud-FiQ#s~~m>f&187J1XjZ>oC z+oZn{P7x@1ed^0qG9HjidFY14f7UUv0N~bjraWzYMNr=Mf$`6|t(gPXK6L&o?isr{ zeC&bGmP)<4L+9P59PI;d!ENZzN@;m)$?2E?!Lg(j2k(i=`mB3Cx7L-2A(?T^A%u^K zA>#LP869Q-0cN2>V3Fc=E7ICj7RlE~iz@7v8UxaROa$&}W~Arzbb<(FjetZt&Sh#s zQbQuVMDknTAR3!Xeya(SOc0IF#&vC~^HO&oWFpAv$L8K<<{b+}N<*L+CylZMv6%em zh|r9}lu39?t4)H?RdYCJ#Oy*kmdp==PC+6wOfS21A zgeu0tXB8X+U4W$4L>gh?ZJQd!Z%iDRug^^l;V)W{Oy)dkdO1Dgua_&&Zaut6+{krm(Ds(!+9e zo7)fu4-rLT-haTmIT*sgy5dAw$o^oPT8MD;)iQm)hmr$!JiJC)LhlJ*&7ninf^J^~ z$NUkP?0fIau86<{L4{64>$3~bd2g@GGpsYJ1YiNQXD0Y@&~0YWFHE(Jca&9;E80$I zxB5Zsa{{XuJo%2_=12s3l$+iInly~@1@3-sytF@2lA`F~De8wN+P&Fm%?Jv+rTX|* z33EdLhOtHpNp8oJ2ZZtHi13^>iu>zQJ6ZGKD3$>F`AC_}Wn#9~HA(57{+is^l*1f~U-n#ge<<*M7&XL4_pYmCZV%Y;0KwQtCYgNA zp+oZlSm9urdYak-8O=$~|E_?`4JBb>CrN^?bi?3sls}$#5RMe@{5p*o1Ihz_Y<&6% z2+x=CIqk~xVDS$c7iE;h+8G^u^m`dkB17Bh7i%gf+@Vb)v_x~PIPH&1-8+3FN^)cm zo>JEqCSd5KJ;4tekM?VYv94`0;PQUye*{vjxd?N87A@SXB}t;RUAcMj89PAVd5*&y=TbeWJO5vL}{5d#3Dj~niJh%*kn*b;$E8C zqi4FW3F=4NI5E{__v>rFYI$wXLH~%9TTA_+|VO9ErjM}L4 zhzSt}#A$D8jzyvdN0^6i%LqT1+i5a}DFd<0n)(>eE}`>RGQV1R2}B2GyeVCbF}_vC znf2C}UGX%T%vNRr!T%*Pnoq_A)2X^#xF4+vaQ-~W&xsct_zeRlz5@Iv#V*?P-Cday zV6C9N`s{DKe{WZopegVO#-|!H0mxtgJ}CU#VrtJrz1HUv=L^De}0urYSU_AK#+S*s$0L?mn{`q4!wXr zL%Zzp&1#`Qki96CWBv8I5LJRvuqF@N;6A`NfHoib=7%sTG#@&GRe@LmB%+)NnjjJq z)L`Dg#7W07jS~@$q-K3vFasZft${%N#XOqJP-T4{AOOC!Q_?p}bIDr)$)+zwd&nW| zw1?%;MrA&H4+$1+-3MLj{9NX~2NR9@XH%Z$phP%`G(Fzi+Wg<;f;c=~dI*Qs$#0}= zh=ML&@DwcvEfI?V!rF~8eM->W8d0BZ4iKpN(xQ5(-45f+gU1Awd94&+oPS};bpZqi z%SD&3ob`?N0|8||87E5=)eP$a{Etk#3Xx@vchEMmo?wCO%=2Kt;~!&yaG>}EO@!bg z6#FqF$Tl+X^Ziws??L<_)Lq2>#B?o^k$XyaVnk4K@D!%smv?+K2bS5fyXm~3%x0;* zC=_VG9|+3iAm_T(crbvuT`eQrg+?Ff-m~SID+Che6+Gb-%nMz4b*Jh7K;KD|JcpmG zl$KZcEPo=Sb%RiKK&l%Y%4JJMAj13(twJ$@FWR^f3p`_N5dv078_-@0dp2eh?HfCdkvGqM0J^rd_3xF;(fMc5NU4*Nf+Xm(r>tLS#zJK}1Y2_b@s5U~FWkcS+>N&zpa8Ow}SU@fKct z;yFH}RnodkK4hNdh&_a_FC&g!csa;P^0i01`gX!h@ISsWC`a3WHQ*av;LUw{&kIOc zOfZ=)O3$NUwJz{D)CCbUMC$|xx}x&?0Op1^x>WiFq|4LaXslJK@W7h#QT_fszl#Fe zgz&1Te)*K8xv_#SL^#ep#t&S9sd(*GX;jpI`g+UYK7bGY$jmbjB?2foRC4eX?pFj` z%`|Bv)xi;%;_{wvv8H^#U|d*nQK-6HA~~SG9F5^V>j#BR1$ElMn!!rqt;`72Y-u|w z)vL6H`FKQ7eh47kBIsN$@u509ng7o)ZOEmmWsXq9P@1{~KLzTt!FuprVgs00KbCXb zC~1Hv#4O(HWu(P}H244*XiT4{Wj@YCW4gjTceHy}%A_#0(OKP-$e>^y*d?{cBZHOn zB=u$2)H#sPMm;hBeMG%hqeBy0Rah1Q#Y<b`1Ge-vK)?6xId=_`2YEANWIubUSAb zSVNw$p*c)rxnM0~4kwnt?>LD-HLwT}#&dq_C?&K)w0nea+*ew6z)EQ~okQL8XsqbR z1;Ksh3WWhnP?UGPE4UT9>d)9vfI*$v@ooeJUtx_?hKx(|Md?}T!Bc3r>T+C^+GtN= zD_MhRqaL5s&+ln|DPZBrS+kZ&>w7=J-B*{~quqTNKWC}DD^osVvH)}GgHCh6Sa+rC z1)njqXH(`nh+KRN-LD9f#oR*BifZ#bW9x&Ogra@w3P@dO zpmxG*m=u5p4s-rl`YziRa?Dv58rsRH)3>fo-^cuHPbWfi>oP4WfDGDq1(=n$deA4N z#>gzF3s3j2LU{1et;l>6;Rr_09!#GErsl95<`Tk$SqGEhRWc&zw4d>SVB}7OW9)yD z`t)oW5ynL_J_kBBwE26fpZAfNd7x!LVE#s0ONs7(racIGn7m3CL=Jq6g_`Rzje5a~ zHoqpdVU@HdW!i|33xTpIV%0(E0XzCXII%jlaj}e!@l~Oy^w1%I^@iDwpu{U=G`0|M z@Ze-uo(SE$4Ctc*!YE^Po=mO@?;E!F!Bq`*rO#Lc&|qGl`A*k7_=Aejo)DsO(;*~- zi~h`dfH7vxYA$=m^&LSQ2#7;~Vf=jby9L%4>xA`U=>^*}qw_rY9`jl&)S?k094JG! zYf+W7=-{cG<oSN`xJBWiR1){Bo>>$7#*VBFgYlU3|{1383k~w`{ zYJThDwJr^W1_%bk;FO>an?dYfGi|Clr3g(6!cKIlKSq@Cf$6<6^BsubZBm<<7u`ug zpp-X%;*Z4&q0!!$%AOL`iBJJk#YDWlj1vQd4Vcsu%)J_^TEPeD0lH^-Uw0q(5O@JD zAW&&+1$}>QrvBUsVfI@@!bS(|FmDe||AQY0dv+U?`VFz5=y9FQZ|NyqFf`U0OczZ} z=Ns(^=HPd{^rf=qJ6@2m0AqW-#LW2*nfhsqjZL7>;1>+^_@F$nKBHp*{-7e}XSuZI zXui+-dwlR7W5t+SO%DzD!>$~(j&bW!XaJ(kv1%YR*mZVQdKN*>uigi|N54Ho2KSar zi)UVm`DRa@xwVEM?1d!w0ZiT=zQnho`8lNlfy6Srv2|n)@yQ(oW1(|vaBcZNC(s26 zlL7IWu&(1FndrWKm1z8E6(^c|HB5?t1%mA$+5|b|wm>LokO~Y9?S zIoOMMTX!l^Htnc8^@}##FK8-x1s<5`R}?9!W$?S<2i!}>Prf2}>`|_bm&*8o7XCD) zxiZZ=JDB=AQ|P+3WK+4iQ?>M@I81xiwC+!Gi_&uv==BJ9N|?nb`tX3}`O07%#~?G- zxOpy5V{&az*}ghy7nUe|q= z+{l-k`_E4IiOs-=su>kJnDuq*7&uCBrUsJfc3kSdA(bbXa_=-A z%sFmV)(`Ozr#0oGbhtD4GXPC%i{Bf6`3f0r|L{4&@$<45lBjk3_b@^NI|$Ms>Jx@X zzzV+i`?z-rOd*(uZEO%FkdH{nebPHVxK5L1L+0f>y{h>pdgA6 zN(d%I1Ai!~8X>$lPw&Fa5ma50kRNQk20J z1|FYf?h~hC*WraS8pA77fAR6M4%0sXHezcXo#tDj(6gqtg6v^^7ndP%Bx#^nD@0p4mpQ_xm79 z&qvIJC??$^fZ0)uBK%2+Itk2OkGzTS8r6ZjhDA#nAs4W8}ceiv`GYs!~q-JHRn z8Cah@+EJIZcTu`D73=b#42wJ3n~7F~6#flUjz#8^P_U>Wj+)61ivrlrV$@WLiug7W z0*i`Ml01=QA^Bt*Hf=9}P~*?EC)orM?+~%tWCdOJT{I2Mxop{aX7KzS>4FHeRfX~J zNiGnIzT>`w>xBNl-P|iV^uhnG$xfKlFqTUB$$TD4(sL@@BGv1yMgYuMvx=#}Y9rNY z`|l)0pH(BFQ7hK-+&TqiveJN3toH zycICe@)5u=@9L>le(dbJM59FLM)S9aU8r#8`+|0eK#gEynfwRScd;$ExI$9!A%~N$gz07)>Tm2 zZB>{6{T4dU)T1+xDdUsgu$SHEk;goZSro>KCar|oOVPQ68$%$<634jU(}aoaA+gy! z2N6TVErFR4;-yFWMgZZ_Ek5}9upsQ|%6v~o78q?eLJH<{fejkaAh~9KS2w^MFqsQ!!%z9$;~Lj7)ATg}EaD*aJ}zD6Bik z=59bE-Y@7w1PHo}Ew~iz@y6=q_sl<9#?M)|;B!#eebbcBWz?Kl-@)!4#${{s+-}+8 z{~gS;CuP1fgBkouL1}b7#0#?)WSJ&;`@7nByC8=CXg|E`|oB$RM`U2r5=D{8mq3!qX9^Vd~ zPmTXTBaJLsJj2R`0K%C9_@GIggDdB7R~9XsHKF)qg`LNzx)3}VOY7sc{$C3)ON14) z)3Z~3pK@hz0q9{SPc`>R3yY?@P5SN=%`@7FWesZv>-p=hPMi1#fA#y*|LfO)W3X4d z`!=0)7910v!3<`w0icx0YjDfn<{p|ZE7~$*m?0X<>)iYJBOw+@(t3V8WpcT%VNl+u zxUm59FF{bZOzpt5j&Ni5`PZZ!C2$B03t_>Ix7VTwShLy8U`nT?`g}$xKW~^gVT3<( z_sLp?pzw-R9|8ydQv!5wQ!ocBUB61R6PBiO)y#?D%TL@hI|h0xUzDEHGia|lT0bmp z#;<$2E91vTK~t`F2_rOG{BqT}S^MbWLi>wB=9S?N(W|_lgFoT;YlrnkM4k5rAVg@5Ja}J^ zpS{f7(;V9{8k=E@Z>dnB2Ma{e<9!gNBITY>!RX6j^2Rr;L>h)cpDf|7NjnPj{+vwi zR-her_W(@8NBJHhljo7s2JhxTBfGCm!v5*oSP1YlvmNbqsojgyU(X0ivlDiua>aan zuqnqFqB;5#tn3Z~zC-3VaLLC=tk(?tayX~w$4fq4YAyw4U)hsn_j_la@$_ykzwvUvt7w(1sbzU#1791f5 #ffb637 #ffeb37 - #ff8e37 + #_ #e2ffb637 #57ffb637 diff --git a/build.gradle b/build.gradle index 20a34f1..67d410f 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 940f504..856d5f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,13 +1,6 @@ -# -# Created by Julian Mutter on 7/10/18 3:58 PM -# Copyright (c) 2018. All rights reserved. -# Last modified 7/10/18 3:54 PM -# -# - -#Sat Apr 07 15:46:32 CEST 2018 +#Wed Jul 10 13:25:40 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/particlelab/build.gradle b/particlelab/build.gradle index 5f48a14..b1b5ece 100644 --- a/particlelab/build.gradle +++ b/particlelab/build.gradle @@ -9,7 +9,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion '27.0.3' defaultConfig { applicationId "de.frajul.particlelab" minSdkVersion 12 diff --git a/particlelab/particlelab.iml b/particlelab/particlelab.iml index 9ba53bb..384d75b 100644 --- a/particlelab/particlelab.iml +++ b/particlelab/particlelab.iml @@ -1,5 +1,5 @@ - + @@ -17,28 +17,27 @@ - - + + - - + - + - - + - + @@ -70,13 +69,6 @@ - - - - - - - @@ -84,17 +76,35 @@ + + + + + + + + + + + + + + + + + + @@ -110,10 +120,10 @@ - - + + \ No newline at end of file