From 1cf1a355a6e2c7ddde542603859c211bc96d0dc1 Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 7 Jul 2018 17:46:34 +0200 Subject: [PATCH] Redid icon Added "ART" to credits Added title to start screen --- .idea/assetWizardSettings.xml | 85 ++ .../debug/android/support/v7/appcompat/R.java | 140 +-- .../mergeDebugResources/merger.xml | 6 +- app/build/intermediates/symbols/debug/R.txt | 830 +++++++++--------- app/src/main/ic_launcher-web.png | Bin 56442 -> 0 bytes .../endlessroll/entities/tools/ToolType.java | 2 +- .../endlessroll/main/screens/StartScreen.java | 5 + .../endlessroll/views/CreditsDialog.java | 4 +- .../backgrounds_game_grass_layer_2.png | Bin 33067 -> 0 bytes .../backgrounds_game_grass_layer_3.png | Bin 21789 -> 0 bytes .../backgrounds_game_snow_layer_2.png | Bin 21352 -> 0 bytes .../backgrounds_game_snow_layer_3.png | Bin 27453 -> 0 bytes app/src/main/res/drawable/tools_spring.png | Bin 62208 -> 59594 bytes app/src/main/res/drawable/tools_spring_2.png | Bin 59594 -> 0 bytes app/src/main/res/layout/credits_dialog.xml | 19 + app/src/main/res/layout/start_screen.xml | 34 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 4905 -> 5962 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2974 -> 3123 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 7567 -> 8475 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 12409 -> 15177 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 18359 -> 23210 bytes app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 + 23 files changed, 629 insertions(+), 499 deletions(-) create mode 100644 .idea/assetWizardSettings.xml delete mode 100644 app/src/main/ic_launcher-web.png delete mode 100644 app/src/main/res/drawable/backgrounds_game_grass_layer_2.png delete mode 100644 app/src/main/res/drawable/backgrounds_game_grass_layer_3.png delete mode 100644 app/src/main/res/drawable/backgrounds_game_snow_layer_2.png delete mode 100644 app/src/main/res/drawable/backgrounds_game_snow_layer_3.png delete mode 100644 app/src/main/res/drawable/tools_spring_2.png diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..dc9da39 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,85 @@ + + + + + + \ No newline at end of file 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 e37d861..20cae72 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 @@ -456,7 +456,7 @@ public final class R { public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043; public static final int abc_textfield_search_material = 0x7f070044; - public static final int notification_template_icon_bg = 0x7f070070; + public static final int notification_template_icon_bg = 0x7f07006c; } public static final class id { public static final int action0 = 0x7f080000; @@ -484,74 +484,74 @@ public final class R { public static final int chronometer = 0x7f08001c; public static final int collapseActionView = 0x7f08001d; public static final int contentPanel = 0x7f080021; - public static final int custom = 0x7f08002d; - public static final int customPanel = 0x7f08002e; - public static final int decor_content_parent = 0x7f08002f; - public static final int default_activity_button = 0x7f080030; - public static final int disableHome = 0x7f080031; - public static final int edit_query = 0x7f080032; - public static final int end = 0x7f080033; - public static final int end_padder = 0x7f080034; - public static final int expand_activities_button = 0x7f080035; - public static final int expanded_menu = 0x7f080036; - public static final int home = 0x7f08004d; - public static final int homeAsUp = 0x7f08004e; - public static final int icon = 0x7f08004f; - public static final int ifRoom = 0x7f080051; - public static final int image = 0x7f080052; - public static final int info = 0x7f080053; - public static final int line1 = 0x7f080062; - public static final int line3 = 0x7f080063; - public static final int listMode = 0x7f080065; - public static final int list_item = 0x7f080066; - public static final int media_actions = 0x7f080067; - public static final int middle = 0x7f080068; - public static final int multiply = 0x7f080069; - public static final int never = 0x7f08006a; - public static final int none = 0x7f08006b; - public static final int normal = 0x7f08006c; - public static final int parentPanel = 0x7f080070; - public static final int progress_circular = 0x7f080075; - public static final int progress_horizontal = 0x7f080076; - public static final int radio = 0x7f080077; - public static final int screen = 0x7f08007a; - public static final int scrollIndicatorDown = 0x7f08007b; - public static final int scrollIndicatorUp = 0x7f08007c; - public static final int scrollView = 0x7f08007d; - public static final int search_badge = 0x7f08007e; - public static final int search_bar = 0x7f08007f; - public static final int search_button = 0x7f080080; - public static final int search_close_btn = 0x7f080081; - public static final int search_edit_frame = 0x7f080082; - public static final int search_go_btn = 0x7f080083; - public static final int search_mag_icon = 0x7f080084; - public static final int search_plate = 0x7f080085; - public static final int search_src_text = 0x7f080086; - public static final int search_voice_btn = 0x7f080087; - public static final int select_dialog_listview = 0x7f080088; - public static final int shortcut = 0x7f08009d; - public static final int showCustom = 0x7f0800a2; - public static final int showHome = 0x7f0800a3; - public static final int showTitle = 0x7f0800a4; - public static final int spacer = 0x7f0800a5; - public static final int split_action_bar = 0x7f0800a6; - public static final int src_atop = 0x7f0800a7; - public static final int src_in = 0x7f0800a8; - public static final int src_over = 0x7f0800a9; - public static final int status_bar_latest_event_content = 0x7f0800af; - public static final int submit_area = 0x7f0800b0; - public static final int tabMode = 0x7f0800b1; - public static final int text = 0x7f0800b3; - public static final int text2 = 0x7f0800b4; - public static final int textSpacerNoButtons = 0x7f0800b5; - public static final int time = 0x7f0800b6; - public static final int title = 0x7f0800b7; - public static final int title_template = 0x7f0800b8; - public static final int topPanel = 0x7f0800c9; - public static final int up = 0x7f0800db; - public static final int useLogo = 0x7f0800dc; - public static final int withText = 0x7f0800dd; - public static final int wrap_content = 0x7f0800e6; + public static final int custom = 0x7f08002f; + public static final int customPanel = 0x7f080030; + public static final int decor_content_parent = 0x7f080031; + public static final int default_activity_button = 0x7f080032; + public static final int disableHome = 0x7f080033; + public static final int edit_query = 0x7f080034; + public static final int end = 0x7f080035; + public static final int end_padder = 0x7f080036; + public static final int expand_activities_button = 0x7f080037; + public static final int expanded_menu = 0x7f080038; + public static final int home = 0x7f08004f; + public static final int homeAsUp = 0x7f080050; + public static final int icon = 0x7f080051; + public static final int ifRoom = 0x7f080053; + public static final int image = 0x7f080054; + public static final int info = 0x7f080055; + public static final int line1 = 0x7f080064; + public static final int line3 = 0x7f080065; + public static final int listMode = 0x7f080067; + public static final int list_item = 0x7f080068; + public static final int media_actions = 0x7f080069; + public static final int middle = 0x7f08006a; + public static final int multiply = 0x7f08006b; + public static final int never = 0x7f08006c; + public static final int none = 0x7f08006d; + public static final int normal = 0x7f08006e; + public static final int parentPanel = 0x7f080072; + public static final int progress_circular = 0x7f080077; + public static final int progress_horizontal = 0x7f080078; + public static final int radio = 0x7f080079; + public static final int screen = 0x7f08007c; + public static final int scrollIndicatorDown = 0x7f08007d; + public static final int scrollIndicatorUp = 0x7f08007e; + public static final int scrollView = 0x7f08007f; + public static final int search_badge = 0x7f080080; + public static final int search_bar = 0x7f080081; + public static final int search_button = 0x7f080082; + public static final int search_close_btn = 0x7f080083; + public static final int search_edit_frame = 0x7f080084; + public static final int search_go_btn = 0x7f080085; + public static final int search_mag_icon = 0x7f080086; + public static final int search_plate = 0x7f080087; + public static final int search_src_text = 0x7f080088; + public static final int search_voice_btn = 0x7f080089; + public static final int select_dialog_listview = 0x7f08008a; + public static final int shortcut = 0x7f08009f; + public static final int showCustom = 0x7f0800a4; + public static final int showHome = 0x7f0800a5; + public static final int showTitle = 0x7f0800a6; + public static final int spacer = 0x7f0800a7; + public static final int split_action_bar = 0x7f0800a8; + public static final int src_atop = 0x7f0800a9; + public static final int src_in = 0x7f0800aa; + public static final int src_over = 0x7f0800ab; + public static final int status_bar_latest_event_content = 0x7f0800b2; + public static final int submit_area = 0x7f0800b3; + public static final int tabMode = 0x7f0800b4; + public static final int text = 0x7f0800b6; + public static final int text2 = 0x7f0800b7; + public static final int textSpacerNoButtons = 0x7f0800b8; + public static final int time = 0x7f0800b9; + public static final int title = 0x7f0800ba; + public static final int title_template = 0x7f0800bb; + public static final int topPanel = 0x7f0800cc; + public static final int up = 0x7f0800de; + public static final int useLogo = 0x7f0800df; + public static final int withText = 0x7f0800e0; + public static final int wrap_content = 0x7f0800e9; } public static final class integer { public static final int abc_config_activityDefaultDur = 0x7f090000; @@ -619,7 +619,7 @@ public final class R { public static final int abc_shareactionprovider_share_with = 0x7f0d0010; public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011; public static final int abc_toolbar_collapse_description = 0x7f0d0012; - public static final int status_bar_notification_info_overflow = 0x7f0d0066; + public static final int status_bar_notification_info_overflow = 0x7f0d0068; } public static final class style { public static final int AlertDialog_AppCompat = 0x7f0e0000; diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 4060f96..fd96135 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1390,12 +1390,12 @@ @drawable/abc_text_cursor_material