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 bd7efee..12c7179 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
@@ -258,56 +258,56 @@ public final class R {
public static final int background_floating_material_light = 0x7f050011;
public static final int background_material_dark = 0x7f050013;
public static final int background_material_light = 0x7f050014;
- public static final int bright_foreground_disabled_material_dark = 0x7f050016;
- public static final int bright_foreground_disabled_material_light = 0x7f050017;
- public static final int bright_foreground_inverse_material_dark = 0x7f050018;
- public static final int bright_foreground_inverse_material_light = 0x7f050019;
- public static final int bright_foreground_material_dark = 0x7f05001a;
- public static final int bright_foreground_material_light = 0x7f05001b;
- public static final int button_material_dark = 0x7f05001c;
- public static final int button_material_light = 0x7f05001d;
- public static final int dim_foreground_disabled_material_dark = 0x7f050021;
- public static final int dim_foreground_disabled_material_light = 0x7f050022;
- public static final int dim_foreground_material_dark = 0x7f050023;
- public static final int dim_foreground_material_light = 0x7f050024;
- public static final int foreground_material_dark = 0x7f050025;
- public static final int foreground_material_light = 0x7f050026;
- public static final int highlighted_text_material_dark = 0x7f050028;
- public static final int highlighted_text_material_light = 0x7f050029;
- public static final int hint_foreground_material_dark = 0x7f05002a;
- public static final int hint_foreground_material_light = 0x7f05002b;
- public static final int material_blue_grey_800 = 0x7f05002d;
- public static final int material_blue_grey_900 = 0x7f05002e;
- public static final int material_blue_grey_950 = 0x7f05002f;
- public static final int material_deep_teal_200 = 0x7f050030;
- public static final int material_deep_teal_500 = 0x7f050031;
- public static final int material_grey_100 = 0x7f050032;
- public static final int material_grey_300 = 0x7f050033;
- public static final int material_grey_50 = 0x7f050034;
- public static final int material_grey_600 = 0x7f050035;
- public static final int material_grey_800 = 0x7f050036;
- public static final int material_grey_850 = 0x7f050037;
- public static final int material_grey_900 = 0x7f050038;
- public static final int primary_dark_material_dark = 0x7f05003a;
- public static final int primary_dark_material_light = 0x7f05003b;
- public static final int primary_material_dark = 0x7f05003c;
- public static final int primary_material_light = 0x7f05003d;
- public static final int primary_text_default_material_dark = 0x7f05003e;
- public static final int primary_text_default_material_light = 0x7f05003f;
- public static final int primary_text_disabled_material_dark = 0x7f050040;
- public static final int primary_text_disabled_material_light = 0x7f050041;
- public static final int ripple_material_dark = 0x7f050043;
- public static final int ripple_material_light = 0x7f050044;
- public static final int secondary_text_default_material_dark = 0x7f050045;
- public static final int secondary_text_default_material_light = 0x7f050046;
- public static final int secondary_text_disabled_material_dark = 0x7f050047;
- public static final int secondary_text_disabled_material_light = 0x7f050048;
- public static final int switch_thumb_disabled_material_dark = 0x7f050049;
- public static final int switch_thumb_disabled_material_light = 0x7f05004a;
- public static final int switch_thumb_material_dark = 0x7f05004b;
- public static final int switch_thumb_material_light = 0x7f05004c;
- public static final int switch_thumb_normal_material_dark = 0x7f05004d;
- public static final int switch_thumb_normal_material_light = 0x7f05004e;
+ public static final int bright_foreground_disabled_material_dark = 0x7f050017;
+ public static final int bright_foreground_disabled_material_light = 0x7f050018;
+ public static final int bright_foreground_inverse_material_dark = 0x7f050019;
+ public static final int bright_foreground_inverse_material_light = 0x7f05001a;
+ public static final int bright_foreground_material_dark = 0x7f05001b;
+ public static final int bright_foreground_material_light = 0x7f05001c;
+ public static final int button_material_dark = 0x7f05001d;
+ public static final int button_material_light = 0x7f05001e;
+ public static final int dim_foreground_disabled_material_dark = 0x7f050022;
+ public static final int dim_foreground_disabled_material_light = 0x7f050023;
+ public static final int dim_foreground_material_dark = 0x7f050024;
+ public static final int dim_foreground_material_light = 0x7f050025;
+ public static final int foreground_material_dark = 0x7f050026;
+ public static final int foreground_material_light = 0x7f050027;
+ public static final int highlighted_text_material_dark = 0x7f05002a;
+ public static final int highlighted_text_material_light = 0x7f05002b;
+ public static final int hint_foreground_material_dark = 0x7f05002c;
+ public static final int hint_foreground_material_light = 0x7f05002d;
+ public static final int material_blue_grey_800 = 0x7f05002f;
+ public static final int material_blue_grey_900 = 0x7f050030;
+ public static final int material_blue_grey_950 = 0x7f050031;
+ public static final int material_deep_teal_200 = 0x7f050032;
+ public static final int material_deep_teal_500 = 0x7f050033;
+ public static final int material_grey_100 = 0x7f050034;
+ public static final int material_grey_300 = 0x7f050035;
+ public static final int material_grey_50 = 0x7f050036;
+ public static final int material_grey_600 = 0x7f050037;
+ public static final int material_grey_800 = 0x7f050038;
+ public static final int material_grey_850 = 0x7f050039;
+ public static final int material_grey_900 = 0x7f05003a;
+ public static final int primary_dark_material_dark = 0x7f05003c;
+ public static final int primary_dark_material_light = 0x7f05003d;
+ public static final int primary_material_dark = 0x7f05003e;
+ public static final int primary_material_light = 0x7f05003f;
+ public static final int primary_text_default_material_dark = 0x7f050040;
+ public static final int primary_text_default_material_light = 0x7f050041;
+ public static final int primary_text_disabled_material_dark = 0x7f050042;
+ public static final int primary_text_disabled_material_light = 0x7f050043;
+ public static final int ripple_material_dark = 0x7f050045;
+ public static final int ripple_material_light = 0x7f050046;
+ public static final int secondary_text_default_material_dark = 0x7f050047;
+ public static final int secondary_text_default_material_light = 0x7f050048;
+ public static final int secondary_text_disabled_material_dark = 0x7f050049;
+ public static final int secondary_text_disabled_material_light = 0x7f05004a;
+ public static final int switch_thumb_disabled_material_dark = 0x7f05004b;
+ public static final int switch_thumb_disabled_material_light = 0x7f05004c;
+ public static final int switch_thumb_material_dark = 0x7f05004d;
+ public static final int switch_thumb_material_light = 0x7f05004e;
+ public static final int switch_thumb_normal_material_dark = 0x7f05004f;
+ public static final int switch_thumb_normal_material_light = 0x7f050050;
}
public static final class dimen {
public static final int abc_action_bar_content_inset_material = 0x7f060000;
@@ -494,64 +494,64 @@ public final class R {
public static final int end_padder = 0x7f080020;
public static final int expand_activities_button = 0x7f080024;
public static final int expanded_menu = 0x7f080025;
- public static final int home = 0x7f08002e;
- public static final int homeAsUp = 0x7f08002f;
- public static final int icon = 0x7f080031;
- public static final int ifRoom = 0x7f080032;
- public static final int image = 0x7f080033;
- public static final int info = 0x7f080036;
- public static final int line1 = 0x7f080044;
- public static final int line3 = 0x7f080045;
- public static final int listMode = 0x7f080048;
- public static final int list_item = 0x7f080049;
- public static final int media_actions = 0x7f08004a;
- public static final int middle = 0x7f080050;
- public static final int multiply = 0x7f080051;
- public static final int never = 0x7f080052;
- public static final int none = 0x7f080053;
- public static final int normal = 0x7f080054;
- public static final int parentPanel = 0x7f080055;
- public static final int progress_circular = 0x7f080059;
- public static final int progress_horizontal = 0x7f08005a;
- public static final int radio = 0x7f08005b;
- public static final int screen = 0x7f08005c;
- public static final int scrollIndicatorDown = 0x7f08005d;
- public static final int scrollIndicatorUp = 0x7f08005e;
- public static final int scrollView = 0x7f08005f;
- public static final int search_badge = 0x7f080060;
- public static final int search_bar = 0x7f080061;
- public static final int search_button = 0x7f080062;
- public static final int search_close_btn = 0x7f080063;
- public static final int search_edit_frame = 0x7f080064;
- public static final int search_go_btn = 0x7f080065;
- public static final int search_mag_icon = 0x7f080066;
- public static final int search_plate = 0x7f080067;
- public static final int search_src_text = 0x7f080068;
- public static final int search_voice_btn = 0x7f080069;
- public static final int select_dialog_listview = 0x7f08006a;
- public static final int shortcut = 0x7f08007a;
- public static final int showCustom = 0x7f08007f;
- public static final int showHome = 0x7f080080;
- public static final int showTitle = 0x7f080081;
- public static final int spacer = 0x7f080082;
- public static final int split_action_bar = 0x7f080083;
- public static final int src_atop = 0x7f080084;
- public static final int src_in = 0x7f080085;
- public static final int src_over = 0x7f080086;
- public static final int status_bar_latest_event_content = 0x7f08008c;
- public static final int submit_area = 0x7f08008d;
- public static final int tabMode = 0x7f08008e;
- public static final int text = 0x7f080092;
- public static final int text2 = 0x7f080093;
- public static final int textSpacerNoButtons = 0x7f080094;
- public static final int time = 0x7f080095;
- public static final int title = 0x7f080096;
- public static final int title_template = 0x7f080097;
- public static final int topPanel = 0x7f0800b4;
- public static final int up = 0x7f0800c6;
- public static final int useLogo = 0x7f0800c7;
- public static final int withText = 0x7f0800c8;
- public static final int wrap_content = 0x7f0800d2;
+ public static final int home = 0x7f080037;
+ public static final int homeAsUp = 0x7f080038;
+ public static final int icon = 0x7f08003a;
+ public static final int ifRoom = 0x7f08003b;
+ public static final int image = 0x7f08003c;
+ public static final int info = 0x7f08003e;
+ public static final int line1 = 0x7f08004b;
+ public static final int line3 = 0x7f08004c;
+ public static final int listMode = 0x7f08004f;
+ public static final int list_item = 0x7f080050;
+ public static final int media_actions = 0x7f080051;
+ public static final int middle = 0x7f080052;
+ public static final int multiply = 0x7f080053;
+ public static final int never = 0x7f080054;
+ public static final int none = 0x7f080055;
+ public static final int normal = 0x7f080056;
+ public static final int parentPanel = 0x7f080057;
+ public static final int progress_circular = 0x7f08005b;
+ public static final int progress_horizontal = 0x7f08005c;
+ public static final int radio = 0x7f08005d;
+ public static final int screen = 0x7f08005e;
+ public static final int scrollIndicatorDown = 0x7f08005f;
+ public static final int scrollIndicatorUp = 0x7f080060;
+ public static final int scrollView = 0x7f080061;
+ public static final int search_badge = 0x7f080062;
+ public static final int search_bar = 0x7f080063;
+ public static final int search_button = 0x7f080064;
+ public static final int search_close_btn = 0x7f080065;
+ public static final int search_edit_frame = 0x7f080066;
+ public static final int search_go_btn = 0x7f080067;
+ public static final int search_mag_icon = 0x7f080068;
+ public static final int search_plate = 0x7f080069;
+ public static final int search_src_text = 0x7f08006a;
+ public static final int search_voice_btn = 0x7f08006b;
+ public static final int select_dialog_listview = 0x7f08006c;
+ public static final int shortcut = 0x7f08007c;
+ public static final int showCustom = 0x7f080081;
+ public static final int showHome = 0x7f080082;
+ public static final int showTitle = 0x7f080083;
+ public static final int spacer = 0x7f080084;
+ public static final int split_action_bar = 0x7f080085;
+ public static final int src_atop = 0x7f080086;
+ public static final int src_in = 0x7f080087;
+ public static final int src_over = 0x7f080088;
+ public static final int status_bar_latest_event_content = 0x7f08008e;
+ public static final int submit_area = 0x7f08008f;
+ public static final int tabMode = 0x7f080090;
+ public static final int text = 0x7f080094;
+ public static final int text2 = 0x7f080095;
+ public static final int textSpacerNoButtons = 0x7f080096;
+ public static final int time = 0x7f080097;
+ public static final int title = 0x7f080098;
+ public static final int title_template = 0x7f080099;
+ public static final int topPanel = 0x7f0800b6;
+ public static final int up = 0x7f0800c8;
+ public static final int useLogo = 0x7f0800c9;
+ public static final int withText = 0x7f0800ca;
+ public static final int wrap_content = 0x7f0800d3;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
@@ -586,18 +586,18 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f0a0016;
public static final int abc_search_view = 0x7f0a0017;
public static final int abc_select_dialog_material = 0x7f0a0018;
- public static final int notification_media_action = 0x7f0a0020;
- public static final int notification_media_cancel_action = 0x7f0a0021;
- public static final int notification_template_big_media = 0x7f0a0022;
- public static final int notification_template_big_media_narrow = 0x7f0a0023;
- public static final int notification_template_lines = 0x7f0a0024;
- public static final int notification_template_media = 0x7f0a0025;
- public static final int notification_template_part_chronometer = 0x7f0a0026;
- public static final int notification_template_part_time = 0x7f0a0027;
- public static final int select_dialog_item_material = 0x7f0a002a;
- public static final int select_dialog_multichoice_material = 0x7f0a002b;
- public static final int select_dialog_singlechoice_material = 0x7f0a002c;
- public static final int support_simple_spinner_dropdown_item = 0x7f0a0034;
+ public static final int notification_media_action = 0x7f0a0021;
+ public static final int notification_media_cancel_action = 0x7f0a0022;
+ public static final int notification_template_big_media = 0x7f0a0023;
+ public static final int notification_template_big_media_narrow = 0x7f0a0024;
+ public static final int notification_template_lines = 0x7f0a0025;
+ public static final int notification_template_media = 0x7f0a0026;
+ public static final int notification_template_part_chronometer = 0x7f0a0027;
+ public static final int notification_template_part_time = 0x7f0a0028;
+ public static final int select_dialog_item_material = 0x7f0a002b;
+ public static final int select_dialog_multichoice_material = 0x7f0a002c;
+ public static final int select_dialog_singlechoice_material = 0x7f0a002d;
+ public static final int support_simple_spinner_dropdown_item = 0x7f0a0035;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f0d0000;
diff --git a/app/build/intermediates/assets/debug/particleEffects/collectStar.pe b/app/build/intermediates/assets/debug/particleEffects/collectStar.pe
index 8f8bb0c..9aa5be3 100644
--- a/app/build/intermediates/assets/debug/particleEffects/collectStar.pe
+++ b/app/build/intermediates/assets/debug/particleEffects/collectStar.pe
@@ -38,7 +38,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
-spawnShape: point
+shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
@@ -110,20 +110,16 @@ active: false
- Gravity -
active: false
- Tint -
-colorsCount: 9
+colorsCount: 6
colors0: 1.0
colors1: 0.92941177
colors2: 0.047058824
colors3: 1.0
colors4: 0.92941177
colors5: 0.047058824
-colors6: 1.0
-colors7: 0.78039217
-colors8: 0.047058824
-timelineCount: 3
+timelineCount: 2
timeline0: 0.0
-timeline1: 0.7521515
-timeline2: 1.0
+timeline1: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
diff --git a/app/build/intermediates/assets/debug/particleEffects/explosion.pe b/app/build/intermediates/assets/debug/particleEffects/explosion.pe
index 79e7eb6..c606a0e 100644
--- a/app/build/intermediates/assets/debug/particleEffects/explosion.pe
+++ b/app/build/intermediates/assets/debug/particleEffects/explosion.pe
@@ -44,7 +44,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
-spawnShape: square
+shape: square
- Spawn Width -
lowMin: 200.0
lowMax: 200.0
diff --git a/app/build/intermediates/assets/debug/particleEffects/magnet.pe b/app/build/intermediates/assets/debug/particleEffects/magnet.pe
index 329a102..93bf1e5 100644
--- a/app/build/intermediates/assets/debug/particleEffects/magnet.pe
+++ b/app/build/intermediates/assets/debug/particleEffects/magnet.pe
@@ -38,7 +38,7 @@ active: false
- Y Offset -
active: false
- Spawn Shape -
-spawnShape: point
+shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 7e2f6cc..4349181 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 ae6b781..333399a 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1346,13 +1346,13 @@
?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+"
+ "Đ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+"World zer0GrasslandsIcy MountainsTestcaveMysterious fireworld
- #ffda45#891e4e#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106#5b000000#9d000000Endless Roll0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERYOU DID ITToolsTo menuRestartTry againNext levelLOADING...ContinueRestartExitPlayUnlock all levels (Yes! It\'s magic!)Gain 90 ep (Nope! No magic at all!)Test GL Stuff!!!Time (Lv12)Level: 24Level: %dResetToolshopRamp unlockedGreat world21/15%s%s unlocked!You unlocked a ToolslotLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyRampSpringMagnetBombMushroom%1$s (Lv%2$d)NoneTimeRadiusForceMax.This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!This is the toolbar. Here you can select the tool you currently want to use.You can use the selected tool by clicking on the wanted position on the screen.Now place your ramp in front of the gap!Now place it in front of the obstacle!You can even set a Tool in mid-air.\nTry it out!Now try again!Congratulations!!!\nYou have leveled up!Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.Right! That is your toolbar.Here you can see all the tools you will be able to buy and use.Here one can buy and upgrade the selected tool.Now select the spring and buy it!Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.SunWheelI\'m a text!85.1%Level: %dClick me!997.5Roll up the ramp to gain heightBlow up all obstacles near the bombShoots you in the airDifficult to handle, but if you master it you can do anythingThis will give you super-powers for a few seconds\?\?\?You will unlock this mysterious tool at level %dTick tack!Don\'t worry, roll happy!Keep calm and roll onShine bright like the sunHypnotizes you for more funPACMAN!A nice car without the... car\?\?\?A new shape for more funFinish the %d. worldCollect %d starsCollect %d energy (%d/%d)Collect %d stars (%d/%d)Collect %d energyEmpty taskNew shape unlockedTask completedDo you really want to exit the game?YesNoStasisFreezes a certain area which leads to longer in-air time170dp170dp70dp60dp
\ No newline at end of file
+ 170dp170dp70dp60dp
\ No newline at end of file
diff --git a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
index f4cb4a7..568f5b0 100644
--- a/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -18,6 +18,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
+ android:testOnly="true"
android:theme="@style/AppTheme" >
implements LevelButtonOnClickListener {
+
+ private LevelPack levelPack;
+
+ private TopBar topBar;
+ private TextView title;
+ private LevelButton restart;
+ private LevelButton nextLevel;
+
+ public GoalScreen(GameActivity gameActivity) {
+ super(ScreenType.GOAL, gameActivity, R.layout.goal_screen);
+ topBar = super.createTopBar(R.id.goal_screen_topbar);
+ title = (TextView) layout.findViewById(R.id.goal_screen_title);
+ title.setTypeface(gameActivity.getTypeface());
+ restart = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_restart));
+ nextLevel = new LevelButton(gameActivity, this, layout.findViewById(R.id.goal_screen_next_level));
+ }
+
+ public void onLevelFinished(LevelPack levelPack, Level level){
+ this.levelPack = levelPack;
+ restart.init(level);
+ nextLevel.init(levelPack.getNextLevel(level));
+ }
+
+ @Override
+ public void prepareToBeShown() {
+ topBar.update();
+ }
+
+ @Override
+ public void onBackKeyDown() {
+ flipTo(ScreenType.LEVELS);
+ }
+
+ @Override
+ public void onClick(LevelButton levelButton) {
+ gameActivity.startGame(levelPack, levelButton.getLevel());
+ }
+}
diff --git a/app/src/main/java/de/frajul/endlessroll/views/LevelButtonOnClickListener.java b/app/src/main/java/de/frajul/endlessroll/views/LevelButtonOnClickListener.java
new file mode 100644
index 0000000..9d364ed
--- /dev/null
+++ b/app/src/main/java/de/frajul/endlessroll/views/LevelButtonOnClickListener.java
@@ -0,0 +1,11 @@
+package de.frajul.endlessroll.views;
+
+/**
+ * Created by Julian on 04.11.2017.
+ */
+
+public interface LevelButtonOnClickListener {
+
+ public void onClick(LevelButton levelButton);
+
+}
diff --git a/app/src/main/java/de/frajul/endlessroll/views/WorldButtonOnClickListener.java b/app/src/main/java/de/frajul/endlessroll/views/WorldButtonOnClickListener.java
new file mode 100644
index 0000000..0bf6e56
--- /dev/null
+++ b/app/src/main/java/de/frajul/endlessroll/views/WorldButtonOnClickListener.java
@@ -0,0 +1,11 @@
+package de.frajul.endlessroll.views;
+
+/**
+ * Created by Julian on 04.11.2017.
+ */
+
+public interface WorldButtonOnClickListener {
+
+ public void onClick(WorldButton worldButton);
+
+}
diff --git a/app/src/main/res/drawable/tools_stasis_button.png b/app/src/main/res/drawable/tools_stasis_button.png
index ec01ef8..e69c4cc 100644
Binary files a/app/src/main/res/drawable/tools_stasis_button.png and b/app/src/main/res/drawable/tools_stasis_button.png differ
diff --git a/app/src/main/res/drawable/tutorial_place_ramp_air_1.png b/app/src/main/res/drawable/tutorial_place_ramp_air_1.png
index 73d1dd3..d5825ac 100644
Binary files a/app/src/main/res/drawable/tutorial_place_ramp_air_1.png and b/app/src/main/res/drawable/tutorial_place_ramp_air_1.png differ
diff --git a/app/src/main/res/drawable/tutorial_place_ramp_air_2.png b/app/src/main/res/drawable/tutorial_place_ramp_air_2.png
new file mode 100644
index 0000000..231ed2d
Binary files /dev/null and b/app/src/main/res/drawable/tutorial_place_ramp_air_2.png differ
diff --git a/app/src/main/res/drawable/tutorial_place_ramp_gap.png b/app/src/main/res/drawable/tutorial_place_ramp_gap.png
index a4f1595..714546f 100644
Binary files a/app/src/main/res/drawable/tutorial_place_ramp_gap.png and b/app/src/main/res/drawable/tutorial_place_ramp_gap.png differ
diff --git a/app/src/main/res/drawable/tutorial_place_ramp_obstacle.png b/app/src/main/res/drawable/tutorial_place_ramp_obstacle.png
index 67ea74c..c117354 100644
Binary files a/app/src/main/res/drawable/tutorial_place_ramp_obstacle.png and b/app/src/main/res/drawable/tutorial_place_ramp_obstacle.png differ
diff --git a/app/src/main/res/drawable/tutorial_place_tools.png b/app/src/main/res/drawable/tutorial_place_tools.png
index a80098d..0ae5079 100644
Binary files a/app/src/main/res/drawable/tutorial_place_tools.png and b/app/src/main/res/drawable/tutorial_place_tools.png differ
diff --git a/app/src/main/res/drawable/tutorial_toolbar.png b/app/src/main/res/drawable/tutorial_toolbar.png
deleted file mode 100644
index e27374a..0000000
Binary files a/app/src/main/res/drawable/tutorial_toolbar.png and /dev/null differ
diff --git a/app/src/main/res/drawable/xml_background_game_over_message_button.xml b/app/src/main/res/drawable/xml_background_game_over_message_button.xml
new file mode 100644
index 0000000..7644835
--- /dev/null
+++ b/app/src/main/res/drawable/xml_background_game_over_message_button.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/game.xml b/app/src/main/res/layout/game.xml
index f967a99..cc32487 100644
--- a/app/src/main/res/layout/game.xml
+++ b/app/src/main/res/layout/game.xml
@@ -64,8 +64,8 @@
android:visibility="invisible"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/goal_screen.xml b/app/src/main/res/layout/goal_screen.xml
new file mode 100644
index 0000000..2595007
--- /dev/null
+++ b/app/src/main/res/layout/goal_screen.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/levelbutton.xml b/app/src/main/res/layout/levelbutton.xml
index 48bdedd..d23990b 100644
--- a/app/src/main/res/layout/levelbutton.xml
+++ b/app/src/main/res/layout/levelbutton.xml
@@ -2,61 +2,68 @@
-
-
+ android:layout_width="wrap_content"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
-
+ android:text="@string/placeholder_button"
+ android:textSize="30sp"
+ android:layout_gravity="center_horizontal"/>
-
+
-
+
-
+
+
+
+
+
+
+
+ android:visibility="invisible"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/levels.xml b/app/src/main/res/layout/levels.xml
index cd5c116..820fe24 100644
--- a/app/src/main/res/layout/levels.xml
+++ b/app/src/main/res/layout/levels.xml
@@ -8,10 +8,8 @@
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
-
+
-
+
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal"/>
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal"/>
+
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/message.xml b/app/src/main/res/layout/message.xml
deleted file mode 100644
index f577f33..0000000
--- a/app/src/main/res/layout/message.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/short_menu.xml b/app/src/main/res/layout/short_menu.xml
index e14c8d6..376acbd 100644
--- a/app/src/main/res/layout/short_menu.xml
+++ b/app/src/main/res/layout/short_menu.xml
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:text="@string/short_menu_continue"
android:textSize="40sp"
- android:textColor="@color/win"
+ android:textColor="@color/level_finished"
android:id="@+id/shortmenu_continue"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml
index 5b559ca..52a6c4f 100644
--- a/app/src/main/res/layout/tutorial.xml
+++ b/app/src/main/res/layout/tutorial.xml
@@ -1,7 +1,8 @@
+ android:layout_height="match_parent"
+ android:background="@color/background_tutorial">
-
+
-
-
-
-
-
+
+ android:layout_gravity="center_horizontal">
+
+
+
+
+
+
+
+ android:textSize="20sp"/>
+ android:textSize="20sp"/>
+
+
+ android:textSize="20sp"/>
-
+
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6b5634f..dd2dc44 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
- #ffda45
- #891e4e
+ #ffda45
+ #f11e6f#39be27#ffb405#daf10d
@@ -19,4 +19,5 @@
#f0d7b106#9d000000#5b000000
+ #3d000000
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dddb9d5..620fcbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,11 +15,11 @@
Task completedLevel UpGAME OVER
- YOU DID IT
+ LEVEL FINISHEDToolsTo menu
- RestartTry again
+ RestartNext levelLOADING...Continue
@@ -68,6 +68,8 @@
Collect %d energyFinish the %d. world
+ %d/%d
+
You will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the air
@@ -96,11 +98,10 @@
This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!
- This is the toolbar. Here you can select the tool you currently want to use.
- You can use the selected tool by clicking on the wanted position on the screen.
- Now place your ramp in front of the gap!
- Now place it in front of the obstacle!
- You can even set a Tool in mid-air.\nTry it out!
+ Click anywhere on the screen to place the ramp
+ Try to place your ramp in front of the gap
+ Great job!\nNow place it in front of the obstacle
+ You can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations!!!\nYou have leveled up!Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!