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 493155b..f573ee2 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..55d01c8 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ 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 0000000..b7415d1 Binary files /dev/null and b/app/src/main/assets/fontBaron.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index eec482c..aaebe51 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,7 +13,7 @@ #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