From 2b68b1ba7b7b20eb8f6269470a88f66efdfa3a2a Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 21 Mar 2018 16:15:05 +0100
Subject: [PATCH] Removed animations from countdown Removed
player-speed-textView
---
.../debug/android/support/v7/appcompat/R.java | 116 +++---
.../mergeDebugResources/merger.xml | 2 +-
app/build/intermediates/symbols/debug/R.txt | 352 +++++++++---------
.../de/frajul/endlessroll/main/game/Game.java | 3 +
.../frajul/endlessroll/views/Countdown.java | 105 +++---
.../frajul/endlessroll/views/ToolButton.java | 2 +-
.../endlessroll/views/ToolButtonBar.java | 34 +-
.../frajul/endlessroll/views/ViewManager.java | 16 +-
app/src/main/res/anim/countdown.xml | 22 --
app/src/main/res/layout/game.xml | 19 +-
10 files changed, 307 insertions(+), 364 deletions(-)
delete mode 100644 app/src/main/res/anim/countdown.xml
diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index 989ae5b..59cd846 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -494,64 +494,64 @@ public final class R {
public static final int end_padder = 0x7f08002d;
public static final int expand_activities_button = 0x7f08002e;
public static final int expanded_menu = 0x7f08002f;
- public static final int home = 0x7f080048;
- public static final int homeAsUp = 0x7f080049;
- public static final int icon = 0x7f08004a;
- public static final int ifRoom = 0x7f08004b;
- public static final int image = 0x7f08004c;
- public static final int info = 0x7f08004d;
- public static final int line1 = 0x7f08005a;
- public static final int line3 = 0x7f08005b;
- public static final int listMode = 0x7f08005d;
- public static final int list_item = 0x7f08005e;
- public static final int media_actions = 0x7f08005f;
- public static final int middle = 0x7f080060;
- public static final int multiply = 0x7f080061;
- public static final int never = 0x7f080062;
- public static final int none = 0x7f080063;
- public static final int normal = 0x7f080064;
- public static final int parentPanel = 0x7f080065;
- public static final int progress_circular = 0x7f080069;
- public static final int progress_horizontal = 0x7f08006a;
- public static final int radio = 0x7f08006b;
- public static final int screen = 0x7f08006c;
- public static final int scrollIndicatorDown = 0x7f08006d;
- public static final int scrollIndicatorUp = 0x7f08006e;
- public static final int scrollView = 0x7f08006f;
- public static final int search_badge = 0x7f080070;
- public static final int search_bar = 0x7f080071;
- public static final int search_button = 0x7f080072;
- public static final int search_close_btn = 0x7f080073;
- public static final int search_edit_frame = 0x7f080074;
- public static final int search_go_btn = 0x7f080075;
- public static final int search_mag_icon = 0x7f080076;
- public static final int search_plate = 0x7f080077;
- public static final int search_src_text = 0x7f080078;
- public static final int search_voice_btn = 0x7f080079;
- public static final int select_dialog_listview = 0x7f08007a;
- public static final int shortcut = 0x7f08008e;
- public static final int showCustom = 0x7f080093;
- public static final int showHome = 0x7f080094;
- public static final int showTitle = 0x7f080095;
- public static final int spacer = 0x7f080096;
- public static final int split_action_bar = 0x7f080097;
- public static final int src_atop = 0x7f080098;
- public static final int src_in = 0x7f080099;
- public static final int src_over = 0x7f08009a;
- public static final int status_bar_latest_event_content = 0x7f0800a0;
- public static final int submit_area = 0x7f0800a1;
- public static final int tabMode = 0x7f0800a2;
- public static final int text = 0x7f0800a4;
- public static final int text2 = 0x7f0800a5;
- public static final int textSpacerNoButtons = 0x7f0800a6;
- public static final int time = 0x7f0800a7;
- public static final int title = 0x7f0800a8;
- public static final int title_template = 0x7f0800a9;
- public static final int topPanel = 0x7f0800c1;
- public static final int up = 0x7f0800d3;
- public static final int useLogo = 0x7f0800d4;
- public static final int withText = 0x7f0800d5;
- public static final int wrap_content = 0x7f0800de;
+ public static final int home = 0x7f080047;
+ public static final int homeAsUp = 0x7f080048;
+ public static final int icon = 0x7f080049;
+ public static final int ifRoom = 0x7f08004a;
+ public static final int image = 0x7f08004b;
+ public static final int info = 0x7f08004c;
+ public static final int line1 = 0x7f080059;
+ public static final int line3 = 0x7f08005a;
+ public static final int listMode = 0x7f08005c;
+ public static final int list_item = 0x7f08005d;
+ public static final int media_actions = 0x7f08005e;
+ public static final int middle = 0x7f08005f;
+ public static final int multiply = 0x7f080060;
+ public static final int never = 0x7f080061;
+ public static final int none = 0x7f080062;
+ public static final int normal = 0x7f080063;
+ public static final int parentPanel = 0x7f080064;
+ public static final int progress_circular = 0x7f080068;
+ public static final int progress_horizontal = 0x7f080069;
+ public static final int radio = 0x7f08006a;
+ public static final int screen = 0x7f08006b;
+ public static final int scrollIndicatorDown = 0x7f08006c;
+ public static final int scrollIndicatorUp = 0x7f08006d;
+ public static final int scrollView = 0x7f08006e;
+ public static final int search_badge = 0x7f08006f;
+ public static final int search_bar = 0x7f080070;
+ public static final int search_button = 0x7f080071;
+ public static final int search_close_btn = 0x7f080072;
+ public static final int search_edit_frame = 0x7f080073;
+ public static final int search_go_btn = 0x7f080074;
+ public static final int search_mag_icon = 0x7f080075;
+ public static final int search_plate = 0x7f080076;
+ public static final int search_src_text = 0x7f080077;
+ public static final int search_voice_btn = 0x7f080078;
+ public static final int select_dialog_listview = 0x7f080079;
+ public static final int shortcut = 0x7f08008d;
+ public static final int showCustom = 0x7f080092;
+ public static final int showHome = 0x7f080093;
+ public static final int showTitle = 0x7f080094;
+ public static final int spacer = 0x7f080095;
+ public static final int split_action_bar = 0x7f080096;
+ public static final int src_atop = 0x7f080097;
+ public static final int src_in = 0x7f080098;
+ public static final int src_over = 0x7f080099;
+ public static final int status_bar_latest_event_content = 0x7f08009f;
+ public static final int submit_area = 0x7f0800a0;
+ public static final int tabMode = 0x7f0800a1;
+ public static final int text = 0x7f0800a3;
+ public static final int text2 = 0x7f0800a4;
+ public static final int textSpacerNoButtons = 0x7f0800a5;
+ public static final int time = 0x7f0800a6;
+ public static final int title = 0x7f0800a7;
+ public static final int title_template = 0x7f0800a8;
+ public static final int topPanel = 0x7f0800c0;
+ public static final int up = 0x7f0800d2;
+ public static final int useLogo = 0x7f0800d3;
+ public static final int withText = 0x7f0800d4;
+ public static final int wrap_content = 0x7f0800dd;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index ffeeb22..240d19c 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1346,7 +1346,7 @@
?android:attr/actionMenuTextAppearance@drawable/abc_control_background_material
- "Điều hướng về trang chủ""%1$s, %2$s""%1$s, %2$s, %3$s""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""999+"3truetrue4192dip5falsefalse60%90%50%70%45%72%192dip5256dip"转到主屏幕""%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+""Zulazulela ekhaya""%1$s, %2$s""%1$s, %2$s, %3$s""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s""Goqa""999+"#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f41602#f47b02#f4d802#5b000000#3d000000#ffb637#17b3f5#daf10d#ff0000#000000#9d000000#1791f5#ffeb37#ff8e37#00000000#57ffb637#e2ffb637170dp170dp70dp60dp30dpEndless RollClick me!I\'m a text!997.50.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERLEVEL FINISHEDTo menuTry againRestartRestart level %dNext level: %dGo to the next world:\n%sLOADING...ContinueExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Level: 24Level: %dReset progressRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %dYesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedTo select a tool just click on it\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/Tester1\nTester2\nTester3\nTester4ENDLESS ROLLby FrajulTESTERSMUSICSOUNDS„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“,„Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)SoundsCreditsMusicSet the bomb on an obstacle"Điều hướng về trang chủ""%1$s, %2$s""%1$s, %2$s, %3$s""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""999+"3truetrue4192dip5falsefalse60%90%50%70%45%72%192dip5256dip"转到主屏幕""%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+""Zulazulela ekhaya""%1$s, %2$s""%1$s, %2$s, %3$s""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s""Goqa""999+"#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f41602#f47b02#f4d802#5b000000#3d000000#ffb637#17b3f5#daf10d#ff0000#000000#9d000000#1791f5#ffeb37#ff8e37#00000000#57ffb637#e2ffb637170dp170dp70dp60dp30dpEndless RollClick me!I\'m a text!997.50.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERLEVEL FINISHEDTo menuTry againRestartRestart level %dNext level: %dGo to the next world:\n%sLOADING...ContinueExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Level: 24Level: %dReset progressRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %dYesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedTo select a tool just click on it\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/Tester1\nTester2\nTester3\nTester4ENDLESS ROLLby FrajulTESTERSMUSICSOUNDS„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“,„Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)SoundsCreditsMusicSet the bomb on an obstacle