From 1528ac875c73bf94ff25ae50fe48fe671eda9301 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 6 Feb 2016 22:38:08 +0800 Subject: [PATCH] Remove custom drawable to xml for new gradle plugin, rename some drawable, replace some drawable by vector --- .../hippo/ehviewer/ui/SettingsActivity.java | 2 +- .../ui/scene/GalleryCommentsScene.java | 8 +-- .../ehviewer/ui/scene/GalleryDetailScene.java | 47 ++++++++++-------- .../ehviewer/ui/scene/GalleryInfoScene.java | 2 +- .../ehviewer/ui/scene/GalleryListScene.java | 4 +- .../ui/scene/GalleryPreviewsScene.java | 2 +- .../ehviewer/ui/scene/ProgressScene.java | 2 +- .../hippo/ehviewer/ui/scene/WarningScene.java | 2 +- .../hippo/ehviewer/widget/SearchLayout.java | 2 +- .../java/com/hippo/widget/ContentLayout.java | 2 +- .../main/java/com/hippo/widget/Slider.java | 2 +- .../drawable-hdpi/ic_share_primary_x48.png | Bin 359 -> 0 bytes .../drawable-hdpi/ic_thumb_up_primary_x48.png | Bin 339 -> 0 bytes .../drawable-hdpi/ic_utorrent_primary_x48.png | Bin 655 -> 0 bytes .../{ic_download_x24.png => nav_download.png} | Bin ...ic_favourite_x24.png => nav_favourite.png} | Bin .../{ic_history_x24.png => nav_history.png} | Bin .../{ic_homepage_x24.png => nav_homepage.png} | Bin .../{ic_settings_x24.png => nav_settings.png} | Bin ...ic_whats_hot_x24.png => nav_whats_hot.png} | Bin .../drawable-mdpi/ic_share_primary_x48.png | Bin 289 -> 0 bytes .../drawable-mdpi/ic_thumb_up_primary_x48.png | Bin 272 -> 0 bytes .../drawable-mdpi/ic_utorrent_primary_x48.png | Bin 493 -> 0 bytes .../{ic_download_x24.png => nav_download.png} | Bin ...ic_favourite_x24.png => nav_favourite.png} | Bin .../{ic_history_x24.png => nav_history.png} | Bin .../{ic_homepage_x24.png => nav_homepage.png} | Bin .../{ic_settings_x24.png => nav_settings.png} | Bin ...ic_whats_hot_x24.png => nav_whats_hot.png} | Bin .../drawable-xhdpi/ic_share_primary_x48.png | Bin 423 -> 0 bytes .../ic_thumb_up_primary_x48.png | Bin 409 -> 0 bytes .../ic_utorrent_primary_x48.png | Bin 823 -> 0 bytes .../{ic_download_x24.png => nav_download.png} | Bin ...ic_favourite_x24.png => nav_favourite.png} | Bin .../{ic_history_x24.png => nav_history.png} | Bin .../{ic_homepage_x24.png => nav_homepage.png} | Bin .../{ic_settings_x24.png => nav_settings.png} | Bin ...ic_whats_hot_x24.png => nav_whats_hot.png} | Bin .../drawable-xxhdpi/ic_share_primary_x48.png | Bin 570 -> 0 bytes .../ic_thumb_up_primary_x48.png | Bin 538 -> 0 bytes .../ic_utorrent_primary_x48.png | Bin 1196 -> 0 bytes .../{ic_download_x24.png => nav_download.png} | Bin ...ic_favourite_x24.png => nav_favourite.png} | Bin .../{ic_history_x24.png => nav_history.png} | Bin .../{ic_homepage_x24.png => nav_homepage.png} | Bin .../{ic_settings_x24.png => nav_settings.png} | Bin ...ic_whats_hot_x24.png => nav_whats_hot.png} | Bin .../res/layout/gallery_detail_actions.xml | 3 -- app/src/main/res/menu/nav_drawer_main.xml | 12 ++--- app/src/main/res/values/pathdata.xml | 3 ++ .../ic_alert.xml => xml/ic_alert_red_x48.xml} | 0 .../ic_arrow_left_dark_x24.xml} | 0 .../ic_dots_vertical_secondary_dark_x24.xml} | 0 .../{drawable => xml}/ic_heart_animated.xml | 2 +- .../ic_heart_outline_animated.xml | 2 +- .../ic_heart_outline_primary_x48.xml} | 0 .../ic_heart_primary_x48.xml} | 0 .../ic_help_circle_x24.xml} | 0 .../ic_magnify_dark_x24.xml} | 0 .../ic_magnify.xml => xml/ic_magnify_x24.xml} | 0 .../ic_reply_dark_x24.xml} | 0 .../ic_send.xml => xml/ic_send_dark_x24.xml} | 0 app/src/main/res/xml/ic_share_primary_x48.xml | 30 +++++++++++ .../main/res/xml/ic_thumb_up_primary_x48.xml | 30 +++++++++++ .../main/res/xml/ic_utorrent_primary_x48.xml | 30 +++++++++++ .../res/{drawable => xml}/sadpanda_head.xml | 0 .../res/{drawable => xml}/slider_bubble.xml | 0 build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 69 files changed, 143 insertions(+), 48 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_share_primary_x48.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_thumb_up_primary_x48.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_utorrent_primary_x48.png rename app/src/main/res/drawable-hdpi/{ic_download_x24.png => nav_download.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_favourite_x24.png => nav_favourite.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_history_x24.png => nav_history.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_homepage_x24.png => nav_homepage.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_settings_x24.png => nav_settings.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_whats_hot_x24.png => nav_whats_hot.png} (100%) delete mode 100644 app/src/main/res/drawable-mdpi/ic_share_primary_x48.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_thumb_up_primary_x48.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_utorrent_primary_x48.png rename app/src/main/res/drawable-mdpi/{ic_download_x24.png => nav_download.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_favourite_x24.png => nav_favourite.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_history_x24.png => nav_history.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_homepage_x24.png => nav_homepage.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_settings_x24.png => nav_settings.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_whats_hot_x24.png => nav_whats_hot.png} (100%) delete mode 100644 app/src/main/res/drawable-xhdpi/ic_share_primary_x48.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_thumb_up_primary_x48.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_utorrent_primary_x48.png rename app/src/main/res/drawable-xhdpi/{ic_download_x24.png => nav_download.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_favourite_x24.png => nav_favourite.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_history_x24.png => nav_history.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_homepage_x24.png => nav_homepage.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_settings_x24.png => nav_settings.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_whats_hot_x24.png => nav_whats_hot.png} (100%) delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_primary_x48.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_thumb_up_primary_x48.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_utorrent_primary_x48.png rename app/src/main/res/drawable-xxhdpi/{ic_download_x24.png => nav_download.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_favourite_x24.png => nav_favourite.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_history_x24.png => nav_history.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_homepage_x24.png => nav_homepage.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_settings_x24.png => nav_settings.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_whats_hot_x24.png => nav_whats_hot.png} (100%) rename app/src/main/res/{drawable/ic_alert.xml => xml/ic_alert_red_x48.xml} (100%) rename app/src/main/res/{drawable/ic_arrow_left.xml => xml/ic_arrow_left_dark_x24.xml} (100%) rename app/src/main/res/{drawable/ic_dots_vertical.xml => xml/ic_dots_vertical_secondary_dark_x24.xml} (100%) rename app/src/main/res/{drawable => xml}/ic_heart_animated.xml (94%) rename app/src/main/res/{drawable => xml}/ic_heart_outline_animated.xml (93%) rename app/src/main/res/{drawable/ic_heart_outline.xml => xml/ic_heart_outline_primary_x48.xml} (100%) rename app/src/main/res/{drawable/ic_heart.xml => xml/ic_heart_primary_x48.xml} (100%) rename app/src/main/res/{drawable/ic_help_circle.xml => xml/ic_help_circle_x24.xml} (100%) rename app/src/main/res/{drawable/ic_magnify_dark.xml => xml/ic_magnify_dark_x24.xml} (100%) rename app/src/main/res/{drawable/ic_magnify.xml => xml/ic_magnify_x24.xml} (100%) rename app/src/main/res/{drawable/ic_reply.xml => xml/ic_reply_dark_x24.xml} (100%) rename app/src/main/res/{drawable/ic_send.xml => xml/ic_send_dark_x24.xml} (100%) create mode 100644 app/src/main/res/xml/ic_share_primary_x48.xml create mode 100644 app/src/main/res/xml/ic_thumb_up_primary_x48.xml create mode 100644 app/src/main/res/xml/ic_utorrent_primary_x48.xml rename app/src/main/res/{drawable => xml}/sadpanda_head.xml (100%) rename app/src/main/res/{drawable => xml}/slider_bubble.xml (100%) 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 cd5e5ea91b36da5e7df2e90d3bf857a3b283595b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~aez;VE0AWG)@Umty7N}2(Se1KC&U|`TRGA zmk)i}sMYZQi^t{DIcC2z*J^Q0ZSitaT{tPgbA?KXkQOJ9dq~exK8b1Z6mJ%W*&)ge zky^YPytguzt#o%#5Oq-4DXX!>&Oz~O3(K#}K541+o1JqMiguldY&)U3C%F5g$Z^#; zk?)DO{r+b$`%5QU|M)3icR}Ob2TQ9z3rdY;PaMfLyzN)U+VE_xvJ%qy3X?z5k9G54_*%@0LB@0heJWy5;&z6F7%eYf>D-^}?oHqQ3x z7RLyVMgfkdMVDf&wsX4*FewU%HEmuQ^fL3<|Fd(=1bn;;||kDRR+um-$i z05h1tq~wL8?PU(9wHdZ<|wL{_q%;M^V0kv-hkwN f2eZgTe~DWM4fR&tFi 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 c5f646a5c986a094dd6d1fa18b62367cc56a872b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~aez;VE0AWG)EFzb9?{v-XqH?9bW@IlR6*IUcQ^KOt*zU!|6?_?0y?uctfQDXTiT z=g&=#dqzR^pUx(oI9@Lu@cs)=Z-Pd^q@{hXul)VAqFgt)r9R88mOs+9h{Y-M;f>F; zqisHMfkS>(V%f_qsLtQM( zTh@F{{CT9$#QFW_h{j1X)Ml{x1AQSgJt}SaL94sWskZYTFy1(BVmmMKjU_|G`t^0v z>qI1(U3LWC;=W$rzG%t%m@U#>lO~rc>|)ISdN29NntVp1k9(&U-c5ITRw(kQY_ru@ zk*f#R{}5r7_->Q`?3eZJ9YTR2vzK08@!hgy=DQ$f>(wvq>&4|6(*ms}ot!*3f>M^J LtDnm{r-UW|ghm?8 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 6040570abcf0b377598febc761713cea348c6009..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s#sNMdu0Wb$S_et!`C6~ZKwW|* zL4Lsu^Zy$ZtiP|&@cz6*fk0y oZH8;Lj`IXvtK;!a5b0rJnDmroo1SEU0MK0wp00i_>zopr0PVhPP5=M^ 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 aea500f9977f83d7b0573c8f19dac5df1d0fdd13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt>z*!-Ar*{oXGn`2b`Wv7o;mkX z$Z{*&FFc`|d2&ikxSXZ(EU&Aj?#=GIL$Q>U@F%RS+}A|6@AQ4mny!~DCY zhHb0jbHVcbE8z|M1s$&EyRf(%uy%1^Ig(it#HXR4&91{4%qKC0`5TZjc*@{Eqv*gA znE;0{z6Zg}V-75kIk4PsC&TZshV8bc`{Wb;+Whus3uxK?i+T0mq>T}8IO{v!Z8-n{ 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 2b11897230daee32f392855bf51e3336958e2c87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s#sNMdu0Wb$S_et!`C6~ZKwW|* zL4Lsu3IYl9&;NfP(BI&2e}BPxgWYLdRtyY`5uPrNAr*{wr@HqYHQ;F5*sECR{jUC| z<~4 z=UIKj{U6M0+AE&+oLRccM~rFFDNf^su4+>8ECF-%c$7~p`MU1K4r4_|UJif#c8gh= z%))6~FD+Tz%H*bo?105!XUfjIfWg?^JkqxOgtVJ3gT^DBb^1ZTD)IKkOQ~6zc zT<*7%CJ}%2moJ~?QvUyV*3E;@4nNYL?e*+K`ns=1S*_p7jN9Hkn`bJ$tWM@%_=~TT zH%wf(?y9Y0pzjL%C68`-F*9-=IyP-^oj0s4tpyB+ob(sys5nHdV4l)irNDdRpZ1=Ldhz%9kN!q&`JLDCeR0KpvA6p^ z@6n0>apd2VOx^eDw_^%Ep0X)>vvJ)nt2~>4n)TZH`)5`ct~+eZl$p5idLrGcYi+c)B=-R4~3h-`VJ_$ip01tK*b+xqjdz*jf72M~2xBFo2`v?2J7u*+p zC%)r7+xOar-*$&;=Rf!-`R+H<_u5tv@ABW4-|q_UFMN6R5&LbEyM!usGzv#m2*ED4S(cE?%%^=9H;A0oU)Ngq;u;XxF))8~ZMdrPArchEp00i_ I>zopr00OQTn{D6k@M_URPF)%PK@^onCfAy_@ ze~}7QDmfc<|9xJMuHp&p&kycDKA85d zUY?H^*97cMxaJ+9F7j^C1K*5WqKC_8F7P)G3|)3%hrvASo|Pw9PaXOt^Yq;7%c5N| z%htT!y{=@c>Z+ZMp)(gQ7kjF@Yo_7c_}y=Qx@`XE$n@ibjFzxb#KMESH?ci#QIo#X zWIUnb;)K@HN#gVJ61eAOF4+BTs>+0h=niwK563SzG@mlAnA)@3`seBsCoi!dSLb)u zo4hM0Ltf!a)1L(OxurA2HH2QIEOm+UX12(2c&2_>W44^2h3FZNgOSJGKK+<=DUs*x z8{X*~gWtZGVrj-GTlOmNUQq&niDN{@_GF1AQ_mh?di$)+F`Q?b5k3=s#&Fu|ZS$AtHEc9?damcaS;SL3@4-;ActxprWeem+} zLi+%LEyelim;SNLw)Pc2o;P2iK3az-`ofMs)(Ns(7U<4!by{OkSZ#9pLGUB~>~}67 h9!c%})y&Rs$6WR&qgcuLrWPm%c)I$ztaD0e0sx>>Y|#J! 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 a8da0117a1fbf7b37b3b1b9618e5ee3b39312de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=j01c^T!A#hv<{Nc^R-@+fw}}s zg8YIR=Kps{=->ZdAi$vE{C$P>1};6h#5oz#Z})f4=`S zw|;kP@tzeYb~gnJx$S#k8#nKHB?JZXw#?!%70gn);`Qr5aYqrn) z-FVsQ$?dg!`eowH?(4)YKNmc4{pP@a*$-y%TQ8jye%^3?^YYE^36DR!*;cFh*M!|% z-pFHnGDRePk8bA~Hfx56 zAjz<2+vn*S+s5YG8a=+l>u`OhzIua-$%lQ7OH3NgPdKhvw@uvtjMS8_ZOtK@SyyK9 hIoU?Q102ZEXRP?FptJMoK|@d?@O1TaS?83{1OT~Q^a=m~ 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 487bcbab29ab2f461bd4920fa072b339e0d637eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=j01c^T!A#hv<{Nc^R-@+fw}}s zg8YIR=ARe%->>lAA;DmOL%{m`1#|tGq8Jz$TRmMILn;{GUUw9_t-#}!sQHJX)A{M| z`P*KvyCr7&*=TV&V?7)5u~n;n9s6@JLXK0l2o3!WYOh?v`1wSlobL?xMU`6;Dx27=!+M2K{Dd7BhbKnc;4qAh$PBPIrbo?=#LB?tGtLw1IS8 zwBeuOF8l1F@Ux5D&jimF*WO|Nv26RlMSmFsH0)d7UuHaIzV@)b#(uvU8$ZX3{ylHS zyX0#+|8E(M424{&6PXJZG=?l-5?$fIsuj@4b%g0E|E&6({&lgk z8eC{=Je06Nnr#*@TTyc(8&8QO&z8gm1`;pY8q=B^?<6c>WR7KH&Xv&MVcV6s;AVn? zxkSbRhv^3$q}jNd8*v(C&DLrp{aoRE{O9xqYma;r)Tlpq$jHGvbFIjPQq`x^n2pYV zpVPSJdG$GmZBFe+xA{!C`OV_Ok8P7zLBK0@@2Rr|UV5Ah1x2!_tDnm{r-UW|zh>DX 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 f5f039c3dd241c61c2264d24bdae266d118ac0f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=j01c^T!A#hv<{Nc^R-@+fw}}s zg8YIR3=$gF?|=XQe1Jp0zd^zgu0KmvtSkI^Loy}hL{gjWyrVqTHr`LDR*FgU1+bLp8C;mqpRqoEgZNW1>KGQgC zxE?r7c+l)nvf=a0xPXaG!HqXAxUbytF=N`x(;3g%ttzZ1%i12|bYYNJy;$s!cs|>D z{=7#A_&zW_bc}wYc4lvsO)8tc{GXPYdKr<6|6X3U%4*T%W1X=wf|))WvbJ7+bR+GS z&f#|n_PTv_ZmSE+FR(Ukd~%NE$b;KQt?%Dvn$+YixZ==Bu?q}y?!-ifM?2*F-p6|) ze(vuy-4&}2$BUkt#&hz(QV!XW-I@x4CFdT*H=PujVD1^XjJ;$V%ao6s+JxU2EY0(H zEf;cH?4Y61X(5w|e3KLvUUAO&CYT><7 z&Gl6qPTF6%tSuF`sbQ7$z9Y9zx-h9U32yZGZz?l_8mLy z<@~tgjbF5=epfr2r1(tu!@2c(J zBwSvmIALbP*PD6o%SFyRTv`}w7arAgI@>R#Xu0bP20vvhh4$APf9_Se-OfMFp#z&0;{*n?|7FX< 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