yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalized vector drawable resources naming

Browse Source
This commit is contained in:
seven332 committed 2015-08-23 12:31:56 +08:00
1 parent 1728da0363
commit 6992b1591b
74 files changed
+121 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/scene/AbsDragSortScene.java
+1 -1
View File
@@ -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();
app/src/main/java/com/hippo/ehviewer/ui/scene/CommentScene.java
+1 -1
View File
@@ -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);
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+2 -2
View File
@@ -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");
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+1 -1
View File
@@ -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());
app/src/main/java/com/hippo/ehviewer/ui/scene/InfoScene.java
+1 -1
View File
@@ -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();
app/src/main/java/com/hippo/ehviewer/ui/scene/MainSettingsScene.java
+6 -6
View File
@@ -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)
};
app/src/main/java/com/hippo/ehviewer/ui/scene/ModifyQuickSearchScene.java
+1 -1
View File
@@ -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();
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/AdvancedSettingsScene.java
+1 -1
View File
@@ -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());
}
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DirPickScene.java
+1 -1
View File
@@ -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) {
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DisplaySettingsScene.java
+1 -1
View File
@@ -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());
}
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/DownloadSettingsScene.java
+1 -1
View File
@@ -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());
}
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/EHSettingsScene.java
+1 -1
View File
@@ -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());
}
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ExcludedLanguagesScene.java
+1 -1
View File
@@ -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);
app/src/main/java/com/hippo/ehviewer/ui/scene/preference/ReadingSettingsScene.java
+1 -1
View File
@@ -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());
}
app/src/main/java/com/hippo/ehviewer/widget/ListSearchBar.java
+1 -1
View File
@@ -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)));
app/src/main/java/com/hippo/ehviewer/widget/RatingView.java
+3 -3
View File
@@ -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);
app/src/main/java/com/hippo/ehviewer/widget/SimpleRatingView.java
+3 -3
View File
@@ -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);