merge double upstream

2025-10-31 22:37:56 +01:00 · 2020-01-06 11:43:11 -05:00
parent b20c028566 264e04368b
commit 4d8f44ddae
900 changed files with 31103 additions and 22299 deletions
--- a/app/src/main/res/anim/enter_from_left.xml
+++ b/app/src/main/res/anim/enter_from_left.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="-100%"
-        android:toXDelta="0%" />
-</set>
--- a/app/src/main/res/anim/enter_from_right.xml
+++ b/app/src/main/res/anim/enter_from_right.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="100%"
-        android:toXDelta="0%" />
-</set>
--- a/app/src/main/res/anim/exit_to_left.xml
+++ b/app/src/main/res/anim/exit_to_left.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="0%"
-        android:toXDelta="-100%" />
-</set>
--- a/app/src/main/res/anim/exit_to_right.xml
+++ b/app/src/main/res/anim/exit_to_right.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="0%"
-        android:toXDelta="100%" />
-</set>
--- a/app/src/main/res/anim/fab_hide_to_bottom.xml
+++ b/app/src/main/res/anim/fab_hide_to_bottom.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:interpolator="@android:interpolator/accelerate_quint"
-           android:fromYDelta="0"
-           android:toYDelta="30%p"
-           android:duration="200" />
--- a/app/src/main/res/anim/fab_show_from_bottom.xml
+++ b/app/src/main/res/anim/fab_show_from_bottom.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:interpolator="@android:interpolator/accelerate_cubic"
-           android:fromYDelta="30%p"
-           android:toYDelta="0"
-           android:duration="300" />
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:duration="300"
-        android:fillAfter="true"/>
-</set>
--- a/app/src/main/res/anim/fade_in_long.xml
+++ b/app/src/main/res/anim/fade_in_long.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
    <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
        android:duration="2000"
