diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java index c404ddb5f..980ea8275 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java @@ -134,7 +134,7 @@ public final class SettingsActivity extends AppCompatPreferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setActionBarUpIndicator(VectorDrawable.create(this, R.drawable.ic_arrow_left)); + setActionBarUpIndicator(VectorDrawable.create(this, R.xml.ic_arrow_left_dark_x24)); replaceHeaderLayoutResId(); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 62554270e..18849ec91 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -157,12 +157,12 @@ public final class GalleryCommentsScene extends ToolbarScene recyclerView.setOnItemClickListener(this); recyclerView.setOnItemLongClickListener(this); - tipImage.setDrawable(VectorDrawable.create(getContext(), R.drawable.sadpanda_head)); + tipImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); - mSendImage.setDrawable(VectorDrawable.create(getContext(), R.drawable.ic_send)); + mSendImage.setDrawable(VectorDrawable.create(getContext(), R.xml.ic_send_dark_x24)); mSendImage.setOnClickListener(this); - mFab.setImageDrawable(VectorDrawable.create(getContext(), R.drawable.ic_reply)); + mFab.setImageDrawable(VectorDrawable.create(getContext(), R.xml.ic_reply_dark_x24)); mFab.setOnClickListener(this); mViewTransition = new ViewTransition(recyclerView, tip); @@ -187,7 +187,7 @@ public final class GalleryCommentsScene extends ToolbarScene public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_comments); - setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + setNavigationIcon(VectorDrawable.create(getContext(), R.xml.ic_arrow_left_dark_x24)); // Clear nav checked item setNavCheckedItem(0); 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 eb8996ab8..37aac3415 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 @@ -21,6 +21,7 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.DialogInterface; import android.content.res.Resources; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.os.Parcelable; @@ -314,7 +315,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene SimpleImageView mFailedImage = (SimpleImageView) mFailedView.getChildAt(0); mFailedText = (TextView) mFailedView.getChildAt(1); mFailedView.setOnClickListener(this); - mFailedImage.setDrawable(VectorDrawable.create(getContext(), R.drawable.sadpanda_head)); + mFailedImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); mViewTransition = new ViewTransition(mainView, progressView, mFailedView); mHeader = mainView.findViewById(R.id.header); @@ -327,7 +328,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mActionGroup = (ViewGroup) mHeader.findViewById(R.id.action_card); mDownload = mActionGroup.findViewById(R.id.download); mRead = mActionGroup.findViewById(R.id.read); - mOtherActions.setDrawable(VectorDrawable.create(getContext(), R.drawable.ic_dots_vertical)); + mOtherActions.setDrawable(VectorDrawable.create(getContext(), R.xml.ic_dots_vertical_secondary_dark_x24)); RippleSalon.addRipple(mOtherActions, false); RippleSalon.addRipple(mDownload, false); RippleSalon.addRipple(mRead, false); @@ -589,26 +590,30 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene } } - private void ensureHeartDrawable() { - if (mHeartDrawable == null) { - mHeartDrawable = AnimatedVectorDrawable.create(getContext(), R.drawable.ic_heart_animated); - if (mHeartDrawable == null) { - throw new IllegalStateException("Can't parse heart drawable"); - } - mHeartDrawable.setBounds(0, 0, mHeartDrawable.getIntrinsicWidth(), - mHeartDrawable.getIntrinsicHeight()); - mHeart.setCompoundDrawables(null, mHeartDrawable, null, null); + private void setActionDrawable(TextView text, Drawable drawable) { + drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); + text.setCompoundDrawables(null, drawable, null, null); + } + + private void ensureActionDrawable() { + if (mHeartDrawable != null) { + return; } - if (mHeartOutlineDrawable == null) { - mHeartOutlineDrawable = AnimatedVectorDrawable.create(getContext(), R.drawable.ic_heart_outline_animated); - if (mHeartOutlineDrawable == null) { - throw new IllegalStateException("Can't parse heart drawable"); - } - mHeartOutlineDrawable.setBounds(0, 0, mHeartOutlineDrawable.getIntrinsicWidth(), - mHeartOutlineDrawable.getIntrinsicHeight()); - mHeartOutline.setCompoundDrawables(null, mHeartOutlineDrawable, null, null); - } + mHeartDrawable = AnimatedVectorDrawable.create(getContext(), R.xml.ic_heart_animated); + setActionDrawable(mHeart, mHeartDrawable); + + mHeartOutlineDrawable = AnimatedVectorDrawable.create(getContext(), R.xml.ic_heart_outline_animated); + setActionDrawable(mHeartOutline, mHeartOutlineDrawable); + + VectorDrawable torrent = VectorDrawable.create(getContext(), R.xml.ic_utorrent_primary_x48); + setActionDrawable(mTorrent, torrent); + + VectorDrawable share = VectorDrawable.create(getContext(), R.xml.ic_share_primary_x48); + setActionDrawable(mShare, share); + + VectorDrawable rate = VectorDrawable.create(getContext(), R.xml.ic_thumb_up_primary_x48); + setActionDrawable(mRate, rate); } private void bindViewSecond() { @@ -636,7 +641,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mRatingText.setText(getAllRatingText(gd.rating, gd.ratedTimes)); mRating.setRating(gd.rating); - ensureHeartDrawable(); + ensureActionDrawable(); if (gd.isFavored) { mHeart.setVisibility(View.VISIBLE); mHeartOutline.setVisibility(View.GONE); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java index db8eba35d..d1d923eef 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java @@ -163,7 +163,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_info); - setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + setNavigationIcon(VectorDrawable.create(getContext(), R.xml.ic_arrow_left_dark_x24)); // Clear nav checked item setNavCheckedItem(0); 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 8cbb7f549..c6bae7d14 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 @@ -206,7 +206,7 @@ public final class GalleryListScene extends BaseScene private void setSearchBarHint(Context context, SearchBar searchBar) { Resources resources = context.getResources(); - Drawable searchImage = VectorDrawable.create(context, R.drawable.ic_magnify); + Drawable searchImage = VectorDrawable.create(context, R.xml.ic_magnify_x24); SpannableStringBuilder ssb = new SpannableStringBuilder(" "); ssb.append(resources.getString(R.string.gallery_list_search_bar_hint)); int textSize = (int) (searchBar.getEditTextTextSize() * 1.25); @@ -298,7 +298,7 @@ public final class GalleryListScene extends BaseScene mSearchLayout.setHelper(this); - Drawable searchDrawable = VectorDrawable.create(getContext(), R.drawable.ic_magnify_dark); + Drawable searchDrawable = VectorDrawable.create(getContext(), R.xml.ic_magnify_dark_x24); mFab.setImageDrawable(searchDrawable); mFab.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index 66de14d8c..9729e8a2f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -150,7 +150,7 @@ public class GalleryPreviewsScene extends ToolbarScene { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setTitle(R.string.gallery_previews); - setNavigationIcon(VectorDrawable.create(getContext(), R.drawable.ic_arrow_left)); + setNavigationIcon(VectorDrawable.create(getContext(), R.xml.ic_arrow_left_dark_x24)); // Clear nav checked item setNavCheckedItem(0); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java index bc380cf79..e4382aa27 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.java @@ -157,7 +157,7 @@ public final class ProgressScene extends BaseScene implements View.OnClickListen mTipText = (TextView) mTip.findViewById(R.id.tip_text); mTip.setOnClickListener(this); - tipImage.setDrawable(VectorDrawable.create(getContext(), R.drawable.sadpanda_head)); + tipImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); mTipText.setText(mError); mViewTransition = new ViewTransition(progress, mTip); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java index f2abb3ae5..3c04f5f06 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/WarningScene.java @@ -46,7 +46,7 @@ public final class WarningScene extends BaseScene implements View.OnClickListene mCancel = view.findViewById(R.id.cancel); mOk = view.findViewById(R.id.ok); - Drawable drawable = VectorDrawable.create(getContext(), R.drawable.ic_alert); + Drawable drawable = VectorDrawable.create(getContext(), R.xml.ic_alert_red_x48); alert.setDrawable(drawable); mCancel.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index 5e4dde7a2..4ce7c0247 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -136,7 +136,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC mNormalSearchMode = (RadioGroup) normalView.findViewById(R.id.normal_search_mode); mNormalSearchModeHelp = (SimpleImageView) normalView.findViewById(R.id.normal_search_mode_help); mEnableAdvanceSwitch = (SwitchCompat) normalView.findViewById(R.id.search_enable_advance); - Drawable helpDrawable = com.hippo.vector.VectorDrawable.create(context, R.drawable.ic_help_circle); + Drawable helpDrawable = com.hippo.vector.VectorDrawable.create(context, R.xml.ic_help_circle_x24); mNormalSearchModeHelp.setDrawable(helpDrawable); mNormalSearchModeHelp.setOnClickListener(this); RippleSalon.addRipple(mNormalSearchModeHelp, false); diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index 470edf4e4..fd586a65a 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -99,7 +99,7 @@ public class ContentLayout extends FrameLayout { drawable.setColor(ResourcesUtils.getAttrColor(context, R.attr.colorAccent)); mFastScroller.setHandlerDrawable(drawable); - imageView.setDrawable(VectorDrawable.create(context, R.drawable.sadpanda_head)); + imageView.setDrawable(VectorDrawable.create(context, R.xml.sadpanda_head)); mRefreshLayout.setHeaderColorSchemeResources( R.color.loading_indicator_red, diff --git a/app/src/main/java/com/hippo/widget/Slider.java b/app/src/main/java/com/hippo/widget/Slider.java index b545bfe0a..078db127d 100644 --- a/app/src/main/java/com/hippo/widget/Slider.java +++ b/app/src/main/java/com/hippo/widget/Slider.java @@ -469,7 +469,7 @@ public class Slider extends View { @SuppressWarnings("deprecation") public BubbleView(Context context, Paint paint) { super(context); - mVectorDrawable = VectorDrawable.create(context, R.drawable.slider_bubble); + mVectorDrawable = VectorDrawable.create(context, R.xml.slider_bubble); setBackgroundDrawable(mVectorDrawable); mTextPaint = paint; } diff --git a/app/src/main/res/drawable-hdpi/ic_share_primary_x48.png b/app/src/main/res/drawable-hdpi/ic_share_primary_x48.png deleted file mode 100644 index cd5e5ea91..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_share_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_up_primary_x48.png b/app/src/main/res/drawable-hdpi/ic_thumb_up_primary_x48.png deleted file mode 100644 index 2c0fa4560..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_thumb_up_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_utorrent_primary_x48.png b/app/src/main/res/drawable-hdpi/ic_utorrent_primary_x48.png deleted file mode 100644 index c5f646a5c..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_utorrent_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_download_x24.png b/app/src/main/res/drawable-hdpi/nav_download.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_download_x24.png rename to app/src/main/res/drawable-hdpi/nav_download.png diff --git a/app/src/main/res/drawable-hdpi/ic_favourite_x24.png b/app/src/main/res/drawable-hdpi/nav_favourite.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_favourite_x24.png rename to app/src/main/res/drawable-hdpi/nav_favourite.png diff --git a/app/src/main/res/drawable-hdpi/ic_history_x24.png b/app/src/main/res/drawable-hdpi/nav_history.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_history_x24.png rename to app/src/main/res/drawable-hdpi/nav_history.png diff --git a/app/src/main/res/drawable-hdpi/ic_homepage_x24.png b/app/src/main/res/drawable-hdpi/nav_homepage.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_homepage_x24.png rename to app/src/main/res/drawable-hdpi/nav_homepage.png diff --git a/app/src/main/res/drawable-hdpi/ic_settings_x24.png b/app/src/main/res/drawable-hdpi/nav_settings.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_settings_x24.png rename to app/src/main/res/drawable-hdpi/nav_settings.png diff --git a/app/src/main/res/drawable-hdpi/ic_whats_hot_x24.png b/app/src/main/res/drawable-hdpi/nav_whats_hot.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_whats_hot_x24.png rename to app/src/main/res/drawable-hdpi/nav_whats_hot.png diff --git a/app/src/main/res/drawable-mdpi/ic_share_primary_x48.png b/app/src/main/res/drawable-mdpi/ic_share_primary_x48.png deleted file mode 100644 index 6040570ab..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_share_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_up_primary_x48.png b/app/src/main/res/drawable-mdpi/ic_thumb_up_primary_x48.png deleted file mode 100644 index aea500f99..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_thumb_up_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_utorrent_primary_x48.png b/app/src/main/res/drawable-mdpi/ic_utorrent_primary_x48.png deleted file mode 100644 index 2b1189723..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_utorrent_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_download_x24.png b/app/src/main/res/drawable-mdpi/nav_download.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_download_x24.png rename to app/src/main/res/drawable-mdpi/nav_download.png diff --git a/app/src/main/res/drawable-mdpi/ic_favourite_x24.png b/app/src/main/res/drawable-mdpi/nav_favourite.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_favourite_x24.png rename to app/src/main/res/drawable-mdpi/nav_favourite.png diff --git a/app/src/main/res/drawable-mdpi/ic_history_x24.png b/app/src/main/res/drawable-mdpi/nav_history.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_history_x24.png rename to app/src/main/res/drawable-mdpi/nav_history.png diff --git a/app/src/main/res/drawable-mdpi/ic_homepage_x24.png b/app/src/main/res/drawable-mdpi/nav_homepage.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_homepage_x24.png rename to app/src/main/res/drawable-mdpi/nav_homepage.png diff --git a/app/src/main/res/drawable-mdpi/ic_settings_x24.png b/app/src/main/res/drawable-mdpi/nav_settings.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_settings_x24.png rename to app/src/main/res/drawable-mdpi/nav_settings.png diff --git a/app/src/main/res/drawable-mdpi/ic_whats_hot_x24.png b/app/src/main/res/drawable-mdpi/nav_whats_hot.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_whats_hot_x24.png rename to app/src/main/res/drawable-mdpi/nav_whats_hot.png diff --git a/app/src/main/res/drawable-xhdpi/ic_share_primary_x48.png b/app/src/main/res/drawable-xhdpi/ic_share_primary_x48.png deleted file mode 100644 index 8870aaaf2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_share_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_up_primary_x48.png b/app/src/main/res/drawable-xhdpi/ic_thumb_up_primary_x48.png deleted file mode 100644 index 36aaab179..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_thumb_up_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_utorrent_primary_x48.png b/app/src/main/res/drawable-xhdpi/ic_utorrent_primary_x48.png deleted file mode 100644 index 67826a1bb..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_utorrent_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_download_x24.png b/app/src/main/res/drawable-xhdpi/nav_download.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_download_x24.png rename to app/src/main/res/drawable-xhdpi/nav_download.png diff --git a/app/src/main/res/drawable-xhdpi/ic_favourite_x24.png b/app/src/main/res/drawable-xhdpi/nav_favourite.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_favourite_x24.png rename to app/src/main/res/drawable-xhdpi/nav_favourite.png diff --git a/app/src/main/res/drawable-xhdpi/ic_history_x24.png b/app/src/main/res/drawable-xhdpi/nav_history.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_history_x24.png rename to app/src/main/res/drawable-xhdpi/nav_history.png diff --git a/app/src/main/res/drawable-xhdpi/ic_homepage_x24.png b/app/src/main/res/drawable-xhdpi/nav_homepage.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_homepage_x24.png rename to app/src/main/res/drawable-xhdpi/nav_homepage.png diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_x24.png b/app/src/main/res/drawable-xhdpi/nav_settings.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_settings_x24.png rename to app/src/main/res/drawable-xhdpi/nav_settings.png diff --git a/app/src/main/res/drawable-xhdpi/ic_whats_hot_x24.png b/app/src/main/res/drawable-xhdpi/nav_whats_hot.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_whats_hot_x24.png rename to app/src/main/res/drawable-xhdpi/nav_whats_hot.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_primary_x48.png b/app/src/main/res/drawable-xxhdpi/ic_share_primary_x48.png deleted file mode 100644 index a8da0117a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_primary_x48.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_primary_x48.png deleted file mode 100644 index 487bcbab2..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_utorrent_primary_x48.png b/app/src/main/res/drawable-xxhdpi/ic_utorrent_primary_x48.png deleted file mode 100644 index f5f039c3d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_utorrent_primary_x48.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_download_x24.png b/app/src/main/res/drawable-xxhdpi/nav_download.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_download_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_download.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_favourite_x24.png b/app/src/main/res/drawable-xxhdpi/nav_favourite.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_favourite_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_favourite.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_history_x24.png b/app/src/main/res/drawable-xxhdpi/nav_history.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_history_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_history.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_homepage_x24.png b/app/src/main/res/drawable-xxhdpi/nav_homepage.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_homepage_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_homepage.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_x24.png b/app/src/main/res/drawable-xxhdpi/nav_settings.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_settings_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_settings.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_whats_hot_x24.png b/app/src/main/res/drawable-xxhdpi/nav_whats_hot.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_whats_hot_x24.png rename to app/src/main/res/drawable-xxhdpi/nav_whats_hot.png diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml index a0c5e9b1c..4217e1969 100644 --- a/app/src/main/res/layout/gallery_detail_actions.xml +++ b/app/src/main/res/layout/gallery_detail_actions.xml @@ -68,7 +68,6 @@ android:layout_marginLeft="16dp" android:gravity="center_horizontal" android:drawablePadding="8dp" - android:drawableTop="@drawable/ic_utorrent_primary_x48" android:textColor="@color/primary_text_light"/> diff --git a/app/src/main/res/menu/nav_drawer_main.xml b/app/src/main/res/menu/nav_drawer_main.xml index 7d28561d9..822af9a2d 100644 --- a/app/src/main/res/menu/nav_drawer_main.xml +++ b/app/src/main/res/menu/nav_drawer_main.xml @@ -21,32 +21,32 @@ + android:icon="@drawable/nav_homepage"/> + android:icon="@drawable/nav_whats_hot"/> + android:icon="@drawable/nav_favourite"/> + android:icon="@drawable/nav_history"/> + android:icon="@drawable/nav_download"/> + android:icon="@drawable/nav_settings"/> M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z M10,9V5L3,12L10,19V14.9C15,14.9 18.5,16.5 21,20C20,15 17,10 10,9Z M2,21L23,12L2,3V10L17,12L2,14V21Z + M21,11L14,4V8C7,9 4,14 3,19C5.5,15.5 9,13.9 14,13.9V18L21,11Z + M23,10C23,8.89 22.1,8 21,8H14.68L15.64,3.43C15.66,3.33 15.67,3.22 15.67,3.11C15.67,2.7 15.5,2.32 15.23,2.05L14.17,1L7.59,7.58C7.22,7.95 7,8.45 7,9V19A2,2 0 0,0 9,21H18C18.83,21 19.54,20.5 19.84,19.78L22.86,12.73C22.95,12.5 23,12.26 23,12V10.08L23,10M1,21H5V9H1V21Z + M2 11.5C2.2 6.3 7.2 1.7 12.5 2c5.6.2 10.5 5.9 9.4 11.5-.9 0-1.8-.3-2.3-1.1-1.3-2-1.9-4.3-3.1-6.3-.9.1-1.7.3-2.5.5.3 2.3 1.8 4.2 2.3 6.4-.2 1.9-2.7 3-4.4 2.1-1.4-.5-2-2-2.5-3.3-.5-1.3-1-2.7-1.7-3.9-1.1 0-2.2 0-3.2.5.9 4.5 3.4 8.5 4.4 13-4.1-1.3-7.1-5.6-6.9-9.9M14.8 17.1c1-.6 1.8-1.5 2.7-2.3 1.3.3 2.5.5 3.8.6-1.4 3.3-4.4 5.8-8 6.5-1-1.4-1.6-3-2-4.6 1.2.1 2.4.2 3.5-.2Z M13,0C20.2,0,26,5.9,26,13.2,26,16.9,24,20.8,18.7,26.1L13,32,7.2,26.2C2,20.8,0,16.9,0,13.3,0,5.9,5.8,0,13,0Z diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/xml/ic_alert_red_x48.xml similarity index 100% rename from app/src/main/res/drawable/ic_alert.xml rename to app/src/main/res/xml/ic_alert_red_x48.xml diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/xml/ic_arrow_left_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_left.xml rename to app/src/main/res/xml/ic_arrow_left_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_dots_vertical.xml b/app/src/main/res/xml/ic_dots_vertical_secondary_dark_x24.xml similarity index 100% rename from app/src/main/res/drawable/ic_dots_vertical.xml rename to app/src/main/res/xml/ic_dots_vertical_secondary_dark_x24.xml diff --git a/app/src/main/res/drawable/ic_heart_animated.xml b/app/src/main/res/xml/ic_heart_animated.xml similarity index 94% rename from app/src/main/res/drawable/ic_heart_animated.xml rename to app/src/main/res/xml/ic_heart_animated.xml index 0c1ab80d5..1604fea65 100644 --- a/app/src/main/res/drawable/ic_heart_animated.xml +++ b/app/src/main/res/xml/ic_heart_animated.xml @@ -17,7 +17,7 @@ + app:drawable="@xml/ic_heart_primary_x48"> + app:drawable="@xml/ic_heart_outline_primary_x48"> + + + + + + + diff --git a/app/src/main/res/xml/ic_thumb_up_primary_x48.xml b/app/src/main/res/xml/ic_thumb_up_primary_x48.xml new file mode 100644 index 000000000..1a8380364 --- /dev/null +++ b/app/src/main/res/xml/ic_thumb_up_primary_x48.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/app/src/main/res/xml/ic_utorrent_primary_x48.xml b/app/src/main/res/xml/ic_utorrent_primary_x48.xml new file mode 100644 index 000000000..f71e3b9d5 --- /dev/null +++ b/app/src/main/res/xml/ic_utorrent_primary_x48.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/sadpanda_head.xml b/app/src/main/res/xml/sadpanda_head.xml similarity index 100% rename from app/src/main/res/drawable/sadpanda_head.xml rename to app/src/main/res/xml/sadpanda_head.xml diff --git a/app/src/main/res/drawable/slider_bubble.xml b/app/src/main/res/xml/slider_bubble.xml similarity index 100% rename from app/src/main/res/drawable/slider_bubble.xml rename to app/src/main/res/xml/slider_bubble.xml diff --git a/build.gradle b/build.gradle index eee534492..f357b55d9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:2.0.0-beta2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5d4205be0..050ce6850 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip