From 3b0eb15646cc9ac60a7661cf25d5a1a528bae404 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 27 Aug 2019 16:46:46 +0800 Subject: This app now has an icon (finally)git statusgit statusgit status Add a credits page in settings. Use another error view and no comment placeholder. --- .../res/drawable-v24/ic_launcher_background.xml | 74 +++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 34 ----- app/src/main/res/drawable/error_image.xml | 54 +++++++ app/src/main/res/drawable/gold.png | Bin 18745 -> 0 bytes app/src/main/res/drawable/gold.xml | 9 ++ .../main/res/drawable/ic_launcher_background.xml | 170 --------------------- .../main/res/drawable/ic_launcher_foreground.xml | 60 ++++++++ .../res/drawable/load_post_error_indicator.png | Bin 60464 -> 0 bytes .../main/res/drawable/no_comment_placeholder.png | Bin 60561 -> 0 bytes app/src/main/res/layout/item_acknowledgement.xml | 5 +- .../item_load_comments_failed_placeholder.xml | 2 +- .../res/layout/item_no_comment_placeholder.xml | 2 +- app/src/main/res/layout/item_post.xml | 1 + app/src/main/res/layout/item_post_detail.xml | 1 + app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 4809 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 4809 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 2993 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 2993 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 6830 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 6830 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 10847 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 10847 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 15190 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 15190 bytes app/src/main/res/values/strings.xml | 17 +++ app/src/main/res/xml/about_preferences.xml | 13 ++ app/src/main/res/xml/credits_preferences.xml | 44 ++++++ app/src/main/res/xml/main_preferences.xml | 6 +- 30 files changed, 285 insertions(+), 215 deletions(-) create mode 100644 app/src/main/res/drawable-v24/ic_launcher_background.xml delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/error_image.xml delete mode 100644 app/src/main/res/drawable/gold.png create mode 100644 app/src/main/res/drawable/gold.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/drawable/load_post_error_indicator.png delete mode 100644 app/src/main/res/drawable/no_comment_placeholder.png create mode 100644 app/src/main/res/xml/about_preferences.xml create mode 100644 app/src/main/res/xml/credits_preferences.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 00000000..8863072a --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21db..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/error_image.xml b/app/src/main/res/drawable/error_image.xml new file mode 100644 index 00000000..88817417 --- /dev/null +++ b/app/src/main/res/drawable/error_image.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/gold.png b/app/src/main/res/drawable/gold.png deleted file mode 100644 index df04fbe8..00000000 Binary files a/app/src/main/res/drawable/gold.png and /dev/null differ diff --git a/app/src/main/res/drawable/gold.xml b/app/src/main/res/drawable/gold.xml new file mode 100644 index 00000000..333984f4 --- /dev/null +++ b/app/src/main/res/drawable/gold.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc53..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..52aa137b --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/load_post_error_indicator.png b/app/src/main/res/drawable/load_post_error_indicator.png deleted file mode 100644 index a067fb1e..00000000 Binary files a/app/src/main/res/drawable/load_post_error_indicator.png and /dev/null differ diff --git a/app/src/main/res/drawable/no_comment_placeholder.png b/app/src/main/res/drawable/no_comment_placeholder.png deleted file mode 100644 index 62a3668f..00000000 Binary files a/app/src/main/res/drawable/no_comment_placeholder.png and /dev/null differ diff --git a/app/src/main/res/layout/item_acknowledgement.xml b/app/src/main/res/layout/item_acknowledgement.xml index 543c6829..6ad6deb8 100644 --- a/app/src/main/res/layout/item_acknowledgement.xml +++ b/app/src/main/res/layout/item_acknowledgement.xml @@ -2,7 +2,10 @@ diff --git a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml index 9d8f9f7d..094d58bc 100644 --- a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml +++ b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml @@ -9,7 +9,7 @@ android:layout_width="150dp" android:layout_height="150dp" android:layout_gravity="center_horizontal" - android:src="@drawable/load_post_error_indicator" /> + android:src="@drawable/error_image" /> + android:src="@drawable/error_image" /> - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe..bbd3e021 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f59082..58c5dfcf 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b523998..58c5dfcf 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd6..2f72c89d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c76..2f72c89d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd80..63b45e6d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca609..63b45e6d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe0..1d205893 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b410..1d205893 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebdd..0b2aad42 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13c..0b2aad42 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 762a5bf6..ecd92af2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -261,7 +261,24 @@ Device default Lazy Mode Interval Enable NSFW + About Acknowledgement + Credits + Icon Foreground + Technology vector created by freepik - www.freepik.com + Icon Background + Background vector created by freepik - www.freepik.com + Error Image + Technology vector created by freepik - www.freepik.com + Subreddit and User Placeholder + Technology vector created by freepik - www.freepik.com + Gilded Icon + Icon made by Freepik from www.flaticon.com + Crosspost Icon + Icon made by Freepik from www.flaticon.com + Thumbtack Icon + Icon made by Freepik from www.flaticon.com + Material Icons Cannot get the link diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml new file mode 100644 index 00000000..a16237e4 --- /dev/null +++ b/app/src/main/res/xml/about_preferences.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/credits_preferences.xml b/app/src/main/res/xml/credits_preferences.xml new file mode 100644 index 00000000..d5a5f580 --- /dev/null +++ b/app/src/main/res/xml/credits_preferences.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index 7d482fae..bdf0f2a6 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -31,8 +30,7 @@ app:title="@string/settings_enable_nsfw_title"/> + app:title="@string/settings_about_master_title" + app:fragment="Settings.AboutPreferenceFragment" /> \ No newline at end of file -- cgit v1.2.3