From 6992b1591b2fb422e3500e1ad52fd5f1a03e5b2e Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 23 Aug 2015 12:31:56 +0800 Subject: [PATCH] Normalized vector drawable resources naming --- .../ehviewer/ui/scene/AbsDragSortScene.java | 2 +- .../hippo/ehviewer/ui/scene/CommentScene.java | 2 +- .../ehviewer/ui/scene/GalleryDetailScene.java | 4 +- .../ehviewer/ui/scene/GalleryListScene.java | 2 +- .../hippo/ehviewer/ui/scene/InfoScene.java | 2 +- .../ehviewer/ui/scene/MainSettingsScene.java | 12 +++--- .../ui/scene/ModifyQuickSearchScene.java | 2 +- .../preference/AdvancedSettingsScene.java | 2 +- .../ui/scene/preference/DirPickScene.java | 2 +- .../preference/DisplaySettingsScene.java | 2 +- .../preference/DownloadSettingsScene.java | 2 +- .../ui/scene/preference/EHSettingsScene.java | 2 +- .../preference/ExcludedLanguagesScene.java | 2 +- .../preference/ReadingSettingsScene.java | 2 +- .../hippo/ehviewer/widget/ListSearchBar.java | 2 +- .../com/hippo/ehviewer/widget/RatingView.java | 6 +-- .../ehviewer/widget/SimpleRatingView.java | 6 +-- ...ft_dark.xml => ic_arrow_left_dark_x24.xml} | 0 ...w_up_dark.xml => ic_arrow_up_dark_x24.xml} | 0 ...ccent.xml => ic_black_mesa_accent_x24.xml} | 0 ...nt_x24.xml => ic_book_open_accent_x24.xml} | 0 ...ml => ic_cellphone_android_accent_x24.xml} | 0 ...ft.xml => ic_chevron_left_primary_x48.xml} | 8 ++-- ...t.xml => ic_chevron_right_primary_x48.xml} | 9 ++--- ..._accent.xml => ic_download_accent_x24.xml} | 0 ...load_dark.xml => ic_download_dark_x24.xml} | 0 .../{ic_download.xml => ic_download_x24.xml} | 0 .../res/drawable/ic_drawer_list_download.xml | 4 +- .../main/res/drawable/ic_drawer_list_fire.xml | 4 +- .../res/drawable/ic_drawer_list_heart.xml | 4 +- .../res/drawable/ic_drawer_list_history.xml | 4 +- .../main/res/drawable/ic_drawer_list_home.xml | 4 +- .../res/drawable/ic_drawer_list_settings.xml | 4 +- ..._theme_accent.xml => ic_eh_accent_x24.xml} | 0 ...{ic_fire_dark.xml => ic_fire_dark_x24.xml} | 0 .../drawable/{ic_fire.xml => ic_fire_x24.xml} | 0 .../{ic_folder.xml => ic_folder_x24.xml} | 0 ...c_go_to_dark.xml => ic_go_to_dark_x24.xml} | 0 ...c_heart_dark.xml => ic_heart_dark_x24.xml} | 0 ...y.xml => ic_heart_outline_primary_x48.xml} | 0 ...e_primary.xml => ic_heart_primary_x48.xml} | 0 .../{ic_heart.xml => ic_heart_x24.xml} | 0 ...help_circle.xml => ic_help_circle_x24.xml} | 0 ...story_dark.xml => ic_history_dark_x24.xml} | 0 .../{ic_history.xml => ic_history_x24.xml} | 0 ...{ic_home_dark.xml => ic_home_dark_x24.xml} | 0 .../drawable/{ic_home.xml => ic_home_x24.xml} | 0 app/src/main/res/drawable/ic_sad.xml | 5 ++- app/src/main/res/drawable/ic_sad_x168.xml | 39 +++++++++++++++++++ ...search_dark.xml => ic_search_dark_x24.xml} | 0 .../{ic_search.xml => ic_search_x24.xml} | 0 ...ings_dark.xml => ic_settings_dark_x24.xml} | 0 .../{ic_settings.xml => ic_settings_x24.xml} | 0 ...e_primary.xml => ic_share_primary_x48.xml} | 0 ...ar_theme_accent.xml => ic_star_accent.xml} | 0 ...eme_accent.xml => ic_star_half_accent.xml} | 0 ...{ic_star_half.xml => ic_star_half_x16.xml} | 8 ++-- ..._accent.xml => ic_star_outline_accent.xml} | 0 ...ar_outline.xml => ic_star_outline_x16.xml} | 8 ++-- .../drawable/{ic_star.xml => ic_star_x16.xml} | 8 ++-- ....xml => ic_thumbs_up_down_primary_x48.xml} | 0 ...mary.xml => ic_water_pump_primary_x48.xml} | 0 .../layout-v21/drawer_right_gallery_list.xml | 2 +- .../widget_appbar_recycler_view.xml | 2 +- .../res/layout/drawer_right_gallery_list.xml | 2 +- .../main/res/layout/gallery_detail_action.xml | 6 +-- app/src/main/res/layout/item_dir_explorer.xml | 2 +- .../main/res/layout/preview_controller.xml | 4 +- app/src/main/res/layout/scene_dir_pick.xml | 2 +- .../main/res/layout/scene_gallery_detail.xml | 6 +-- .../main/res/layout/scene_gallery_list.xml | 4 +- app/src/main/res/layout/search_normal.xml | 2 +- .../layout/widget_appbar_recycler_view.xml | 2 +- .../main/res/layout/widget_content_layout.xml | 6 +-- 74 files changed, 121 insertions(+), 82 deletions(-) rename app/src/main/res/drawable/{ic_arrow_left_dark.xml => ic_arrow_left_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_arrow_up_dark.xml => ic_arrow_up_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_black_mesa_theme_accent.xml => ic_black_mesa_accent_x24.xml} (100%) rename app/src/main/res/drawable/{ic_book_open_theme_accent_x24.xml => ic_book_open_accent_x24.xml} (100%) rename app/src/main/res/drawable/{ic_cellphone_android_theme_accent.xml => ic_cellphone_android_accent_x24.xml} (100%) rename app/src/main/res/drawable/{ic_chevron_left.xml => ic_chevron_left_primary_x48.xml} (92%) rename app/src/main/res/drawable/{ic_chevron_right.xml => ic_chevron_right_primary_x48.xml} (92%) rename app/src/main/res/drawable/{ic_download_theme_accent.xml => ic_download_accent_x24.xml} (100%) rename app/src/main/res/drawable/{ic_download_dark.xml => ic_download_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_download.xml => ic_download_x24.xml} (100%) rename app/src/main/res/drawable/{ic_eh_theme_accent.xml => ic_eh_accent_x24.xml} (100%) rename app/src/main/res/drawable/{ic_fire_dark.xml => ic_fire_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_fire.xml => ic_fire_x24.xml} (100%) rename app/src/main/res/drawable/{ic_folder.xml => ic_folder_x24.xml} (100%) rename app/src/main/res/drawable/{ic_go_to_dark.xml => ic_go_to_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_heart_dark.xml => ic_heart_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_heart_outline_theme_primary.xml => ic_heart_outline_primary_x48.xml} (100%) rename app/src/main/res/drawable/{ic_heart_theme_primary.xml => ic_heart_primary_x48.xml} (100%) rename app/src/main/res/drawable/{ic_heart.xml => ic_heart_x24.xml} (100%) rename app/src/main/res/drawable/{ic_help_circle.xml => ic_help_circle_x24.xml} (100%) rename app/src/main/res/drawable/{ic_history_dark.xml => ic_history_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_history.xml => ic_history_x24.xml} (100%) rename app/src/main/res/drawable/{ic_home_dark.xml => ic_home_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_home.xml => ic_home_x24.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_sad_x168.xml rename app/src/main/res/drawable/{ic_search_dark.xml => ic_search_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_search.xml => ic_search_x24.xml} (100%) rename app/src/main/res/drawable/{ic_settings_dark.xml => ic_settings_dark_x24.xml} (100%) rename app/src/main/res/drawable/{ic_settings.xml => ic_settings_x24.xml} (100%) rename app/src/main/res/drawable/{ic_share_theme_primary.xml => ic_share_primary_x48.xml} (100%) rename app/src/main/res/drawable/{ic_star_theme_accent.xml => ic_star_accent.xml} (100%) rename app/src/main/res/drawable/{ic_star_half_theme_accent.xml => ic_star_half_accent.xml} (100%) rename app/src/main/res/drawable/{ic_star_half.xml => ic_star_half_x16.xml} (92%) rename app/src/main/res/drawable/{ic_star_outline_theme_accent.xml => ic_star_outline_accent.xml} (100%) rename app/src/main/res/drawable/{ic_star_outline.xml => ic_star_outline_x16.xml} (92%) rename app/src/main/res/drawable/{ic_star.xml => ic_star_x16.xml} (92%) rename app/src/main/res/drawable/{ic_thumbs_up_down_theme_primary.xml => ic_thumbs_up_down_primary_x48.xml} (100%) rename app/src/main/res/drawable/{ic_water_pump_theme_primary.xml => ic_water_pump_primary_x48.xml} (100%) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/AbsDragSortScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/AbsDragSortScene.java index 7657f1fbb..cb8b1b845 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/AbsDragSortScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/AbsDragSortScene.java @@ -61,7 +61,7 @@ public abstract class AbsDragSortScene extends AppbarScene { super.onCreate(rebirth); setContentView(R.layout.scene_abs_drag_sort_scene); setTitle(getTitle()); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); Resources resources = getStageActivity().getResources(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CommentScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CommentScene.java index 595c23415..85c081d0a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CommentScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CommentScene.java @@ -57,7 +57,7 @@ public class CommentScene extends AppbarScene implements EasyRecyclerView.OnItem setContentView(R.layout.scene_comment); setTitle(R.string.comments); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); mRecyclerView = (EasyRecyclerView) findViewById(R.id.recycler_view); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 22ad6973a..d86cc793f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -436,9 +436,9 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener, Drawable favoriteDrawable; if (gd.isFavored) { - favoriteDrawable = resources.getDrawable(R.drawable.ic_heart_theme_primary); + favoriteDrawable = resources.getDrawable(R.drawable.ic_heart_primary_x48); } else { - favoriteDrawable = resources.getDrawable(R.drawable.ic_heart_outline_theme_primary); + favoriteDrawable = resources.getDrawable(R.drawable.ic_heart_outline_primary_x48); } if (favoriteDrawable == null) { throw new IllegalStateException("Can't get favorite drawable"); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 30aaf2525..30d4f75a2 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -324,7 +324,7 @@ public final class GalleryListScene extends Scene implements ListSearchBar.Helpe mCornerFabOriginalBottom = mFabLayout.getPaddingBottom(); mAddDeleteDrawable = new AddDeleteDrawable(getStageActivity()); mAddDeleteDrawable.setColor(mResources.getColor(R.color.primary_drawable_dark)); - mSearchDrawable = mResources.getDrawable(R.drawable.ic_search_dark); + mSearchDrawable = mResources.getDrawable(R.drawable.ic_search_dark_x24); mCornerFab.setDrawable(mAddDeleteDrawable); mRightDrawerView = new AppbarRecyclerView(getStageActivity()); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/InfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/InfoScene.java index a0a493a35..96ce47477 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/InfoScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/InfoScene.java @@ -59,7 +59,7 @@ public class InfoScene extends AppbarScene implements EasyRecyclerView.OnItemLon setContentView(R.layout.scene_info); setTitle(R.string.info); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); Context context = getStageActivity(); mResources = context.getResources(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java index 319a9ed20..cd884dad8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java @@ -38,7 +38,7 @@ public final class MainSettingsScene extends PreferenceHeaderScene { ((ContentActivity) getStageActivity()).setDrawerListActivatedPosition(ContentActivity.DRAWER_LIST_SETTINGS); setTitle(R.string.settings); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceHeaders(getPreferenceHeaders()); } @@ -46,23 +46,23 @@ public final class MainSettingsScene extends PreferenceHeaderScene { private PreferenceHeader[] getPreferenceHeaders() { return new PreferenceHeader[] { newPreferenceHeader( - R.drawable.ic_cellphone_android_theme_accent, + R.drawable.ic_cellphone_android_accent_x24, R.string.settings_display, DisplaySettingsScene.class), newPreferenceHeader( - R.drawable.ic_book_open_theme_accent_x24, + R.drawable.ic_book_open_accent_x24, R.string.settings_reading, ReadingSettingsScene.class), newPreferenceHeader( - R.drawable.ic_eh_theme_accent, + R.drawable.ic_eh_accent_x24, R.string.settings_eh, EHSettingsScene.class), newPreferenceHeader( - R.drawable.ic_download_theme_accent, + R.drawable.ic_download_accent_x24, R.string.settings_download, DownloadSettingsScene.class), newPreferenceHeader( - R.drawable.ic_black_mesa_theme_accent, + R.drawable.ic_black_mesa_accent_x24, R.string.settings_advanced, AdvancedSettingsScene.class) }; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java index 63b8029e4..514a86469 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java @@ -57,7 +57,7 @@ public class ModifyQuickSearchScene extends AppbarScene implements SearchLayout. protected void onCreate(boolean rebirth) { super.onCreate(rebirth); setContentView(R.layout.scene_modify_quick_search); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); Resources resources = getStageActivity().getResources(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/AdvancedSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/AdvancedSettingsScene.java index 9d4fec28b..10e61df5f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/AdvancedSettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/AdvancedSettingsScene.java @@ -43,7 +43,7 @@ public class AdvancedSettingsScene extends PreferenceScene implements super.onCreate(rebirth); setTitle(R.string.settings); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceSet(getPreferenceSet()); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DirPickScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DirPickScene.java index 115e4aed6..68597db3f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DirPickScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DirPickScene.java @@ -77,7 +77,7 @@ public class DirPickScene extends AppbarScene implements View.OnClickListener, setContentView(R.layout.scene_dir_pick); setTitle(R.string.dir_pick); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); Announcer announcer = getAnnouncer(); if (announcer != null) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DisplaySettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DisplaySettingsScene.java index 6f7faa6da..2cb5f532e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DisplaySettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DisplaySettingsScene.java @@ -31,7 +31,7 @@ public class DisplaySettingsScene extends PreferenceScene { super.onCreate(rebirth); setTitle(R.string.settings); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceSet(getPreferenceSet()); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DownloadSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DownloadSettingsScene.java index b1d49d4da..af2403f2a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DownloadSettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DownloadSettingsScene.java @@ -42,7 +42,7 @@ public class DownloadSettingsScene extends PreferenceScene implements Preference super.onCreate(rebirth); setTitle(R.string.settings_download); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceSet(getPreferenceSet()); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/EHSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/EHSettingsScene.java index e8c1babcf..5e2cfcf55 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/EHSettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/EHSettingsScene.java @@ -39,7 +39,7 @@ public final class EHSettingsScene extends PreferenceScene implements Preference super.onCreate(rebirth); setTitle(R.string.settings_eh); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceSet(getPreferenceSet()); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ExcludedLanguagesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ExcludedLanguagesScene.java index 3c12b354b..b8af2e70f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ExcludedLanguagesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ExcludedLanguagesScene.java @@ -125,7 +125,7 @@ public class ExcludedLanguagesScene extends AppbarScene implements View.OnClickL setContentView(R.layout.scene_excluded_languages); setTitle(R.string.excluded_languages); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); mCancel = findViewById(R.id.cancel); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ReadingSettingsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ReadingSettingsScene.java index 8bab52df3..ed25861f1 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ReadingSettingsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ReadingSettingsScene.java @@ -36,7 +36,7 @@ public class ReadingSettingsScene extends PreferenceScene implements ListPrefere super.onCreate(rebirth); setTitle(R.string.settings_reading); - setIcon(R.drawable.ic_arrow_left_dark); + setIcon(R.drawable.ic_arrow_left_dark_x24); setPreferenceSet(getPreferenceSet()); } diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ListSearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/ListSearchBar.java index 419611227..160c84562 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/ListSearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ListSearchBar.java @@ -69,7 +69,7 @@ public class ListSearchBar extends SearchBar implements Messenger.Receiver { public void setSource(int source) { if (mSource != source) { Resources resources = getContext().getResources(); - Drawable searchImage = resources.getDrawable(R.drawable.ic_search); + Drawable searchImage = resources.getDrawable(R.drawable.ic_search_x24); SpannableStringBuilder ssb = new SpannableStringBuilder(" "); ssb.append(String.format(resources.getString(R.string.search_bar_hint), EhUrl.getReadableHost(source))); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/RatingView.java b/app/src/main/java/com/hippo/ehviewer/widget/RatingView.java index ed247dda2..fda39345c 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/RatingView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/RatingView.java @@ -47,9 +47,9 @@ public class RatingView extends View { } private void init(Context context, AttributeSet attrs) { - mStarDrawable = context.getResources().getDrawable(R.drawable.ic_star_theme_accent); - mStarHalfDrawable = context.getResources().getDrawable(R.drawable.ic_star_half_theme_accent); - mStarOutlineDrawable = context.getResources().getDrawable(R.drawable.ic_star_outline_theme_accent); + mStarDrawable = context.getResources().getDrawable(R.drawable.ic_star_accent); + mStarHalfDrawable = context.getResources().getDrawable(R.drawable.ic_star_half_accent); + mStarOutlineDrawable = context.getResources().getDrawable(R.drawable.ic_star_outline_accent); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RatingView); mStarSize = a.getDimension(R.styleable.RatingView_starSize, 10); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.java b/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.java index 94afb8731..d22868e13 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.java @@ -53,9 +53,9 @@ public class SimpleRatingView extends View { private void init(Context context) { Resources resources = context.getResources(); - mStarDrawable = resources.getDrawable(R.drawable.ic_star); - mStarHalfDrawable = resources.getDrawable(R.drawable.ic_star_half); - mStarOutlineDrawable = resources.getDrawable(R.drawable.ic_star_outline); + mStarDrawable = resources.getDrawable(R.drawable.ic_star_x16); + mStarHalfDrawable = resources.getDrawable(R.drawable.ic_star_half_x16); + mStarOutlineDrawable = resources.getDrawable(R.drawable.ic_star_outline_x16); mRatingSize = resources.getDimensionPixelOffset(R.dimen.rating_size); mRatingInterval = resources.getDimensionPixelOffset(R.dimen.rating_interval); diff --git a/app/src/main/res/drawable/ic_arrow_left_dark.xml b/app/src/main/res/drawable/ic_arrow_left_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_left_dark.xml rename to app/src/main/res/drawable/ic_arrow_left_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_arrow_up_dark.xml b/app/src/main/res/drawable/ic_arrow_up_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_dark.xml rename to app/src/main/res/drawable/ic_arrow_up_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_black_mesa_theme_accent.xml b/app/src/main/res/drawable/ic_black_mesa_accent_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_black_mesa_theme_accent.xml rename to app/src/main/res/drawable/ic_black_mesa_accent_x24.xml diff --git a/app/src/main/res/drawable/ic_book_open_theme_accent_x24.xml b/app/src/main/res/drawable/ic_book_open_accent_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_book_open_theme_accent_x24.xml rename to app/src/main/res/drawable/ic_book_open_accent_x24.xml diff --git a/app/src/main/res/drawable/ic_cellphone_android_theme_accent.xml b/app/src/main/res/drawable/ic_cellphone_android_accent_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_cellphone_android_theme_accent.xml rename to app/src/main/res/drawable/ic_cellphone_android_accent_x24.xml diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left_primary_x48.xml similarity index 92% rename from app/src/main/res/drawable/ic_chevron_left.xml rename to app/src/main/res/drawable/ic_chevron_left_primary_x48.xml index b8969b2ff..45fe9f858 100644 --- a/app/src/main/res/drawable/ic_chevron_left.xml +++ b/app/src/main/res/drawable/ic_chevron_left_primary_x48.xml @@ -20,13 +20,13 @@ xmlns:auto="http://schemas.android.com/apk/res-auto" tools:targetApi="21" - auto:width="24dp" - auto:height="24dp" + auto:width="48dp" + auto:height="48dp" auto:viewportWidth="24" auto:viewportHeight="24" - android:width="24dp" - android:height="24dp" + android:width="48dp" + android:height="48dp" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right_primary_x48.xml similarity index 92% rename from app/src/main/res/drawable/ic_chevron_right.xml rename to app/src/main/res/drawable/ic_chevron_right_primary_x48.xml index 2fc4d8d2b..6d7c9f1c0 100644 --- a/app/src/main/res/drawable/ic_chevron_right.xml +++ b/app/src/main/res/drawable/ic_chevron_right_primary_x48.xml @@ -1,5 +1,4 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_drawer_list_fire.xml b/app/src/main/res/drawable/ic_drawer_list_fire.xml index 44ff76d76..418e9bcfc 100644 --- a/app/src/main/res/drawable/ic_drawer_list_fire.xml +++ b/app/src/main/res/drawable/ic_drawer_list_fire.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - - + + diff --git a/app/src/main/res/drawable/ic_drawer_list_heart.xml b/app/src/main/res/drawable/ic_drawer_list_heart.xml index e3ebf36f2..1e484639c 100644 --- a/app/src/main/res/drawable/ic_drawer_list_heart.xml +++ b/app/src/main/res/drawable/ic_drawer_list_heart.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - - + + diff --git a/app/src/main/res/drawable/ic_drawer_list_history.xml b/app/src/main/res/drawable/ic_drawer_list_history.xml index dd09bc6ca..b25847ca9 100644 --- a/app/src/main/res/drawable/ic_drawer_list_history.xml +++ b/app/src/main/res/drawable/ic_drawer_list_history.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - - + + diff --git a/app/src/main/res/drawable/ic_drawer_list_home.xml b/app/src/main/res/drawable/ic_drawer_list_home.xml index 5a3afd835..bbf742685 100644 --- a/app/src/main/res/drawable/ic_drawer_list_home.xml +++ b/app/src/main/res/drawable/ic_drawer_list_home.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - - + + diff --git a/app/src/main/res/drawable/ic_drawer_list_settings.xml b/app/src/main/res/drawable/ic_drawer_list_settings.xml index b0b19231b..404f78195 100644 --- a/app/src/main/res/drawable/ic_drawer_list_settings.xml +++ b/app/src/main/res/drawable/ic_drawer_list_settings.xml @@ -14,6 +14,6 @@ ~ limitations under the License. --> - - + + diff --git a/app/src/main/res/drawable/ic_eh_theme_accent.xml b/app/src/main/res/drawable/ic_eh_accent_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_eh_theme_accent.xml rename to app/src/main/res/drawable/ic_eh_accent_x24.xml diff --git a/app/src/main/res/drawable/ic_fire_dark.xml b/app/src/main/res/drawable/ic_fire_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_fire_dark.xml rename to app/src/main/res/drawable/ic_fire_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_fire.xml b/app/src/main/res/drawable/ic_fire_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_fire.xml rename to app/src/main/res/drawable/ic_fire_x24.xml diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_folder.xml rename to app/src/main/res/drawable/ic_folder_x24.xml diff --git a/app/src/main/res/drawable/ic_go_to_dark.xml b/app/src/main/res/drawable/ic_go_to_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_go_to_dark.xml rename to app/src/main/res/drawable/ic_go_to_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_heart_dark.xml b/app/src/main/res/drawable/ic_heart_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart_dark.xml rename to app/src/main/res/drawable/ic_heart_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_heart_outline_theme_primary.xml b/app/src/main/res/drawable/ic_heart_outline_primary_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart_outline_theme_primary.xml rename to app/src/main/res/drawable/ic_heart_outline_primary_x48.xml diff --git a/app/src/main/res/drawable/ic_heart_theme_primary.xml b/app/src/main/res/drawable/ic_heart_primary_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart_theme_primary.xml rename to app/src/main/res/drawable/ic_heart_primary_x48.xml diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart.xml rename to app/src/main/res/drawable/ic_heart_x24.xml diff --git a/app/src/main/res/drawable/ic_help_circle.xml b/app/src/main/res/drawable/ic_help_circle_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_help_circle.xml rename to app/src/main/res/drawable/ic_help_circle_x24.xml diff --git a/app/src/main/res/drawable/ic_history_dark.xml b/app/src/main/res/drawable/ic_history_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_history_dark.xml rename to app/src/main/res/drawable/ic_history_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_history.xml rename to app/src/main/res/drawable/ic_history_x24.xml diff --git a/app/src/main/res/drawable/ic_home_dark.xml b/app/src/main/res/drawable/ic_home_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_home_dark.xml rename to app/src/main/res/drawable/ic_home_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_home.xml rename to app/src/main/res/drawable/ic_home_x24.xml diff --git a/app/src/main/res/drawable/ic_sad.xml b/app/src/main/res/drawable/ic_sad.xml index 1d6b04e40..8af927ed8 100644 --- a/app/src/main/res/drawable/ic_sad.xml +++ b/app/src/main/res/drawable/ic_sad.xml @@ -1,14 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_search_dark.xml b/app/src/main/res/drawable/ic_search_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_search_dark.xml rename to app/src/main/res/drawable/ic_search_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_search.xml rename to app/src/main/res/drawable/ic_search_x24.xml diff --git a/app/src/main/res/drawable/ic_settings_dark.xml b/app/src/main/res/drawable/ic_settings_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_dark.xml rename to app/src/main/res/drawable/ic_settings_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings.xml rename to app/src/main/res/drawable/ic_settings_x24.xml diff --git a/app/src/main/res/drawable/ic_share_theme_primary.xml b/app/src/main/res/drawable/ic_share_primary_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_theme_primary.xml rename to app/src/main/res/drawable/ic_share_primary_x48.xml diff --git a/app/src/main/res/drawable/ic_star_theme_accent.xml b/app/src/main/res/drawable/ic_star_accent.xml similarity index 100% rename from app/src/main/res/drawable/ic_star_theme_accent.xml rename to app/src/main/res/drawable/ic_star_accent.xml diff --git a/app/src/main/res/drawable/ic_star_half_theme_accent.xml b/app/src/main/res/drawable/ic_star_half_accent.xml similarity index 100% rename from app/src/main/res/drawable/ic_star_half_theme_accent.xml rename to app/src/main/res/drawable/ic_star_half_accent.xml diff --git a/app/src/main/res/drawable/ic_star_half.xml b/app/src/main/res/drawable/ic_star_half_x16.xml similarity index 92% rename from app/src/main/res/drawable/ic_star_half.xml rename to app/src/main/res/drawable/ic_star_half_x16.xml index 97e88f585..58aec3a60 100644 --- a/app/src/main/res/drawable/ic_star_half.xml +++ b/app/src/main/res/drawable/ic_star_half_x16.xml @@ -19,13 +19,13 @@ xmlns:auto="http://schemas.android.com/apk/res-auto" tools:targetApi="21" - auto:width="24dp" - auto:height="24dp" + auto:width="16dp" + auto:height="16dp" auto:viewportWidth="24" auto:viewportHeight="24" - android:width="24dp" - android:height="24dp" + android:width="16dp" + android:height="16dp" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_star_outline_theme_accent.xml b/app/src/main/res/drawable/ic_star_outline_accent.xml similarity index 100% rename from app/src/main/res/drawable/ic_star_outline_theme_accent.xml rename to app/src/main/res/drawable/ic_star_outline_accent.xml diff --git a/app/src/main/res/drawable/ic_star_outline.xml b/app/src/main/res/drawable/ic_star_outline_x16.xml similarity index 92% rename from app/src/main/res/drawable/ic_star_outline.xml rename to app/src/main/res/drawable/ic_star_outline_x16.xml index bbc03d9c4..b09ff8666 100644 --- a/app/src/main/res/drawable/ic_star_outline.xml +++ b/app/src/main/res/drawable/ic_star_outline_x16.xml @@ -19,13 +19,13 @@ xmlns:auto="http://schemas.android.com/apk/res-auto" tools:targetApi="21" - auto:width="24dp" - auto:height="24dp" + auto:width="16dp" + auto:height="16dp" auto:viewportWidth="24" auto:viewportHeight="24" - android:width="24dp" - android:height="24dp" + android:width="16dp" + android:height="16dp" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star_x16.xml similarity index 92% rename from app/src/main/res/drawable/ic_star.xml rename to app/src/main/res/drawable/ic_star_x16.xml index 20ccfbfe3..ecdf47bc9 100644 --- a/app/src/main/res/drawable/ic_star.xml +++ b/app/src/main/res/drawable/ic_star_x16.xml @@ -19,13 +19,13 @@ xmlns:auto="http://schemas.android.com/apk/res-auto" tools:targetApi="21" - auto:width="24dp" - auto:height="24dp" + auto:width="16dp" + auto:height="16dp" auto:viewportWidth="24" auto:viewportHeight="24" - android:width="24dp" - android:height="24dp" + android:width="16dp" + android:height="16dp" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_thumbs_up_down_theme_primary.xml b/app/src/main/res/drawable/ic_thumbs_up_down_primary_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_thumbs_up_down_theme_primary.xml rename to app/src/main/res/drawable/ic_thumbs_up_down_primary_x48.xml diff --git a/app/src/main/res/drawable/ic_water_pump_theme_primary.xml b/app/src/main/res/drawable/ic_water_pump_primary_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_water_pump_theme_primary.xml rename to app/src/main/res/drawable/ic_water_pump_primary_x48.xml diff --git a/app/src/main/res/layout-v21/drawer_right_gallery_list.xml b/app/src/main/res/layout-v21/drawer_right_gallery_list.xml index a60be32e3..d8a6bad7f 100644 --- a/app/src/main/res/layout-v21/drawer_right_gallery_list.xml +++ b/app/src/main/res/layout-v21/drawer_right_gallery_list.xml @@ -49,7 +49,7 @@ android:layout_height="@dimen/appbar_height" android:layout_gravity="center_vertical" android:padding="@dimen/appbar_icon_margin" - android:src="@drawable/ic_settings_dark"/> + android:src="@drawable/ic_settings_dark_x24"/> diff --git a/app/src/main/res/layout-v21/widget_appbar_recycler_view.xml b/app/src/main/res/layout-v21/widget_appbar_recycler_view.xml index 296788e89..bb2dabde7 100644 --- a/app/src/main/res/layout-v21/widget_appbar_recycler_view.xml +++ b/app/src/main/res/layout-v21/widget_appbar_recycler_view.xml @@ -53,7 +53,7 @@ android:layout_height="@dimen/appbar_height" android:layout_gravity="center_vertical" android:padding="@dimen/appbar_icon_margin" - android:src="@drawable/ic_settings_dark"/> + android:src="@drawable/ic_settings_dark_x24"/> diff --git a/app/src/main/res/layout/drawer_right_gallery_list.xml b/app/src/main/res/layout/drawer_right_gallery_list.xml index 67bbb01e1..393b748f3 100644 --- a/app/src/main/res/layout/drawer_right_gallery_list.xml +++ b/app/src/main/res/layout/drawer_right_gallery_list.xml @@ -47,7 +47,7 @@ android:layout_height="@dimen/appbar_height" android:layout_gravity="center_vertical" android:padding="@dimen/appbar_icon_margin" - android:src="@drawable/ic_settings_dark"/> + android:src="@drawable/ic_settings_dark_x24"/> diff --git a/app/src/main/res/layout/gallery_detail_action.xml b/app/src/main/res/layout/gallery_detail_action.xml index 3e808fca2..c373d3390 100644 --- a/app/src/main/res/layout/gallery_detail_action.xml +++ b/app/src/main/res/layout/gallery_detail_action.xml @@ -67,7 +67,7 @@ android:layout_marginLeft="16dp" android:gravity="center_horizontal" android:drawablePadding="8dp" - android:drawableTop="@drawable/ic_water_pump_theme_primary"/> + android:drawableTop="@drawable/ic_water_pump_primary_x48"/> + android:drawableTop="@drawable/ic_share_primary_x48"/> + android:drawableTop="@drawable/ic_thumbs_up_down_primary_x48"/> diff --git a/app/src/main/res/layout/item_dir_explorer.xml b/app/src/main/res/layout/item_dir_explorer.xml index 08a69e069..5aa6fb8c2 100644 --- a/app/src/main/res/layout/item_dir_explorer.xml +++ b/app/src/main/res/layout/item_dir_explorer.xml @@ -20,5 +20,5 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:padding="8dp" - android:drawableLeft="@drawable/ic_folder" + android:drawableLeft="@drawable/ic_folder_x24" android:drawablePadding="8dp" /> diff --git a/app/src/main/res/layout/preview_controller.xml b/app/src/main/res/layout/preview_controller.xml index 6db78cf6f..4c7d40911 100644 --- a/app/src/main/res/layout/preview_controller.xml +++ b/app/src/main/res/layout/preview_controller.xml @@ -26,7 +26,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_gravity="center_vertical" - android:src="@drawable/ic_chevron_left"/> + android:src="@drawable/ic_chevron_left_primary_x48"/> + android:src="@drawable/ic_chevron_right_primary_x48"/> diff --git a/app/src/main/res/layout/scene_dir_pick.xml b/app/src/main/res/layout/scene_dir_pick.xml index aa538bb62..ce1d61b2e 100644 --- a/app/src/main/res/layout/scene_dir_pick.xml +++ b/app/src/main/res/layout/scene_dir_pick.xml @@ -52,7 +52,7 @@ android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:padding="4dp" - android:src="@drawable/ic_help_circle"/> + android:src="@drawable/ic_help_circle_x24"/> diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml index 912a1cf2f..ed846f27a 100644 --- a/app/src/main/res/layout/scene_gallery_detail.xml +++ b/app/src/main/res/layout/scene_gallery_detail.xml @@ -37,10 +37,10 @@ android:orientation="vertical"> + android:src="@drawable/ic_sad_x168"/> diff --git a/app/src/main/res/layout/widget_appbar_recycler_view.xml b/app/src/main/res/layout/widget_appbar_recycler_view.xml index fa2dcd855..c5ecfba6e 100644 --- a/app/src/main/res/layout/widget_appbar_recycler_view.xml +++ b/app/src/main/res/layout/widget_appbar_recycler_view.xml @@ -52,7 +52,7 @@ android:layout_height="@dimen/appbar_height" android:layout_gravity="center_vertical" android:padding="@dimen/appbar_icon_margin" - android:src="@drawable/ic_settings_dark"/> + android:src="@drawable/ic_settings_dark_x24"/> diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml index 2d1caa796..b5d80fac0 100644 --- a/app/src/main/res/layout/widget_content_layout.xml +++ b/app/src/main/res/layout/widget_content_layout.xml @@ -33,10 +33,10 @@ android:orientation="vertical"> + android:src="@drawable/ic_sad_x168"/>