diff --git a/.gitmodules b/.gitmodules index 93ece6711..203438268 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,6 @@ [submodule "hotspot"] path = hotspot url = https://github.com/seven332/Hotspot -[submodule "vector"] - path = vector - url = https://github.com/seven332/Vector -[submodule "anani"] - path = anani - url = https://github.com/seven332/Anani [submodule "easyrecyclerview"] path = easyrecyclerview url = https://github.com/seven332/EasyRecyclerView diff --git a/anani b/anani deleted file mode 160000 index 0866c16e5..000000000 --- a/anani +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0866c16e57ac85dd490922000023bf51b0ec402e diff --git a/app/build.gradle b/app/build.gradle index 75b8a50f4..9e2c2ee4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,6 +12,7 @@ android { targetSdkVersion 23 versionCode 48 versionName "0.9.0" + vectorDrawables.useSupportLibrary = true } buildTypes { @@ -28,8 +29,6 @@ android { jni.srcDirs = [] // Set new jni lib dir jniLibs.srcDir 'src/main/libs' - // Vector res dir - res.srcDirs += 'src/main/res-vector' } } @@ -62,7 +61,6 @@ clean { } dependencies { - compile project(':anani') compile project(':beerbelly') compile project(':conaco') compile project(':easyrecyclerview') @@ -70,7 +68,6 @@ dependencies { compile project(':okhttp3') compile project(':rippleold') compile project(':unifile') - compile project(':vector') compile project(':yorozuya') compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java index 776c2ad52..373064725 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java @@ -20,11 +20,11 @@ import android.graphics.Rect; import android.graphics.RectF; import android.support.annotation.IntDef; -import com.hippo.anani.AnimationUtils; import com.hippo.gl.anim.AlphaAnimation; import com.hippo.gl.glrenderer.GLCanvas; import com.hippo.gl.glrenderer.Texture; import com.hippo.gl.view.GLView; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.MathUtils; import java.lang.annotation.Retention; diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java index 05c46b551..b1d68f7c7 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java @@ -23,13 +23,13 @@ import android.support.annotation.NonNull; import android.util.Log; import android.view.animation.Interpolator; -import com.hippo.anani.AnimationUtils; import com.hippo.ehviewer.gallery.GalleryProvider; import com.hippo.gl.anim.Animation; import com.hippo.gl.view.GLView; import com.hippo.gl.widget.GLEdgeView; import com.hippo.gl.widget.GLProgressView; import com.hippo.gl.widget.GLTextureView; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.LayoutUtils; import com.hippo.yorozuya.MathUtils; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index af8ae44ba..bd7e0a176 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -33,8 +33,6 @@ import android.view.WindowManager; import android.widget.Spinner; import android.widget.TextView; -import com.hippo.anani.AnimationUtils; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.ehviewer.client.data.GalleryInfo; @@ -51,7 +49,9 @@ import com.hippo.gl.view.GLRootView; import com.hippo.image.Image; import com.hippo.util.SystemUiHelper; import com.hippo.widget.Slider; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.ConcurrentPool; +import com.hippo.yorozuya.SimpleAnimatorListener; import com.hippo.yorozuya.SimpleHandler; import java.io.File; 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 3ca8bc2a5..b9df95a29 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java @@ -36,7 +36,6 @@ import com.hippo.app.AppCompatPreferenceActivity; import com.hippo.ehviewer.R; import com.hippo.ehviewer.ui.fragment.EhFragment; import com.hippo.ehviewer.ui.fragment.ReadFragment; -import com.hippo.vector.VectorDrawable; import java.lang.reflect.Field; import java.util.List; @@ -133,10 +132,11 @@ public final class SettingsActivity extends AppCompatPreferenceActivity { } } + @SuppressWarnings("deprecation") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setActionBarUpIndicator(VectorDrawable.create(this, R.xml.ic_arrow_left_dark_x24)); + setActionBarUpIndicator(getResources().getDrawable(R.drawable.ic_arrow_left_dark_x24)); replaceHeaderLayoutResId(); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java index 5c94955d8..b4d835dc6 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadLabelScene.java @@ -51,9 +51,7 @@ import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.dao.DownloadLabelRaw; import com.hippo.util.ActivityHelper; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; -import com.hippo.widget.SimpleImageView; import com.hippo.yorozuya.ViewUtils; import java.util.HashMap; @@ -97,8 +95,6 @@ public class DownloadLabelScene extends ToolbarScene { mRecyclerView = (EasyRecyclerView) view.findViewById(R.id.recycler_view); View tip = view.findViewById(R.id.tip); - SimpleImageView tipImage = (SimpleImageView) tip.findViewById(R.id.tip_image); - tipImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); mViewTransition = new ViewTransition(mRecyclerView, tip); if (mRecyclerView != null) { @@ -143,7 +139,7 @@ public class DownloadLabelScene extends ToolbarScene { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setTitle(R.string.label); - setNavigationIcon(VectorDrawable.create(getContext(), R.xml.ic_arrow_left_dark_x24)); + setNavigationIcon(R.drawable.ic_arrow_left_dark_x24); // Clear nav checked item setNavCheckedItem(0); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java index d0cec53f8..77fb4afb4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java @@ -69,11 +69,9 @@ import com.hippo.scene.TransitionHelper; import com.hippo.unifile.UniFile; import com.hippo.util.ActivityHelper; import com.hippo.util.ApiHelper; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; import com.hippo.widget.FabLayout; import com.hippo.widget.LoadImageView; -import com.hippo.widget.SimpleImageView; import com.hippo.yorozuya.FileUtils; import com.hippo.yorozuya.IntList; import com.hippo.yorozuya.ObjectUtils; @@ -182,8 +180,6 @@ public class DownloadScene extends ToolbarScene mRecyclerView = (EasyRecyclerView) view.findViewById(R.id.recycler_view); mFabLayout = (FabLayout) view.findViewById(R.id.fab_layout); View tip = view.findViewById(R.id.tip); - SimpleImageView tipImage = (SimpleImageView) tip.findViewById(R.id.tip_image); - tipImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); mViewTransition = new ViewTransition(mRecyclerView, tip); if (mRecyclerView != null) { @@ -210,6 +206,7 @@ public class DownloadScene extends ToolbarScene } if (mFabLayout != null) { + mFabLayout.setExpanded(false, false); mFabLayout.setHidePrimaryFab(true); mFabLayout.setAutoCancel(false); mFabLayout.setOnClickFabListener(this); @@ -228,7 +225,7 @@ public class DownloadScene extends ToolbarScene public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); updateTitle(); - setNavigationIcon(VectorDrawable.create(getContext(), R.xml.ic_arrow_left_dark_x24)); + setNavigationIcon(R.drawable.ic_arrow_left_dark_x24); // Clear nav checked item setNavCheckedItem(R.id.nav_download); 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 887cb2b07..14a466173 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 @@ -35,16 +35,15 @@ import android.view.View; import android.view.ViewAnimationUtils; import android.view.ViewGroup; import android.widget.EditText; +import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.hippo.anani.AnimationUtils; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.ehviewer.EhApplication; -import com.hippo.ehviewer.UrlOpener; import com.hippo.ehviewer.R; +import com.hippo.ehviewer.UrlOpener; import com.hippo.ehviewer.client.EhClient; import com.hippo.ehviewer.client.EhRequest; import com.hippo.ehviewer.client.EhUrl; @@ -57,11 +56,11 @@ import com.hippo.text.URLImageGetter; import com.hippo.util.ActivityHelper; import com.hippo.util.ReadableTime; import com.hippo.util.TextUrl; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; import com.hippo.widget.LinkifyTextView; -import com.hippo.widget.SimpleImageView; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.LayoutUtils; +import com.hippo.yorozuya.SimpleAnimatorListener; public final class GalleryCommentsScene extends ToolbarScene implements EasyRecyclerView.OnItemClickListener, @@ -77,7 +76,7 @@ public final class GalleryCommentsScene extends ToolbarScene private FloatingActionButton mFab; private View mEditPanel; - private SimpleImageView mSendImage; + private ImageView mSendImage; private EditText mEditText; private CommentAdapter mAdapter; @@ -137,9 +136,8 @@ public final class GalleryCommentsScene extends ToolbarScene View view = inflater.inflate(R.layout.scene_gallery_comments, container, false); EasyRecyclerView recyclerView = (EasyRecyclerView) view.findViewById(R.id.recycler_view); View tip = view.findViewById(R.id.tip); - SimpleImageView tipImage = (SimpleImageView) tip.findViewById(R.id.tip_image); mEditPanel = view.findViewById(R.id.edit_panel); - mSendImage = (SimpleImageView) mEditPanel.findViewById(R.id.send); + mSendImage = (ImageView) mEditPanel.findViewById(R.id.send); mEditText = (EditText) mEditPanel.findViewById(R.id.edit_text); mFab = (FloatingActionButton) view.findViewById(R.id.fab); @@ -157,12 +155,7 @@ public final class GalleryCommentsScene extends ToolbarScene recyclerView.setOnItemClickListener(this); recyclerView.setOnItemLongClickListener(this); - tipImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); - - mSendImage.setDrawable(VectorDrawable.create(getContext(), R.xml.ic_send_dark_x24)); mSendImage.setOnClickListener(this); - - mFab.setImageDrawable(VectorDrawable.create(getContext(), R.xml.ic_reply_dark_x24)); mFab.setOnClickListener(this); mViewTransition = new ViewTransition(recyclerView, tip); @@ -187,7 +180,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.xml.ic_arrow_left_dark_x24)); + setNavigationIcon(R.drawable.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 3cb78e0e6..683ae6674 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 @@ -40,6 +40,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewAnimationUtils; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RatingBar; import android.widget.TextView; @@ -72,16 +73,14 @@ import com.hippo.text.Html; import com.hippo.text.URLImageGetter; import com.hippo.util.ActivityHelper; import com.hippo.util.ApiHelper; +import com.hippo.util.DrawableManager; import com.hippo.util.ExceptionUtils; import com.hippo.util.ReadableTime; -import com.hippo.vector.AnimatedVectorDrawable; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; import com.hippo.widget.AutoWrapLayout; import com.hippo.widget.LoadImageView; import com.hippo.widget.ProgressiveRatingBar; import com.hippo.widget.SimpleGridLayout; -import com.hippo.widget.SimpleImageView; import com.hippo.yorozuya.SimpleHandler; import java.lang.annotation.Retention; @@ -126,7 +125,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene private TextView mTitle; private TextView mUploader; private TextView mCategory; - private SimpleImageView mOtherActions; + private ImageView mOtherActions; private ViewGroup mActionGroup; private View mDownload; private View mRead; @@ -164,8 +163,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene private ViewTransition mViewTransition2; - private AnimatedVectorDrawable mHeartDrawable; - private AnimatedVectorDrawable mHeartOutlineDrawable; private PopupMenu mPopupMenu; @Nullable @@ -316,10 +313,8 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene View mainView = main.findViewById(R.id.scroll_view); View progressView = main.findViewById(R.id.progress_view); mFailedView = (ViewGroup) main.findViewById(R.id.tip); - SimpleImageView mFailedImage = (SimpleImageView) mFailedView.getChildAt(0); mFailedText = (TextView) mFailedView.getChildAt(1); mFailedView.setOnClickListener(this); - mFailedImage.setDrawable(VectorDrawable.create(getContext(), R.xml.sadpanda_head)); mViewTransition = new ViewTransition(mainView, progressView, mFailedView); mHeader = mainView.findViewById(R.id.header); @@ -328,11 +323,10 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mTitle = (TextView) mHeader.findViewById(R.id.title); mUploader = (TextView) mHeader.findViewById(R.id.uploader); mCategory = (TextView) mHeader.findViewById(R.id.category); - mOtherActions = (SimpleImageView) mHeader.findViewById(R.id.other_actions); + mOtherActions = (ImageView) mHeader.findViewById(R.id.other_actions); 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.xml.ic_dots_vertical_secondary_dark_x24)); RippleSalon.addRipple(mOtherActions, false); RippleSalon.addRipple(mDownload, false); RippleSalon.addRipple(mRead, false); @@ -342,6 +336,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mDownload.setOnClickListener(this); mRead.setOnClickListener(this); + mBelowHeader = mainView.findViewById(R.id.below_header); View belowHeader = mBelowHeader; @@ -371,6 +366,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mTorrent.setOnClickListener(this); mShare.setOnClickListener(this); mRate.setOnClickListener(this); + ensureActionDrawable(); mTags = (LinearLayout) belowHeader.findViewById(R.id.tags); mNoTags = (TextView) mTags.findViewById(R.id.no_tags); @@ -472,8 +468,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mViewTransition2 = null; - mHeartDrawable = null; - mHeartOutlineDrawable = null; mPopupMenu = null; } @@ -521,6 +515,24 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return true; } + private void setActionDrawable(TextView text, Drawable drawable) { + drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); + text.setCompoundDrawables(null, drawable, null, null); + } + + private void ensureActionDrawable() { + Drawable heart = DrawableManager.getDrawable(getContext(), R.drawable.v_heart_primary_x48); + setActionDrawable(mHeart, heart); + Drawable heartOutline = DrawableManager.getDrawable(getContext(), R.drawable.v_heart_outline_primary_x48); + setActionDrawable(mHeartOutline, heartOutline); + Drawable torrent = DrawableManager.getDrawable(getContext(), R.drawable.v_utorrent_primary_x48); + setActionDrawable(mTorrent, torrent); + Drawable share = DrawableManager.getDrawable(getContext(), R.drawable.v_share_primary_x48); + setActionDrawable(mShare, share); + Drawable rate = DrawableManager.getDrawable(getContext(), R.drawable.v_thumb_up_primary_x48); + setActionDrawable(mRate, rate); + } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private boolean createCircularReveal() { int w = mColorBg.getWidth(); @@ -597,32 +609,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene } } - 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; - } - - 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() { GalleryDetail gd = mGalleryDetail; @@ -648,7 +634,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mRatingText.setText(getAllRatingText(gd.rating, gd.ratedTimes)); mRating.setRating(gd.rating); - 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 82dbe014c..ad6386db8 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 @@ -39,7 +39,6 @@ import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.data.GalleryDetail; import com.hippo.rippleold.RippleSalon; import com.hippo.util.ActivityHelper; -import com.hippo.vector.VectorDrawable; import com.hippo.yorozuya.LayoutUtils; import java.util.ArrayList; @@ -170,7 +169,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.xml.ic_arrow_left_dark_x24)); + setNavigationIcon(R.drawable.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 d2cf5b21b..7c5e78a3b 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 @@ -48,8 +48,6 @@ import android.view.WindowManager; import android.widget.TextView; import android.widget.Toast; -import com.hippo.anani.AnimationUtils; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.drawable.AddDeleteDrawable; import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.easyrecyclerview.EasyRecyclerView; @@ -76,12 +74,14 @@ import com.hippo.scene.StageActivity; import com.hippo.scene.TransitionHelper; import com.hippo.util.ActivityHelper; import com.hippo.util.ApiHelper; -import com.hippo.vector.VectorDrawable; +import com.hippo.util.DrawableManager; import com.hippo.view.ViewTransition; import com.hippo.widget.ContentLayout; import com.hippo.widget.LoadImageView; import com.hippo.widget.OffsetLayout; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.MathUtils; +import com.hippo.yorozuya.SimpleAnimatorListener; import com.hippo.yorozuya.SimpleHandler; import java.lang.annotation.Retention; @@ -218,7 +218,7 @@ public final class GalleryListScene extends BaseScene private void setSearchBarHint(Context context, SearchBar searchBar) { Resources resources = context.getResources(); - Drawable searchImage = VectorDrawable.create(context, R.xml.ic_magnify_x24); + Drawable searchImage = DrawableManager.getDrawable(context, R.drawable.v_magnify_x24); SpannableStringBuilder ssb = new SpannableStringBuilder(" "); ssb.append(resources.getString(R.string.gallery_list_search_bar_hint)); int textSize = (int) (searchBar.getEditTextTextSize() * 1.25); @@ -311,8 +311,6 @@ public final class GalleryListScene extends BaseScene mSearchLayout.setHelper(this); - Drawable searchDrawable = VectorDrawable.create(getContext(), R.xml.ic_magnify_dark_x24); - mFab.setImageDrawable(searchDrawable); mFab.setOnClickListener(this); mSearchBarMoveHelper = new SearchBarMoveHelper(); 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 d8ba28af6..5f2383159 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 @@ -48,7 +48,6 @@ import com.hippo.ehviewer.client.exception.EhException; import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; import com.hippo.util.ActivityHelper; -import com.hippo.vector.VectorDrawable; import com.hippo.widget.ContentLayout; import com.hippo.widget.LoadImageView; import com.hippo.widget.Slider; @@ -152,7 +151,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.xml.ic_arrow_left_dark_x24)); + setNavigationIcon(R.drawable.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 5aff3f39b..7b465abfa 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 @@ -34,9 +34,7 @@ import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; import com.hippo.util.ActivityHelper; import com.hippo.util.ExceptionUtils; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; -import com.hippo.widget.SimpleImageView; /** * Only show a progress with jobs in background @@ -154,11 +152,9 @@ public final class ProgressScene extends BaseScene implements View.OnClickListen View view = inflater.inflate(R.layout.scene_progress, container, false); View progress = view.findViewById(R.id.progress); mTip = view.findViewById(R.id.tip); - SimpleImageView tipImage = (SimpleImageView) mTip.findViewById(R.id.tip_image); mTipText = (TextView) mTip.findViewById(R.id.tip_text); mTip.setOnClickListener(this); - 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 0bf4ceaf9..b73902c98 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 @@ -16,7 +16,6 @@ package com.hippo.ehviewer.ui.scene; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.LayoutInflater; @@ -29,8 +28,6 @@ import com.hippo.ehviewer.client.EhUtils; import com.hippo.rippleold.RippleSalon; import com.hippo.scene.Announcer; import com.hippo.util.ActivityHelper; -import com.hippo.vector.VectorDrawable; -import com.hippo.widget.SimpleImageView; public final class WarningScene extends BaseScene implements View.OnClickListener { @@ -43,13 +40,9 @@ public final class WarningScene extends BaseScene implements View.OnClickListene @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.scene_warning, container, false); - SimpleImageView alert = (SimpleImageView) view.findViewById(R.id.icon_alert); mCancel = view.findViewById(R.id.cancel); mOk = view.findViewById(R.id.ok); - Drawable drawable = VectorDrawable.create(getContext(), R.xml.ic_alert_red_x48); - alert.setDrawable(drawable); - mCancel.setOnClickListener(this); mOk.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java index 8d7186c96..dcc8587eb 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -41,11 +41,11 @@ import android.widget.FrameLayout; import android.widget.ListView; import android.widget.TextView; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.ehviewer.R; import com.hippo.view.ViewTransition; import com.hippo.widget.SimpleImageView; import com.hippo.yorozuya.MathUtils; +import com.hippo.yorozuya.SimpleAnimatorListener; import com.hippo.yorozuya.ViewUtils; import java.util.ArrayList; 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 72fbe8eec..927f1efe8 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -18,7 +18,6 @@ package com.hippo.ehviewer.widget; import android.content.Context; import android.content.res.Resources; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; import android.support.annotation.IntDef; @@ -34,6 +33,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.TextView; import com.hippo.easyrecyclerview.EasyRecyclerView; @@ -41,7 +41,6 @@ import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.data.ListUrlBuilder; import com.hippo.rippleold.RippleSalon; import com.hippo.widget.RadioGridGroup; -import com.hippo.widget.SimpleImageView; import com.hippo.yorozuya.ViewUtils; import java.lang.annotation.Retention; @@ -86,7 +85,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC private View mNormalView; private CategoryTable mCategoryTable; private RadioGridGroup mNormalSearchMode; - private SimpleImageView mNormalSearchModeHelp; + private ImageView mNormalSearchModeHelp; private View mSearchTagHelp; private SwitchCompat mEnableAdvanceSwitch; @@ -133,10 +132,8 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC mNormalView = normalView; mCategoryTable = (CategoryTable) normalView.findViewById(R.id.search_category_table); mNormalSearchMode = (RadioGridGroup) normalView.findViewById(R.id.normal_search_mode); - mNormalSearchModeHelp = (SimpleImageView) normalView.findViewById(R.id.normal_search_mode_help); + mNormalSearchModeHelp = (ImageView) 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.xml.ic_help_circle_x24); - mNormalSearchModeHelp.setDrawable(helpDrawable); mNormalSearchModeHelp.setOnClickListener(this); RippleSalon.addRipple(mNormalSearchModeHelp, false); mEnableAdvanceSwitch.setOnCheckedChangeListener(SearchLayout.this); diff --git a/app/src/main/java/com/hippo/gl/widget/GLProgressView.java b/app/src/main/java/com/hippo/gl/widget/GLProgressView.java index 7f785e8ec..22e8c5bf4 100644 --- a/app/src/main/java/com/hippo/gl/widget/GLProgressView.java +++ b/app/src/main/java/com/hippo/gl/widget/GLProgressView.java @@ -18,10 +18,10 @@ package com.hippo.gl.widget; import android.graphics.Color; import android.graphics.Path; +import android.support.v4.view.animation.PathInterpolatorCompat; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.hippo.anani.PathInterpolator; import com.hippo.gl.anim.Animation; import com.hippo.gl.anim.FloatAnimation; import com.hippo.gl.glrenderer.GLCanvas; @@ -43,16 +43,16 @@ public class GLProgressView extends GLView { trimStartPath.moveTo(0.0f, 0.0f); trimStartPath.lineTo(0.5f, 0.0f); trimStartPath.cubicTo(0.7f, 0.0f, 0.6f, 1f, 1f, 1f); - TRIM_START_INTERPOLATOR = PathInterpolator.build(trimStartPath); + TRIM_START_INTERPOLATOR = PathInterpolatorCompat.create(trimStartPath); Path trimEndPath = new Path(); trimEndPath.moveTo(0.0f, 0.0f); trimEndPath.cubicTo(0.2f, 0.0f, 0.1f, 1f, 0.5f, 1f); trimEndPath.lineTo(1f, 1f); - TRIM_END_INTERPOLATOR = PathInterpolator.build(trimEndPath); + TRIM_END_INTERPOLATOR = PathInterpolatorCompat.create(trimEndPath); } - private GLPaint mGLPaint; + private final GLPaint mGLPaint; private float mCx; private float mCy; diff --git a/app/src/main/java/com/hippo/util/DrawableManager.java b/app/src/main/java/com/hippo/util/DrawableManager.java new file mode 100644 index 000000000..06277c575 --- /dev/null +++ b/app/src/main/java/com/hippo/util/DrawableManager.java @@ -0,0 +1,45 @@ +/* + * Copyright 2016 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 + * 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. + */ + +package com.hippo.util; + +import android.content.Context; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.support.annotation.DrawableRes; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.graphics.drawable.VectorDrawableCompat; +import android.support.v7.widget.AppCompatDrawableManager; + +public final class DrawableManager { + + private static final AppCompatDrawableManager sManager = AppCompatDrawableManager.get(); + + public static Drawable getDrawable(@NonNull Context context, @DrawableRes int resId) { + return sManager.getDrawable(context, resId); + } + + public static Drawable getVectorDrawable(@NonNull Resources res, + @DrawableRes int resId, @Nullable Resources.Theme theme) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return res.getDrawable(resId, theme); + } else { + return VectorDrawableCompat.create(res, resId, theme); + } + } +} diff --git a/app/src/main/java/com/hippo/view/ViewTransition.java b/app/src/main/java/com/hippo/view/ViewTransition.java index e5fc6c311..b00f1f57b 100644 --- a/app/src/main/java/com/hippo/view/ViewTransition.java +++ b/app/src/main/java/com/hippo/view/ViewTransition.java @@ -20,11 +20,11 @@ import android.animation.Animator; import android.animation.ObjectAnimator; import android.view.View; -import com.hippo.anani.SimpleAnimatorListener; +import com.hippo.yorozuya.SimpleAnimatorListener; public class ViewTransition { - private static long ANIMATE_TIME = 300L; + private static final long ANIMATE_TIME = 300L; private final View[] mViews; diff --git a/app/src/main/java/com/hippo/widget/CheckTextView.java b/app/src/main/java/com/hippo/widget/CheckTextView.java index 357a8649e..181615685 100644 --- a/app/src/main/java/com/hippo/widget/CheckTextView.java +++ b/app/src/main/java/com/hippo/widget/CheckTextView.java @@ -33,12 +33,12 @@ import android.view.View.OnClickListener; import android.view.animation.Interpolator; import android.widget.TextView; -import com.hippo.anani.AnimationUtils; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.ehviewer.R; import com.hippo.hotspot.HotspotTouchHelper; import com.hippo.hotspot.Hotspotable; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.MathUtils; +import com.hippo.yorozuya.SimpleAnimatorListener; public class CheckTextView extends TextView implements OnClickListener, Hotspotable { diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index fd586a65a..a2e8027fd 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -35,7 +35,6 @@ import com.hippo.easyrecyclerview.HandlerDrawable; import com.hippo.easyrecyclerview.LayoutManagerUtils; import com.hippo.ehviewer.R; import com.hippo.util.ExceptionUtils; -import com.hippo.vector.VectorDrawable; import com.hippo.view.ViewTransition; import com.hippo.widget.refreshlayout.RefreshLayout; import com.hippo.yorozuya.IntIdGenerator; @@ -92,15 +91,12 @@ public class ContentLayout extends FrameLayout { mRecyclerView = (EasyRecyclerView) mRefreshLayout.findViewById(R.id.recycler_view); mImageView = mTipView.getChildAt(0); mTextView = (TextView) mTipView.getChildAt(1); - SimpleImageView imageView = (SimpleImageView) findViewById(R.id.empty_image); mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable drawable = new HandlerDrawable(); drawable.setColor(ResourcesUtils.getAttrColor(context, R.attr.colorAccent)); mFastScroller.setHandlerDrawable(drawable); - imageView.setDrawable(VectorDrawable.create(context, R.xml.sadpanda_head)); - mRefreshLayout.setHeaderColorSchemeResources( R.color.loading_indicator_red, R.color.loading_indicator_purple, diff --git a/app/src/main/java/com/hippo/widget/FabLayout.java b/app/src/main/java/com/hippo/widget/FabLayout.java index ecb41af36..3d8bbe3d1 100644 --- a/app/src/main/java/com/hippo/widget/FabLayout.java +++ b/app/src/main/java/com/hippo/widget/FabLayout.java @@ -27,10 +27,10 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Interpolator; -import com.hippo.anani.AnimationUtils; -import com.hippo.anani.SimpleAnimatorListener; import com.hippo.ehviewer.R; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.AssertUtils; +import com.hippo.yorozuya.SimpleAnimatorListener; public class FabLayout extends ViewGroup implements View.OnClickListener { diff --git a/app/src/main/java/com/hippo/widget/ProgressView.java b/app/src/main/java/com/hippo/widget/ProgressView.java index 221d4747d..d25fe710f 100644 --- a/app/src/main/java/com/hippo/widget/ProgressView.java +++ b/app/src/main/java/com/hippo/widget/ProgressView.java @@ -27,13 +27,13 @@ import android.graphics.Path; import android.graphics.RectF; import android.support.annotation.NonNull; import android.support.v4.view.ViewCompat; +import android.support.v4.view.animation.PathInterpolatorCompat; import android.util.AttributeSet; import android.view.View; import android.view.animation.Animation; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; -import com.hippo.anani.PathInterpolator; import com.hippo.ehviewer.R; import com.hippo.yorozuya.ViewUtils; @@ -51,13 +51,13 @@ public class ProgressView extends View { trimStartPath.moveTo(0.0f, 0.0f); trimStartPath.lineTo(0.5f, 0.0f); trimStartPath.cubicTo(0.7f, 0.0f, 0.6f, 1f, 1f, 1f); - TRIM_START_INTERPOLATOR = PathInterpolator.build(trimStartPath); + TRIM_START_INTERPOLATOR = PathInterpolatorCompat.create(trimStartPath); Path trimEndPath = new Path(); trimEndPath.moveTo(0.0f, 0.0f); trimEndPath.cubicTo(0.2f, 0.0f, 0.1f, 1f, 0.5f, 1f); trimEndPath.lineTo(1f, 1f); - TRIM_END_INTERPOLATOR = PathInterpolator.build(trimEndPath); + TRIM_END_INTERPOLATOR = PathInterpolatorCompat.create(trimEndPath); } private final ArrayList mAnimators = new ArrayList<>(); diff --git a/app/src/main/java/com/hippo/widget/Slider.java b/app/src/main/java/com/hippo/widget/Slider.java index 9c90560b8..288957639 100644 --- a/app/src/main/java/com/hippo/widget/Slider.java +++ b/app/src/main/java/com/hippo/widget/Slider.java @@ -19,13 +19,17 @@ package com.hippo.widget; import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; +import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.Gravity; import android.view.MotionEvent; @@ -34,9 +38,8 @@ import android.view.ViewConfiguration; import android.widget.AbsoluteLayout; import android.widget.PopupWindow; -import com.hippo.anani.AnimationUtils; import com.hippo.ehviewer.R; -import com.hippo.vector.VectorDrawable; +import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.LayoutUtils; import com.hippo.yorozuya.MathUtils; import com.hippo.yorozuya.SimpleHandler; @@ -116,8 +119,9 @@ public class Slider extends View { Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG); textPaint.setTextAlign(Paint.Align.CENTER); - mBubbleMinWidth = LayoutUtils.dp2pix(context, BUBBLE_WIDTH); - mBubbleMinHeight = LayoutUtils.dp2pix(context, BUBBLE_HEIGHT); + Resources resources = context.getResources(); + mBubbleMinWidth = resources.getDimensionPixelOffset(R.dimen.slider_bubble_width); + mBubbleMinHeight = resources.getDimensionPixelOffset(R.dimen.slider_bubble_height); mBubble = new BubbleView(context, textPaint); mBubble.setScaleX(0.0f); @@ -460,11 +464,11 @@ public class Slider extends View { } @SuppressLint("ViewConstructor") - private static class BubbleView extends View { + private static class BubbleView extends AppCompatImageView { private static final float TEXT_CENTER = (float) BUBBLE_WIDTH / 2.0f / BUBBLE_HEIGHT; - private final VectorDrawable mVectorDrawable; + private final Drawable mDrawable; private final Paint mTextPaint; @@ -475,16 +479,14 @@ public class Slider extends View { @SuppressWarnings("deprecation") public BubbleView(Context context, Paint paint) { super(context); - mVectorDrawable = VectorDrawable.create(context, R.xml.slider_bubble); - setBackgroundDrawable(mVectorDrawable); + setImageResource(R.drawable.v_slider_bubble); + mDrawable = DrawableCompat.wrap(getDrawable()); + setImageDrawable(mDrawable); mTextPaint = paint; } public void setColor(int color) { - Object obj = mVectorDrawable.getTargetByName("bubble"); - if (obj instanceof VectorDrawable.VFullPath) { - ((VectorDrawable.VFullPath) obj).setFillColor(color); - } + DrawableCompat.setTint(mDrawable, color); } public void setProgress(int progress) { @@ -505,6 +507,8 @@ public class Slider extends View { @Override protected void onDraw(@NonNull Canvas canvas) { + super.onDraw(canvas); + int width = getWidth(); int height = getHeight(); int x = width / 2; diff --git a/app/src/main/res-vector/xml/ic_heart_outline_animated.xml b/app/src/main/res-vector/xml/ic_heart_outline_animated.xml deleted file mode 100644 index 2ed52cf80..000000000 --- a/app/src/main/res-vector/xml/ic_heart_outline_animated.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/ic_reply_dark_x24.xml b/app/src/main/res-vector/xml/ic_reply_dark_x24.xml deleted file mode 100644 index c1461b40b..000000000 --- a/app/src/main/res-vector/xml/ic_reply_dark_x24.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/ic_send_dark_x24.xml b/app/src/main/res-vector/xml/ic_send_dark_x24.xml deleted file mode 100644 index 87168919d..000000000 --- a/app/src/main/res-vector/xml/ic_send_dark_x24.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/ic_share_primary_x48.xml b/app/src/main/res-vector/xml/ic_share_primary_x48.xml deleted file mode 100644 index 04342a0a7..000000000 --- a/app/src/main/res-vector/xml/ic_share_primary_x48.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/ic_thumb_up_primary_x48.xml b/app/src/main/res-vector/xml/ic_thumb_up_primary_x48.xml deleted file mode 100644 index 1a8380364..000000000 --- a/app/src/main/res-vector/xml/ic_thumb_up_primary_x48.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/ic_utorrent_primary_x48.xml b/app/src/main/res-vector/xml/ic_utorrent_primary_x48.xml deleted file mode 100644 index f71e3b9d5..000000000 --- a/app/src/main/res-vector/xml/ic_utorrent_primary_x48.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res-vector/xml/sadpanda_head.xml b/app/src/main/res-vector/xml/sadpanda_head.xml deleted file mode 100644 index e29625961..000000000 --- a/app/src/main/res-vector/xml/sadpanda_head.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res-vector/xml/slider_bubble.xml b/app/src/main/res-vector/xml/slider_bubble.xml deleted file mode 100644 index 3ea98710c..000000000 --- a/app/src/main/res-vector/xml/slider_bubble.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/anim/path_heart.xml b/app/src/main/res/anim/path_heart.xml deleted file mode 100644 index f10510483..000000000 --- a/app/src/main/res/anim/path_heart.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/app/src/main/res/anim/path_heart_outline.xml b/app/src/main/res/anim/path_heart_outline.xml deleted file mode 100644 index 3535ea1b4..000000000 --- a/app/src/main/res/anim/path_heart_outline.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-hdpi/ic_add_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_add_dark_x24.png deleted file mode 100644 index 1da3b2146..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_check_all_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_check_all_dark_x24.png deleted file mode 100644 index 1136ba8eb..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_check_all_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_close_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_close_dark_x24.png deleted file mode 100644 index 6df2fb4c1..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_close_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_close_x24.png b/app/src/main/res/drawable-hdpi/ic_close_x24.png deleted file mode 100644 index d1cfcaa91..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_close_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_delete_red_x24.png b/app/src/main/res/drawable-hdpi/ic_delete_red_x24.png deleted file mode 100644 index 11416cd46..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_delete_red_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_folder_move_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_folder_move_dark_x24.png deleted file mode 100644 index 9662b1325..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_folder_move_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_go_to_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_go_to_dark_x24.png deleted file mode 100644 index 84a8b1000..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_go_to_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_x24.png b/app/src/main/res/drawable-hdpi/ic_info_outline_x24.png deleted file mode 100644 index 848324488..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_info_outline_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_label_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_label_dark_x24.png deleted file mode 100644 index f43066ada..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_label_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_pause_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_pause_dark_x24.png deleted file mode 100644 index 2efde69c0..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_pause_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_play_dark_x24.png deleted file mode 100644 index c2bbeedf1..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_x24.png b/app/src/main/res/drawable-hdpi/ic_play_x24.png deleted file mode 100644 index f1fdff9c7..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_dark_x24.png b/app/src/main/res/drawable-hdpi/ic_settings_dark_x24.png deleted file mode 100644 index d4e6abcaa..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_settings_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_eh.png b/app/src/main/res/drawable-hdpi/ic_settings_eh.png deleted file mode 100644 index 3c9552b84..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_settings_eh.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_read.png b/app/src/main/res/drawable-hdpi/ic_settings_read.png deleted file mode 100644 index 14a7b21ef..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_settings_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_download.png b/app/src/main/res/drawable-hdpi/nav_download.png deleted file mode 100644 index 96d89cb11..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_download.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_favourite.png b/app/src/main/res/drawable-hdpi/nav_favourite.png deleted file mode 100644 index 26b6c1eaa..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_favourite.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_history.png b/app/src/main/res/drawable-hdpi/nav_history.png deleted file mode 100644 index 4e68a5f0e..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_history.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_homepage.png b/app/src/main/res/drawable-hdpi/nav_homepage.png deleted file mode 100644 index 22d5e8387..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_homepage.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_settings.png b/app/src/main/res/drawable-hdpi/nav_settings.png deleted file mode 100644 index 92e7ba5cd..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/nav_whats_hot.png b/app/src/main/res/drawable-hdpi/nav_whats_hot.png deleted file mode 100644 index 53e580750..000000000 Binary files a/app/src/main/res/drawable-hdpi/nav_whats_hot.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_add_dark_x24.png deleted file mode 100644 index 877dc286a..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_check_all_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_check_all_dark_x24.png deleted file mode 100644 index 0fb475ece..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_check_all_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_close_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_close_dark_x24.png deleted file mode 100644 index d4d30f880..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_close_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_close_x24.png b/app/src/main/res/drawable-mdpi/ic_close_x24.png deleted file mode 100644 index 21322cdbe..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_close_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_delete_red_x24.png b/app/src/main/res/drawable-mdpi/ic_delete_red_x24.png deleted file mode 100644 index f0ee9e8d9..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_delete_red_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_folder_move_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_folder_move_dark_x24.png deleted file mode 100644 index 9e6f969f3..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_folder_move_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_go_to_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_go_to_dark_x24.png deleted file mode 100644 index 1b69918a3..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_go_to_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_x24.png b/app/src/main/res/drawable-mdpi/ic_info_outline_x24.png deleted file mode 100644 index 7478dcb5e..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_info_outline_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_label_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_label_dark_x24.png deleted file mode 100644 index cfc868c0f..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_label_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_pause_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_pause_dark_x24.png deleted file mode 100644 index 1648532cd..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_pause_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_play_dark_x24.png deleted file mode 100644 index c8c3f59df..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_x24.png b/app/src/main/res/drawable-mdpi/ic_play_x24.png deleted file mode 100644 index 9aaabcbce..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_dark_x24.png b/app/src/main/res/drawable-mdpi/ic_settings_dark_x24.png deleted file mode 100644 index b30d9a85c..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_settings_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_eh.png b/app/src/main/res/drawable-mdpi/ic_settings_eh.png deleted file mode 100644 index 06e4c57b5..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_settings_eh.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_read.png b/app/src/main/res/drawable-mdpi/ic_settings_read.png deleted file mode 100644 index 79a20133f..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_settings_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_download.png b/app/src/main/res/drawable-mdpi/nav_download.png deleted file mode 100644 index b3e41c7a1..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_download.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_favourite.png b/app/src/main/res/drawable-mdpi/nav_favourite.png deleted file mode 100644 index 5fcf460a0..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_favourite.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_history.png b/app/src/main/res/drawable-mdpi/nav_history.png deleted file mode 100644 index eedaecc39..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_history.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_homepage.png b/app/src/main/res/drawable-mdpi/nav_homepage.png deleted file mode 100644 index 4dd2af96a..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_homepage.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_settings.png b/app/src/main/res/drawable-mdpi/nav_settings.png deleted file mode 100644 index 874df7563..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/nav_whats_hot.png b/app/src/main/res/drawable-mdpi/nav_whats_hot.png deleted file mode 100644 index b3cd25057..000000000 Binary files a/app/src/main/res/drawable-mdpi/nav_whats_hot.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_add_dark_x24.png deleted file mode 100644 index 67bb598e5..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_check_all_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_check_all_dark_x24.png deleted file mode 100644 index 2e18509a9..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_check_all_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_close_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_close_dark_x24.png deleted file mode 100644 index 05ae649e2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_close_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_close_x24.png b/app/src/main/res/drawable-xhdpi/ic_close_x24.png deleted file mode 100644 index 89bfb48d6..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_close_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_red_x24.png b/app/src/main/res/drawable-xhdpi/ic_delete_red_x24.png deleted file mode 100644 index 6753cf8f6..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_red_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_move_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_folder_move_dark_x24.png deleted file mode 100644 index a6b3fe743..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_move_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_go_to_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_go_to_dark_x24.png deleted file mode 100644 index a4f4e05dc..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_go_to_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_x24.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_x24.png deleted file mode 100644 index c34be33df..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_info_outline_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_label_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_label_dark_x24.png deleted file mode 100644 index 57f863b45..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_label_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_pause_dark_x24.png deleted file mode 100644 index a47b69e33..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_play_dark_x24.png deleted file mode 100644 index 583936779..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_x24.png b/app/src/main/res/drawable-xhdpi/ic_play_x24.png deleted file mode 100644 index 25e57c052..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_dark_x24.png b/app/src/main/res/drawable-xhdpi/ic_settings_dark_x24.png deleted file mode 100644 index 083d6135b..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_eh.png b/app/src/main/res/drawable-xhdpi/ic_settings_eh.png deleted file mode 100644 index 9f97ded8b..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_eh.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_read.png b/app/src/main/res/drawable-xhdpi/ic_settings_read.png deleted file mode 100644 index 07dcbb2d9..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_download.png b/app/src/main/res/drawable-xhdpi/nav_download.png deleted file mode 100644 index 7a36a7ae9..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_download.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_favourite.png b/app/src/main/res/drawable-xhdpi/nav_favourite.png deleted file mode 100644 index ae6cd2ca2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_favourite.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_history.png b/app/src/main/res/drawable-xhdpi/nav_history.png deleted file mode 100644 index 1b44122db..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_history.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_homepage.png b/app/src/main/res/drawable-xhdpi/nav_homepage.png deleted file mode 100644 index 4b9e18bcd..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_homepage.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_settings.png b/app/src/main/res/drawable-xhdpi/nav_settings.png deleted file mode 100644 index 0992ed732..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/nav_whats_hot.png b/app/src/main/res/drawable-xhdpi/nav_whats_hot.png deleted file mode 100644 index 81b111d5c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/nav_whats_hot.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_add_dark_x24.png deleted file mode 100644 index 0fdced8fc..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_all_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_check_all_dark_x24.png deleted file mode 100644 index a1ec718fe..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_check_all_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_close_dark_x24.png deleted file mode 100644 index 7d983009f..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_x24.png b/app/src/main/res/drawable-xxhdpi/ic_close_x24.png deleted file mode 100644 index 9b7fa46ed..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_red_x24.png b/app/src/main/res/drawable-xxhdpi/ic_delete_red_x24.png deleted file mode 100644 index 6b303db50..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_red_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_move_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_folder_move_dark_x24.png deleted file mode 100644 index 80ee8bfa1..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_move_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_go_to_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_go_to_dark_x24.png deleted file mode 100644 index ba8cb638a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_go_to_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_x24.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_x24.png deleted file mode 100644 index f2ea92763..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_outline_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_label_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_label_dark_x24.png deleted file mode 100644 index 7a020b40c..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_label_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_pause_dark_x24.png deleted file mode 100644 index ca711d9b3..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_play_dark_x24.png deleted file mode 100644 index f782a6ed4..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_x24.png b/app/src/main/res/drawable-xxhdpi/ic_play_x24.png deleted file mode 100644 index 8c75c621d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_dark_x24.png b/app/src/main/res/drawable-xxhdpi/ic_settings_dark_x24.png deleted file mode 100644 index 4f6bb7674..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_dark_x24.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_eh.png b/app/src/main/res/drawable-xxhdpi/ic_settings_eh.png deleted file mode 100644 index d567e3d8e..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_eh.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_read.png b/app/src/main/res/drawable-xxhdpi/ic_settings_read.png deleted file mode 100644 index 2072b7ad6..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_read.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_download.png b/app/src/main/res/drawable-xxhdpi/nav_download.png deleted file mode 100644 index 4f188204b..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_download.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_favourite.png b/app/src/main/res/drawable-xxhdpi/nav_favourite.png deleted file mode 100644 index 1e2968eef..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_favourite.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_history.png b/app/src/main/res/drawable-xxhdpi/nav_history.png deleted file mode 100644 index de7b9d661..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_history.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_homepage.png b/app/src/main/res/drawable-xxhdpi/nav_homepage.png deleted file mode 100644 index 9969bb120..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_homepage.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_settings.png b/app/src/main/res/drawable-xxhdpi/nav_settings.png deleted file mode 100644 index dc26f0abe..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/nav_whats_hot.png b/app/src/main/res/drawable-xxhdpi/nav_whats_hot.png deleted file mode 100644 index 85bb9facf..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/nav_whats_hot.png and /dev/null differ diff --git a/app/src/main/res-vector/xml/ic_heart_animated.xml b/app/src/main/res/drawable/sad_panda.xml similarity index 77% rename from app/src/main/res-vector/xml/ic_heart_animated.xml rename to app/src/main/res/drawable/sad_panda.xml index 1604fea65..b5aba8f71 100644 --- a/app/src/main/res-vector/xml/ic_heart_animated.xml +++ b/app/src/main/res/drawable/sad_panda.xml @@ -15,12 +15,7 @@ ~ limitations under the License. --> + - - - - + xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/sad_panda_internal"/> diff --git a/app/src/main/res/drawable/sad_panda_internal.xml b/app/src/main/res/drawable/sad_panda_internal.xml new file mode 100644 index 000000000..0fd720e3d --- /dev/null +++ b/app/src/main/res/drawable/sad_panda_internal.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res-vector/xml/ic_alert_red_x48.xml b/app/src/main/res/drawable/v_alert_red_x48.xml similarity index 77% rename from app/src/main/res-vector/xml/ic_alert_red_x48.xml rename to app/src/main/res/drawable/v_alert_red_x48.xml index cb8f4a9f5..363621497 100644 --- a/app/src/main/res-vector/xml/ic_alert_red_x48.xml +++ b/app/src/main/res/drawable/v_alert_red_x48.xml @@ -17,16 +17,13 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="@string/pd_alert" + android:fillColor="@color/red_500"/> diff --git a/app/src/main/res-vector/xml/ic_magnify_dark_x24.xml b/app/src/main/res/drawable/v_book_open_primary_x24.xml similarity index 75% rename from app/src/main/res-vector/xml/ic_magnify_dark_x24.xml rename to app/src/main/res/drawable/v_book_open_primary_x24.xml index 8e798a8e8..070ae7992 100644 --- a/app/src/main/res-vector/xml/ic_magnify_dark_x24.xml +++ b/app/src/main/res/drawable/v_book_open_primary_x24.xml @@ -17,16 +17,13 @@ + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="?attr/colorPrimary" + android:pathData="@string/pd_book_open"/> diff --git a/app/src/main/res-vector/xml/ic_magnify_x24.xml b/app/src/main/res/drawable/v_check_all_dark_x24.xml similarity index 75% rename from app/src/main/res-vector/xml/ic_magnify_x24.xml rename to app/src/main/res/drawable/v_check_all_dark_x24.xml index 97295d71e..de3f905d3 100644 --- a/app/src/main/res-vector/xml/ic_magnify_x24.xml +++ b/app/src/main/res/drawable/v_check_all_dark_x24.xml @@ -17,16 +17,13 @@ + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/primary_drawable_dark" + android:pathData="@string/pd_check_all"/> diff --git a/app/src/main/res-vector/xml/ic_help_circle_x24.xml b/app/src/main/res/drawable/v_close_dark_x24.xml similarity index 75% rename from app/src/main/res-vector/xml/ic_help_circle_x24.xml rename to app/src/main/res/drawable/v_close_dark_x24.xml index a6fcafc23..35f28cf1e 100644 --- a/app/src/main/res-vector/xml/ic_help_circle_x24.xml +++ b/app/src/main/res/drawable/v_close_dark_x24.xml @@ -17,16 +17,13 @@ + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/primary_drawable_dark" + android:pathData="@string/pd_close"/> diff --git a/app/src/main/res-vector/xml/ic_dots_vertical_secondary_dark_x24.xml b/app/src/main/res/drawable/v_close_x24.xml similarity index 75% rename from app/src/main/res-vector/xml/ic_dots_vertical_secondary_dark_x24.xml rename to app/src/main/res/drawable/v_close_x24.xml index af35ab4ca..82fa4dd3a 100644 --- a/app/src/main/res-vector/xml/ic_dots_vertical_secondary_dark_x24.xml +++ b/app/src/main/res/drawable/v_close_x24.xml @@ -17,16 +17,13 @@ + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/primary_drawable_light" + android:pathData="@string/pd_close"/> diff --git a/app/src/main/res/drawable/v_delete_red_x24.xml b/app/src/main/res/drawable/v_delete_red_x24.xml new file mode 100644 index 000000000..e2df9c7ed --- /dev/null +++ b/app/src/main/res/drawable/v_delete_red_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml new file mode 100644 index 000000000..7ceaedbe2 --- /dev/null +++ b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_download_black_x24.xml b/app/src/main/res/drawable/v_download_black_x24.xml new file mode 100644 index 000000000..0515ff87d --- /dev/null +++ b/app/src/main/res/drawable/v_download_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_fire_black_x24.xml b/app/src/main/res/drawable/v_fire_black_x24.xml new file mode 100644 index 000000000..f6b0a681a --- /dev/null +++ b/app/src/main/res/drawable/v_fire_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_folder_move_dark_x24.xml b/app/src/main/res/drawable/v_folder_move_dark_x24.xml new file mode 100644 index 000000000..061750545 --- /dev/null +++ b/app/src/main/res/drawable/v_folder_move_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_go_to_dark_x24.xml b/app/src/main/res/drawable/v_go_to_dark_x24.xml new file mode 100644 index 000000000..d77be85f5 --- /dev/null +++ b/app/src/main/res/drawable/v_go_to_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_heart_black_x24.xml b/app/src/main/res/drawable/v_heart_black_x24.xml new file mode 100644 index 000000000..9986d83f0 --- /dev/null +++ b/app/src/main/res/drawable/v_heart_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml new file mode 100644 index 000000000..9a27594ca --- /dev/null +++ b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res-vector/xml/ic_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_primary_x48.xml similarity index 71% rename from app/src/main/res-vector/xml/ic_heart_outline_primary_x48.xml rename to app/src/main/res/drawable/v_heart_primary_x48.xml index 29f5aa871..5d20e6f9f 100644 --- a/app/src/main/res-vector/xml/ic_heart_outline_primary_x48.xml +++ b/app/src/main/res/drawable/v_heart_primary_x48.xml @@ -16,15 +16,14 @@ --> + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="?attr/colorPrimary" + android:pathData="@string/pd_heart"/> diff --git a/app/src/main/res/drawable/v_help_circle_x24.xml b/app/src/main/res/drawable/v_help_circle_x24.xml new file mode 100644 index 000000000..e4d08478a --- /dev/null +++ b/app/src/main/res/drawable/v_help_circle_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_history_black_x24.xml b/app/src/main/res/drawable/v_history_black_x24.xml new file mode 100644 index 000000000..5d8fbb9ab --- /dev/null +++ b/app/src/main/res/drawable/v_history_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_homepage_black_x24.xml b/app/src/main/res/drawable/v_homepage_black_x24.xml new file mode 100644 index 000000000..da7d49554 --- /dev/null +++ b/app/src/main/res/drawable/v_homepage_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_label_dark_x24.xml b/app/src/main/res/drawable/v_label_dark_x24.xml new file mode 100644 index 000000000..58bd9e732 --- /dev/null +++ b/app/src/main/res/drawable/v_label_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_magnify_dark_x24.xml b/app/src/main/res/drawable/v_magnify_dark_x24.xml new file mode 100644 index 000000000..29d4015da --- /dev/null +++ b/app/src/main/res/drawable/v_magnify_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_magnify_x24.xml b/app/src/main/res/drawable/v_magnify_x24.xml new file mode 100644 index 000000000..6d0b6bf34 --- /dev/null +++ b/app/src/main/res/drawable/v_magnify_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_pause_dark_x24.xml b/app/src/main/res/drawable/v_pause_dark_x24.xml new file mode 100644 index 000000000..c744f66e0 --- /dev/null +++ b/app/src/main/res/drawable/v_pause_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_pause_x24.xml b/app/src/main/res/drawable/v_pause_x24.xml new file mode 100644 index 000000000..052084756 --- /dev/null +++ b/app/src/main/res/drawable/v_pause_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_play_dark_x24.xml b/app/src/main/res/drawable/v_play_dark_x24.xml new file mode 100644 index 000000000..fcd5b8dd2 --- /dev/null +++ b/app/src/main/res/drawable/v_play_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_play_x24.xml b/app/src/main/res/drawable/v_play_x24.xml new file mode 100644 index 000000000..922a22ceb --- /dev/null +++ b/app/src/main/res/drawable/v_play_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_plus_dark_x24.xml b/app/src/main/res/drawable/v_plus_dark_x24.xml new file mode 100644 index 000000000..8be95a6dc --- /dev/null +++ b/app/src/main/res/drawable/v_plus_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_reply_dark_x24.xml b/app/src/main/res/drawable/v_reply_dark_x24.xml new file mode 100644 index 000000000..7c73c9ef5 --- /dev/null +++ b/app/src/main/res/drawable/v_reply_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml new file mode 100644 index 000000000..2c6b974a9 --- /dev/null +++ b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_send_dark_x24.xml b/app/src/main/res/drawable/v_send_dark_x24.xml new file mode 100644 index 000000000..07f0ec10c --- /dev/null +++ b/app/src/main/res/drawable/v_send_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_settings_black_x24.xml b/app/src/main/res/drawable/v_settings_black_x24.xml new file mode 100644 index 000000000..f18adba71 --- /dev/null +++ b/app/src/main/res/drawable/v_settings_black_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/v_settings_dark_x24.xml b/app/src/main/res/drawable/v_settings_dark_x24.xml new file mode 100644 index 000000000..9f6b55a10 --- /dev/null +++ b/app/src/main/res/drawable/v_settings_dark_x24.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res-vector/xml/ic_arrow_left_dark_x24.xml b/app/src/main/res/drawable/v_share_primary_x48.xml similarity index 71% rename from app/src/main/res-vector/xml/ic_arrow_left_dark_x24.xml rename to app/src/main/res/drawable/v_share_primary_x48.xml index d681bb7dc..c9137acac 100644 --- a/app/src/main/res-vector/xml/ic_arrow_left_dark_x24.xml +++ b/app/src/main/res/drawable/v_share_primary_x48.xml @@ -16,14 +16,14 @@ --> + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="?attr/colorPrimary" + android:pathData="@string/pd_share"/> diff --git a/app/src/main/res/drawable/v_slider_bubble.xml b/app/src/main/res/drawable/v_slider_bubble.xml new file mode 100644 index 000000000..b0c1f0e90 --- /dev/null +++ b/app/src/main/res/drawable/v_slider_bubble.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res-vector/xml/ic_heart_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml similarity index 71% rename from app/src/main/res-vector/xml/ic_heart_primary_x48.xml rename to app/src/main/res/drawable/v_thumb_up_primary_x48.xml index e20441f1f..bb3ca1987 100644 --- a/app/src/main/res-vector/xml/ic_heart_primary_x48.xml +++ b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml @@ -16,15 +16,14 @@ --> + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="?attr/colorPrimary" + android:pathData="@string/pd_thumb_up"/> diff --git a/app/src/main/res/drawable/v_utorrent_primary_x48.xml b/app/src/main/res/drawable/v_utorrent_primary_x48.xml new file mode 100644 index 000000000..b403246d6 --- /dev/null +++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4732d3871..212f16537 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,6 +34,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="left" + android:maxWidth="@dimen/drawer_max_width" android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" app:menu="@menu/nav_drawer_main"/> @@ -43,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="right" - android:maxWidth="280dp" + android:maxWidth="@dimen/drawer_max_width" android:background="@color/background_light" android:clickable="true"/> diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml index 4217e1969..a2744d6a7 100644 --- a/app/src/main/res/layout/gallery_detail_actions.xml +++ b/app/src/main/res/layout/gallery_detail_actions.xml @@ -34,7 +34,9 @@ + android:orientation="horizontal" + android:divider="@drawable/spacer_keyline" + android:showDividers="middle"> @@ -74,7 +75,6 @@ android:id="@+id/share" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" android:gravity="center_horizontal" android:text="@string/share" android:drawablePadding="8dp" @@ -84,7 +84,6 @@ android:id="@+id/rate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" android:gravity="center_horizontal" android:text="@string/rate" android:drawablePadding="8dp" diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml index b6d20951f..73034d7c1 100644 --- a/app/src/main/res/layout/gallery_detail_header.xml +++ b/app/src/main/res/layout/gallery_detail_header.xml @@ -106,7 +106,8 @@ android:textAllCaps="true" android:textStyle="bold"/> - + android:paddingBottom="16dp" + app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24"/> diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index 9732499bc..a6e8c0c6a 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -17,6 +17,7 @@ @@ -75,31 +76,31 @@ android:layout_height="wrap_content" android:layout_alignBottom="@+id/thumb" android:layout_alignParentRight="true" - android:layout_marginRight="8dp" + android:paddingRight="8dp" android:orientation="horizontal"> - + app:srcCompat="@drawable/v_play_x24"/> - + app:srcCompat="@drawable/v_pause_x24"/> - + app:srcCompat="@drawable/v_close_x24"/> @@ -110,7 +111,7 @@ android:layout_above="@id/actions" android:layout_marginBottom="4dp" android:layout_alignParentRight="true" - android:layout_marginRight="16dp" + android:paddingRight="16dp" android:textColor="?attr/colorAccent"/> - + app:srcCompat="@drawable/v_delete_red_x24"/> diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 0a0ee177b..1a5138635 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -15,11 +15,17 @@ ~ limitations under the License. --> - + android:layout_height="160dp"> - + + + diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml index e154ee98f..9ae92374c 100644 --- a/app/src/main/res/layout/scene_download.xml +++ b/app/src/main/res/layout/scene_download.xml @@ -23,9 +23,7 @@ + android:layout_height="match_parent"/> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> - + android:paddingBottom="@dimen/corner_fab_margin"> + app:srcCompat="@drawable/v_close_dark_x24"/> diff --git a/app/src/main/res/layout/scene_download_label.xml b/app/src/main/res/layout/scene_download_label.xml index b495bbb20..1a1500474 100644 --- a/app/src/main/res/layout/scene_download_label.xml +++ b/app/src/main/res/layout/scene_download_label.xml @@ -35,11 +35,12 @@ android:layout_gravity="center" android:orientation="vertical"> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> - + android:padding="16dp" + app:srcCompat="@drawable/v_send_dark_x24"/> @@ -103,6 +105,7 @@ android:layout_height="wrap_content" android:layout_gravity="right|bottom" android:layout_marginRight="@dimen/corner_fab_margin" - android:layout_marginBottom="@dimen/corner_fab_margin"/> + android:layout_marginBottom="@dimen/corner_fab_margin" + app:srcCompat="@drawable/v_reply_dark_x24"/> diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml index 7801afcb0..ea07c41bf 100644 --- a/app/src/main/res/layout/scene_gallery_detail.xml +++ b/app/src/main/res/layout/scene_gallery_detail.xml @@ -47,11 +47,12 @@ android:layout_gravity="center" android:orientation="vertical"> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> + android:visibility="invisible" + app:srcCompat="@drawable/v_magnify_dark_x24"/> diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml index e1bd80899..a70547829 100644 --- a/app/src/main/res/layout/scene_login.xml +++ b/app/src/main/res/layout/scene_login.xml @@ -34,7 +34,6 @@ android:padding="@dimen/keyline_margin"> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> - + android:padding="@dimen/keyline_margin" + app:srcCompat="@drawable/v_alert_red_x48"/> @@ -27,7 +28,6 @@ android:layout_marginBottom="@dimen/search_item_interval"/> - + android:padding="6dp" + app:srcCompat="@drawable/v_help_circle_x24"/> - + android:layout_gravity="center_horizontal" + app:srcCompat="@drawable/sad_panda"/> diff --git a/app/src/main/res/menu/nav_drawer_main.xml b/app/src/main/res/menu/nav_drawer_main.xml index 822af9a2d..800fd37a8 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/v_homepage_black_x24"/> + android:icon="@drawable/v_fire_black_x24"/> + android:icon="@drawable/v_heart_black_x24"/> + android:icon="@drawable/v_history_black_x24"/> + android:icon="@drawable/v_download_black_x24"/> + android:icon="@drawable/v_settings_black_x24"/> diff --git a/app/src/main/res/menu/scene_download_label.xml b/app/src/main/res/menu/scene_download_label.xml index f70697869..42fa93edb 100644 --- a/app/src/main/res/menu/scene_download_label.xml +++ b/app/src/main/res/menu/scene_download_label.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/menu/scene_gallery_previews.xml b/app/src/main/res/menu/scene_gallery_previews.xml index 30e264156..18485c710 100644 --- a/app/src/main/res/menu/scene_gallery_previews.xml +++ b/app/src/main/res/menu/scene_gallery_previews.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9c8ba081a..edcd59625 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -199,6 +199,8 @@ 默认 移动 标签 + 全部开始 + 全部停止 无标签 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 27409694d..acfdfc79e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -20,6 +20,8 @@ 260dp + 280dp + 24sp 22sp @@ -74,6 +76,9 @@ 56dp 40dp + + 26dp + 32dp 16dp diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml index 4dabaa280..b4fdc677c 100644 --- a/app/src/main/res/values/pathdata.xml +++ b/app/src/main/res/values/pathdata.xml @@ -17,19 +17,43 @@ + M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z + M14,19.14H18V5.14H14M6,19.14H10V5.14H6V19.14Z + M8,5.14V19.14L19,12.14L8,5.14Z + M0.41,13.41L6,19L7.41,17.58L1.83,12M22.24,5.58L11.66,16.17L7.5,12L6.07,13.41L11.66,19L23.66,7M18,7L16.59,5.58L10.24,11.93L11.66,13.34L18,7Z + M9,18V15H5V11H9V8L14,13M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z + M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z + M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z + M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z + M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z + M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z + M11.71,19C9.93,19 8.5,17.59 8.5,15.86C8.5,14.24 9.53,13.1 11.3,12.74C13.07,12.38 14.9,11.53 15.92,10.16C16.31,11.45 16.5,12.81 16.5,14.2C16.5,16.84 14.36,19 11.71,19M13.5,0.67C13.5,0.67 14.24,3.32 14.24,5.47C14.24,7.53 12.89,9.2 10.83,9.2C8.76,9.2 7.2,7.53 7.2,5.47L7.23,5.1C5.21,7.5 4,10.61 4,14A8,8 0 0,0 12,22A8,8 0 0,0 20,14C20,8.6 17.41,3.8 13.5,0.67Z + M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z + M11,7V12.11L15.71,14.9L16.5,13.62L12.5,11.25V7M12.5,2C8.97,2 5.91,3.92 4.27,6.77L2,4.5V11H8.5L5.75,8.25C6.96,5.73 9.5,4 12.5,4A7.5,7.5 0 0,1 20,11.5A7.5,7.5 0 0,1 12.5,19C9.23,19 6.47,16.91 5.44,14H3.34C4.44,18.03 8.11,21 12.5,21C17.74,21 22,16.75 22,11.5A9.5,9.5 0 0,0 12.5,2Z + M19,2L14,6.5V17.5L19,13V2M6.5,5C4.55,5 2.45,5.4 1,6.5V21.16C1,21.41 1.25,21.66 1.5,21.66C1.6,21.66 1.65,21.59 1.75,21.59C3.1,20.94 5.05,20.5 6.5,20.5C8.45,20.5 10.55,20.9 12,22C13.35,21.15 15.8,20.5 17.5,20.5C19.15,20.5 20.85,20.81 22.25,21.56C22.35,21.61 22.4,21.59 22.5,21.59C22.75,21.59 23,21.34 23,21.09V6.5C22.4,6.05 21.75,5.75 21,5.5V7.5L21,13V19C19.9,18.65 18.7,18.5 17.5,18.5C15.8,18.5 13.35,19.15 12,20V13L12,8.5V6.5C10.55,5.4 8.45,5 6.5,5V5Z + M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z + M13,13L17,17L21,13H18V10C18,6.1,14.9,3,11,3S4,6.1,4,10V17H6V10C6,7.2,8.2,5,11,5S16,7.2,16,10V13H13M,16,19H18V21H16V19Z M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z M12.1,18.55L12,18.65L11.89,18.55C7.14,14.24 4,11.39 4,8.5C4,6.5 5.5,5 7.5,5C9.04,5 10.54,6 11.07,7.36H12.93C13.46,6 14.96,5 16.5,5C18.5,5 20,6.5 20,8.5C20,11.39 16.86,14.24 12.1,18.55M16.5,3C14.76,3 13.09,3.81 12,5.08C10.91,3.81 9.24,3 7.5,3C4.42,3 2,5.41 2,8.5C2,12.27 5.4,15.36 10.55,20.03L12,21.35L13.45,20.03C18.6,15.36 22,12.27 22,8.5C22,5.41 19.58,3 16.5,3Z - M12,12L12,12L12,12C12,12 12,12 12,12C12,12 12,12 12,12C12,12 12,12 12,12H12C12,12 12,12 12,12C12,12 12,12 12,12C12,12 12,12 12,12M16.5,3C14.76,3 13.09,3.81 12,5.08C10.91,3.81 9.24,3 7.5,3C4.42,3 2,5.41 2,8.5C2,12.27 5.4,15.36 10.55,20.03L12,21.35L13.45,20.03C18.6,15.36 22,12.27 22,8.5C22,5.41 19.58,3 16.5,3Z + M12,12L12,12L12,12C12,12 12,12 12,12C12,12 12,12 12,12C12,12 12,12 12,12H12C12,12 12,12 12,12C12,12 12,12 12,12C12,12 12,12 12,12M16.5,3C14.76,3 13.09,3.81 12,5.08C10.91,3.81 9.24,3 7.5,3C4.42,3 2,5.41 2,8.5C2,12.27 5.4,15.36 10.55,20.03L12,21.35L13.45,20.03C18.6,15.36 22,12.27 22,8.5C22,5.41 19.58,3 16.5,3Z 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 + M2,11.5C2.2,6.3,7.2,1.7,12.5,2C18.1,2.2,23,7.9,21.9,13.5C21,13.5,20.1,13.2,19.6,12.4C18.3,10.4,17.7,8.1,16.5,6.1C15.6,6.2,14.8,6.4,14,6.6C14.3,8.9,15.8,10.8,16.3,13C16.1,14.9,13.6,16,11.9,15.1C10.5,14.6,9.9,13.1,9.4,11.8C8.9,10.5,8.4,9.1,7.7,7.9C6.6,7.9,5.5,7.9,4.5,8.4C5.4,12.9,7.9,16.9,8.9,21.4C4.8,20.1,1.8,15.8,2,11.5M14.8,17.1C15.8,16.5,16.6,15.6,17.5,14.8C18.8,15.1,20,15.3,21.3,15.4C19.9,18.7,16.9,21.2,13.3,21.9C12.3,20.5,11.7,18.9,11.3,17.3C12.5,17.4,13.7,17.5,14.8,17.1Z 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 + M21.1,7.8C22.2,7.4,23,6.3,23,5C23,3.3,21.7,2,20,2C18.9,2,17.9,2.6,17.4,3.6L21.1,7.8Z + M6.6,3.6C6.1,2.6,5.1,2,4,2C2.3,2,1,3.3,1,5C1,6.3,1.8,7.4,2.9,7.8L6.6,3.6Z + M10.1,13L8,15.1C7.4,15.7,6.5,15.7,5.9,15.1L5.9,15.1C5.3,14.5,5.3,13.6,5.9,13L8,10.9C8.6,10.3,9.5,10.3,10.1,10.9L10.1,10.9C10.7,11.5,10.7,12.4,10.1,13Z + M16,15.1L13.9,13C13.3,12.4,13.3,11.5,13.9,10.9L13.9,10.9C14.5,10.3,15.4,10.3,16,10.9L18.1,13C18.7,13.6,18.7,14.5,18.1,15.1L18.1,15.1C17.5,15.7,16.6,15.7,16,15.1Z + M12,17C12.8,17,13.5,17.4,13.5,18S12.8,19,12,19S10.5,18.6,10.5,18S11.2,17,12,17Z + M21.1,7.8C22.2,7.4,23,6.3,23,5C23,3.3,21.7,2,20,2C18.9,2,17.9,2.6,17.4,3.6L21.1,7.8M6.6,3.6C6.1,2.6,5.1,2,4,2C2.3,2,1,3.3,1,5C1,6.3,1.8,7.4,2.9,7.8L6.6,3.6M10.1,13L8,15.1C7.4,15.7,6.5,15.7,5.9,15.1L5.9,15.1C5.3,14.5,5.3,13.6,5.9,13L8,10.9C8.6,10.3,9.5,10.3,10.1,10.9L10.1,10.9C10.7,11.5,10.7,12.4,10.1,13M16,15.1L13.9,13C13.3,12.4,13.3,11.5,13.9,10.9L13.9,10.9C14.5,10.3,15.4,10.3,16,10.9L18.1,13C18.7,13.6,18.7,14.5,18.1,15.1L18.1,15.1C17.5,15.7,16.6,15.7,16,15.1M12,17C12.8,17,13.5,17.4,13.5,18S12.8,19,12,19S10.5,18.6,10.5,18S11.2,17,12,17Z + M17.4,3.6C15.8,2.6,14,2,12,2S8.2,2.6,6.6,3.6L2.9,7.8C2.3,9.1,2,10.5,2,12C2,17.5,6.5,22,12,22S22,17.5,22,12C22,10.5,21.7,9.1,21.1,7.8L17.4,3.6Z + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 34b239a06..d355907b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -239,6 +239,8 @@ Default Move Label + Start all + Stop all No labels diff --git a/app/src/main/res/xml/settings_headers.xml b/app/src/main/res/xml/settings_headers.xml index 7a7d951f8..a46c87d02 100644 --- a/app/src/main/res/xml/settings_headers.xml +++ b/app/src/main/res/xml/settings_headers.xml @@ -21,11 +21,11 @@
+ android:icon="@drawable/v_sad_panda_primary_x24"/>
+ android:icon="@drawable/v_book_open_primary_x24"/> diff --git a/easyrecyclerview b/easyrecyclerview index 29298521b..2cbf2f787 160000 --- a/easyrecyclerview +++ b/easyrecyclerview @@ -1 +1 @@ -Subproject commit 29298521b4abd307ec9159173237fcc0b52f5d38 +Subproject commit 2cbf2f787e19ba1ff04c782fedc67ce9d55f1622 diff --git a/settings.gradle b/settings.gradle index 25cf17409..a07d051cd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':anani', ':app', 'beerbelly', 'conaco', ':daogenerator', ':easyrecyclerview', 'hotspot', ':okhttp3', 'rippleold', 'unifile', 'vector', 'yorozuya' +include ':app', 'beerbelly', 'conaco', ':daogenerator', ':easyrecyclerview', 'hotspot', ':okhttp3', 'rippleold', 'unifile', 'yorozuya' diff --git a/unifile b/unifile index b554e9775..7f7b67948 160000 --- a/unifile +++ b/unifile @@ -1 +1 @@ -Subproject commit b554e97755cccd944c3eee73fd0234e905c00ca1 +Subproject commit 7f7b67948d5e73b7f66eb8d7b7683c31184b937f diff --git a/vector b/vector deleted file mode 160000 index 37a30c43e..000000000 --- a/vector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 37a30c43e3c49f58791ba51a05f99e3c7723c594 diff --git a/yorozuya b/yorozuya index 122cc3a3f..7fe61ba98 160000 --- a/yorozuya +++ b/yorozuya @@ -1 +1 @@ -Subproject commit 122cc3a3fa4f54af3513cf46845b17b13ab426e2 +Subproject commit 7fe61ba986086a6a6ae62e3b546e045afd36b463