Normalized vector drawable resources naming

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

No files matched your search

@@ -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();
@@ -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);
@@ -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");
@@ -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());
@@ -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();
@@ -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)
};
@@ -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();
@@ -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());
}
@@ -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) {
@@ -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());
}
@@ -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());
}
@@ -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());
}
@@ -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);
@@ -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());
}
@@ -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)));
@@ -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);
@@ -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);
@@ -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">
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2015 Hippo Seven
~
@@ -21,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">
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_download_dark" />
<item android:drawable="@drawable/ic_download" />
<item android:state_activated="true" android:drawable="@drawable/ic_download_dark_x24" />
<item android:drawable="@drawable/ic_download_x24" />
</selector>
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_fire_dark" />
<item android:drawable="@drawable/ic_fire" />
<item android:state_activated="true" android:drawable="@drawable/ic_fire_dark_x24" />
<item android:drawable="@drawable/ic_fire_x24" />
</selector>
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_heart_dark" />
<item android:drawable="@drawable/ic_heart" />
<item android:state_activated="true" android:drawable="@drawable/ic_heart_dark_x24" />
<item android:drawable="@drawable/ic_heart_x24" />
</selector>
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_history_dark" />
<item android:drawable="@drawable/ic_history" />
<item android:state_activated="true" android:drawable="@drawable/ic_history_dark_x24" />
<item android:drawable="@drawable/ic_history_x24" />
</selector>
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_home_dark" />
<item android:drawable="@drawable/ic_home" />
<item android:state_activated="true" android:drawable="@drawable/ic_home_dark_x24" />
<item android:drawable="@drawable/ic_home_x24" />
</selector>
@@ -14,6 +14,6 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:drawable="@drawable/ic_settings_dark" />
<item android:drawable="@drawable/ic_settings" />
<item android:state_activated="true" android:drawable="@drawable/ic_settings_dark_x24" />
<item android:drawable="@drawable/ic_settings_x24" />
</selector>
+3 -2
View File
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 Hippo Seven
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
+39
View File
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:auto="http://schemas.android.com/apk/res-auto"
tools:targetApi="21"
auto:width="168dp"
auto:height="168dp"
auto:viewportWidth="24"
auto:viewportHeight="24"
android:width="168dp"
android:height="168dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
auto:pathData="@string/pd_sad"
auto:fillColor="@color/primary_drawable_light"
android:pathData="@string/pd_sad"
android:fillColor="@color/primary_drawable_light"/>
</vector>
@@ -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">
@@ -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">
@@ -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">
@@ -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"/>
</LinearLayout>
@@ -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"/>
</LinearLayout>
@@ -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"/>
</LinearLayout>
@@ -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"/>
<TextView
android:id="@+id/share"
@@ -77,7 +77,7 @@
android:gravity="center_horizontal"
android:text="@string/share"
android:drawablePadding="8dp"
android:drawableTop="@drawable/ic_share_theme_primary"/>
android:drawableTop="@drawable/ic_share_primary_x48"/>
<TextView
android:id="@+id/rate"
@@ -87,7 +87,7 @@
android:gravity="center_horizontal"
android:text="@string/rate"
android:drawablePadding="8dp"
android:drawableTop="@drawable/ic_thumbs_up_down_theme_primary"/>
android:drawableTop="@drawable/ic_thumbs_up_down_primary_x48"/>
</LinearLayout>
@@ -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" />
@@ -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"/>
<View
android:layout_width="1dp"
@@ -55,6 +55,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_chevron_right"/>
android:src="@drawable/ic_chevron_right_primary_x48"/>
</LinearLayout>
+1 -1
View File
@@ -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"/>
</LinearLayout>
@@ -37,10 +37,10 @@
android:orientation="vertical">
<com.hippo.widget.SimpleImageView
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_width="168dp"
android:layout_height="168dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_sad"/>
android:src="@drawable/ic_sad_x168"/>
<TextView
style="@style/TextAppearance.AppCompat.Medium"
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
auto:color="?attr/colorPrimary"
auto:drawable="@drawable/ic_arrow_up_dark"
auto:drawable="@drawable/ic_arrow_up_dark_x24"
auto:forceNoElevation="true"/>
<com.hippo.widget.FloatingActionButton
@@ -68,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
auto:color="?attr/colorPrimary"
auto:drawable="@drawable/ic_go_to_dark"
auto:drawable="@drawable/ic_go_to_dark_x24"
auto:forceNoElevation="true"/>
<com.hippo.widget.FloatingActionButton
+1 -1
View File
@@ -53,7 +53,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:padding="4dp"
android:src="@drawable/ic_help_circle"
android:src="@drawable/ic_help_circle_x24"
tools:ignore="RtlHardcoded"/>
</LinearLayout>
@@ -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"/>
</LinearLayout>
@@ -33,10 +33,10 @@
android:orientation="vertical">
<com.hippo.widget.SimpleImageView
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_width="168dp"
android:layout_height="168dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_sad"/>
android:src="@drawable/ic_sad_x168"/>
<TextView
style="@style/TextAppearance.AppCompat.Medium"