-        android:fillAfter="true"/>
-</set>
+        android:fillAfter="true"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="1.0" />
+</set>
--- a/app/src/main/res/color/abc_primary_text_material_dark.xml
+++ b/app/src/main/res/color/abc_primary_text_material_dark.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_dark" />
-    <item android:color="@color/primary_text_default_material_dark" />
-</selector>
--- a/app/src/main/res/color/text_input_stroke.xml
+++ b/app/src/main/res/color/text_input_stroke.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
+https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorSecondary" android:state_focused="true" />
+    <item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true" />
+    <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface" />
+</selector>
--- a/app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png
--- a/app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png
--- a/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png
--- a/app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png
--- a/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png
--- a/app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png
+++ b/app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png
--- a/app/src/main/res/drawable-hdpi/splash_icon.webp
+++ b/app/src/main/res/drawable-hdpi/splash_icon.webp
--- a/app/src/main/res/drawable-hdpi/tachiyomi_circle.png
+++ b/app/src/main/res/drawable-hdpi/tachiyomi_circle.png
--- a/app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png
--- a/app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png
--- a/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png
--- a/app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png
--- a/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_refresh_white_24dp_img.png
--- a/app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png
+++ b/app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png
--- a/app/src/main/res/drawable-mdpi/splash_icon.webp
+++ b/app/src/main/res/drawable-mdpi/splash_icon.webp
--- a/app/src/main/res/drawable-mdpi/tachiyomi_circle.png
+++ b/app/src/main/res/drawable-mdpi/tachiyomi_circle.png
--- a/app/src/main/res/drawable-nodpi/filter_mock.webp
+++ b/app/src/main/res/drawable-nodpi/filter_mock.webp
--- a/app/src/main/res/drawable-nodpi/ic_tracker_anilist.webp
+++ b/app/src/main/res/drawable-nodpi/ic_tracker_anilist.webp
--- a/app/src/main/res/drawable-nodpi/ic_tracker_bangumi.webp
+++ b/app/src/main/res/drawable-nodpi/ic_tracker_bangumi.webp
--- a/app/src/main/res/drawable-nodpi/ic_tracker_kitsu.webp
+++ b/app/src/main/res/drawable-nodpi/ic_tracker_kitsu.webp
--- a/app/src/main/res/drawable-nodpi/ic_tracker_mal.webp
+++ b/app/src/main/res/drawable-nodpi/ic_tracker_mal.webp
--- a/app/src/main/res/drawable-nodpi/ic_tracker_shikimori.webp
+++ b/app/src/main/res/drawable-nodpi/ic_tracker_shikimori.webp
--- a/app/src/main/res/drawable-v21/library_item_selector_amoled.xml
+++ b/app/src/main/res/drawable-v21/library_item_selector_amoled.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selectorColorDark"
-    >
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark"/>
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark"/>
-            </item>
-
-            <item>
-                <color android:color="@color/md_black_1000"/>
-            </item>
-        </selector>
-    </item>
-</ripple>
--- a/app/src/main/res/drawable-v21/library_item_selector_dark.xml
+++ b/app/src/main/res/drawable-v21/library_item_selector_dark.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccentDark"
-    >
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark"/>
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark"/>
-            </item>
-
-            <item>
-                <color android:color="@color/backgroundDark"/>
-            </item>
-        </selector>
-    </item>
-</ripple>
--- a/app/src/main/res/drawable-v21/library_item_selector_light.xml
+++ b/app/src/main/res/drawable-v21/library_item_selector_light.xml
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccentLight"
-    >
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/selectorColorLight"/>
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/selectorColorLight"/>
-            </item>
-
-            <item>
-                <color android:color="@color/backgroundLight"/>
-            </item>
-        </selector>
-    </item>
-</ripple>
--- a/app/src/main/res/drawable-v21/list_item_selector_light.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_light.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleColorLight">
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/rippleColorLight"/>
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/rippleColorLight"/>
-            </item>
-
-            <item>
-                <color android:color="@color/dialogLight"/>
-            </item>
-        </selector>
-    </item>
-</ripple>
--- a/app/src/main/res/drawable-xhdpi/card_background.9.png
+++ b/app/src/main/res/drawable-xhdpi/card_background.9.png
--- a/app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png
--- a/app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png
--- a/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png
--- a/app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png
--- a/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png
--- a/app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png
--- a/app/src/main/res/drawable-xhdpi/splash_icon.webp
+++ b/app/src/main/res/drawable-xhdpi/splash_icon.webp
--- a/app/src/main/res/drawable-xhdpi/tachiyomi_circle.png
+++ b/app/src/main/res/drawable-xhdpi/tachiyomi_circle.png
--- a/app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png
--- a/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp_img.png
--- a/app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxhdpi/splash_icon.webp
+++ b/app/src/main/res/drawable-xxhdpi/splash_icon.webp
--- a/app/src/main/res/drawable-xxhdpi/tachiyomi_circle.png
+++ b/app/src/main/res/drawable-xxhdpi/tachiyomi_circle.png
--- a/app/src/main/res/drawable-xxxhdpi/al.png
+++ b/app/src/main/res/drawable-xxxhdpi/al.png
--- a/app/src/main/res/drawable-xxxhdpi/bangumi.png
+++ b/app/src/main/res/drawable-xxxhdpi/bangumi.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png
--- a/app/src/main/res/drawable-xxxhdpi/kitsu.png
+++ b/app/src/main/res/drawable-xxxhdpi/kitsu.png
--- a/app/src/main/res/drawable-xxxhdpi/mal.png
+++ b/app/src/main/res/drawable-xxxhdpi/mal.png
--- a/app/src/main/res/drawable-xxxhdpi/shikimori.png
+++ b/app/src/main/res/drawable-xxxhdpi/shikimori.png
--- a/app/src/main/res/drawable-xxxhdpi/splash_icon.webp
+++ b/app/src/main/res/drawable-xxxhdpi/splash_icon.webp
--- a/app/src/main/res/drawable-xxxhdpi/tachiyomi_circle.png
+++ b/app/src/main/res/drawable-xxxhdpi/tachiyomi_circle.png
--- a/app/src/main/res/drawable/branded_logo.xml
+++ b/app/src/main/res/drawable/branded_logo.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:opacity="opaque">
-    <item android:drawable="@color/material_grey_50"/>
-    <item>
-        <bitmap
-            android:src="@drawable/branded_logo_icon"
-            android:gravity="center"/>
-    </item>
-</layer-list>
--- a/app/src/main/res/drawable/branded_logo_icon.png
+++ b/app/src/main/res/drawable/branded_logo_icon.png
--- a/app/src/main/res/drawable/button_bg_transparent.xml
+++ b/app/src/main/res/drawable/button_bg_transparent.xml
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:color="@color/md_white_1000">
-        <shape android:shape="rectangle">
-            <corners android:radius="2dp" />
-            <solid android:color="@color/colorAccentLight" />
-            <padding android:left="8dp" android:right="8dp" />
-        </shape>
-    </item>
-    <item android:state_enabled="false" android:color="@color/textColorHintLight">
-        <shape android:shape="rectangle">
-            <corners android:radius="2dp" />
-            <solid android:color="@android:color/transparent" />
-            <stroke android:color="@color/textColorHintLight" android:width="1dp"/>
-            <padding android:left="8dp" android:right="8dp" />
-        </shape>
-    </item>
-    <item android:color="@color/colorAccentLight">
-        <shape android:shape="rectangle" android:color="@color/colorAccentLight">
-            <corners android:radius="2dp" />
-            <solid android:color="@android:color/transparent" />
-            <stroke android:color="@color/colorAccentLight" android:width="1dp"/>
-            <padding android:left="8dp" android:right="8dp" />
-        </shape>
-    </item>
-</selector>
--- a/app/src/main/res/drawable/empty_divider.xml
+++ b/app/src/main/res/drawable/empty_divider.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size
-        android:height="@dimen/material_layout_keylines_horizontal_mobile_margin"
-        android:width="0dp"/>
-
-    <solid
-        android:color="@android:color/transparent"/>
-
-</shape>
--- a/app/src/main/res/drawable/empty_drawable_32dp.xml
+++ b/app/src/main/res/drawable/empty_drawable_32dp.xml
@@ -1,8 +1,8 @@
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/transparent"/>
-    <size
-        android:width="32dp"
-        android:height="32dp" />
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent"/>
+    <size
+        android:width="32dp"
+        android:height="32dp" />
 </shape>
--- a/app/src/main/res/drawable/filter_mock.png
+++ b/app/src/main/res/drawable/filter_mock.png
--- a/app/src/main/res/drawable/ic_account_circle_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_account_circle_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_add_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_add_to_library_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_to_library_24dp.xml
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:width="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path android:fillColor="#FFFFFF" android:pathData="M17,18V5H7V18L12,15.82L17,18M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,7H13V9H15V11H13V13H11V11H9V9H11V7Z" />
-</vector>
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_arrow_back_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_arrow_forward_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_forward_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8 -8,-8z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_backup_24dp.xml
+++ b/app/src/main/res/drawable/ic_backup_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_backup_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_backup_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
-</vector>
--- a/Show More
+++ b/Show More