diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
index e247f0bc1..55dd917e8 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
@@ -218,7 +218,7 @@ public class DownloadService extends Service implements DownloadManager.Download
.setCategory(NotificationCompat.CATEGORY_PROGRESS)
.setColor(getResources().getColor(R.color.colorPrimary))
.setColorized(true)
- .addAction(R.drawable.ic_pause_x24, getString(R.string.stat_download_action_stop_all), piStopAll)
+ .addAction(R.drawable.ic_baseline_pause_24, getString(R.string.stat_download_action_stop_all), piStopAll)
.setShowWhen(false)
.setChannelId(CHANNEL_ID);
@@ -261,7 +261,7 @@ public class DownloadService extends Service implements DownloadManager.Download
}
m509dBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
- .setSmallIcon(R.drawable.ic_stat_alert)
+ .setSmallIcon(R.drawable.ic_baseline_warning_24)
.setContentText(getString(R.string.stat_509_alert_title))
.setContentText(getString(R.string.stat_509_alert_text))
.setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_x24.png b/app/src/main/res/drawable-hdpi/ic_pause_x24.png
deleted file mode 100644
index 411c4987e..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause_x24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_alert.png b/app/src/main/res/drawable-hdpi/ic_stat_alert.png
deleted file mode 100644
index fcc614c04..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_x24.png b/app/src/main/res/drawable-mdpi/ic_pause_x24.png
deleted file mode 100644
index 73c388b00..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause_x24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_alert.png b/app/src/main/res/drawable-mdpi/ic_stat_alert.png
deleted file mode 100644
index d8d4f2fbb..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_x24.png b/app/src/main/res/drawable-xhdpi/ic_pause_x24.png
deleted file mode 100644
index 0045704e3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_x24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_alert.png b/app/src/main/res/drawable-xhdpi/ic_stat_alert.png
deleted file mode 100644
index 1eddd640d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_x24.png b/app/src/main/res/drawable-xxhdpi/ic_pause_x24.png
deleted file mode 100644
index e0762aff7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_x24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_alert.png b/app/src/main/res/drawable-xxhdpi/ic_stat_alert.png
deleted file mode 100644
index 59ec28a99..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/shadow_8dp.9.png b/app/src/main/res/drawable-xxhdpi/shadow_8dp.9.png
deleted file mode 100644
index dd7755211..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/shadow_8dp.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/big_label.xml b/app/src/main/res/drawable/big_label.xml
deleted file mode 100644
index 99938fd62..000000000
--- a/app/src/main/res/drawable/big_label.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/big_search.xml b/app/src/main/res/drawable/big_search.xml
deleted file mode 100644
index 222f8d7c2..000000000
--- a/app/src/main/res/drawable/big_search.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/fingerprint_error.xml b/app/src/main/res/drawable/fingerprint_error.xml
deleted file mode 100644
index fe0d328bc..000000000
--- a/app/src/main/res/drawable/fingerprint_error.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/fingerprint_success.xml b/app/src/main/res/drawable/fingerprint_success.xml
deleted file mode 100644
index 71c6a0258..000000000
--- a/app/src/main/res/drawable/fingerprint_success.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_baseline_pause_24.xml b/app/src/main/res/drawable/ic_baseline_pause_24.xml
new file mode 100644
index 000000000..13d6d2ec0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_pause_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_warning_24.xml b/app/src/main/res/drawable/ic_baseline_warning_24.xml
new file mode 100644
index 000000000..a02bc138c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_warning_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
deleted file mode 100644
index 64e2f23ee..000000000
--- a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/preference_header_background_black.xml b/app/src/main/res/drawable/preference_header_background_black.xml
deleted file mode 100644
index ff37bb43a..000000000
--- a/app/src/main/res/drawable/preference_header_background_black.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/preference_header_background_dark.xml b/app/src/main/res/drawable/preference_header_background_dark.xml
deleted file mode 100644
index 3784a94dc..000000000
--- a/app/src/main/res/drawable/preference_header_background_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/preference_header_background_light.xml b/app/src/main/res/drawable/preference_header_background_light.xml
deleted file mode 100644
index 85446de8a..000000000
--- a/app/src/main/res/drawable/preference_header_background_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/shadow_bottom.xml b/app/src/main/res/drawable/shadow_bottom.xml
deleted file mode 100644
index 2b519b5e7..000000000
--- a/app/src/main/res/drawable/shadow_bottom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/shadow_top.xml b/app/src/main/res/drawable/shadow_top.xml
deleted file mode 100644
index 24f59feb6..000000000
--- a/app/src/main/res/drawable/shadow_top.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_bug_black_x48.xml b/app/src/main/res/drawable/v_bug_black_x48.xml
deleted file mode 100644
index 2b120d493..000000000
--- a/app/src/main/res/drawable/v_bug_black_x48.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_copy_x24.xml b/app/src/main/res/drawable/v_copy_x24.xml
deleted file mode 100644
index d57f30c97..000000000
--- a/app/src/main/res/drawable/v_copy_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_delete_dark_x24.xml b/app/src/main/res/drawable/v_delete_dark_x24.xml
deleted file mode 100644
index bd6bf8e19..000000000
--- a/app/src/main/res/drawable/v_delete_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_delete_red_x24.xml b/app/src/main/res/drawable/v_delete_red_x24.xml
deleted file mode 100644
index 18b959cfd..000000000
--- a/app/src/main/res/drawable/v_delete_red_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_info_dark_x24.xml b/app/src/main/res/drawable/v_info_dark_x24.xml
deleted file mode 100644
index 192dfe764..000000000
--- a/app/src/main/res/drawable/v_info_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_reorder_x24.xml b/app/src/main/res/drawable/v_reorder_x24.xml
deleted file mode 100644
index 7a0ec08b3..000000000
--- a/app/src/main/res/drawable/v_reorder_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_settings_dark_x24.xml b/app/src/main/res/drawable/v_settings_dark_x24.xml
deleted file mode 100644
index d0a19ac40..000000000
--- a/app/src/main/res/drawable/v_settings_dark_x24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
deleted file mode 100644
index 068ecd5ba..000000000
--- a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/alert_dialog_progress_material.xml b/app/src/main/res/layout/alert_dialog_progress_material.xml
deleted file mode 100644
index c0ac90549..000000000
--- a/app/src/main/res/layout/alert_dialog_progress_material.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/button_guide.xml b/app/src/main/res/layout/button_guide.xml
deleted file mode 100644
index 3f6dc62f1..000000000
--- a/app/src/main/res/layout/button_guide.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/dialog_donate.xml b/app/src/main/res/layout/dialog_donate.xml
deleted file mode 100644
index 942c4eccd..000000000
--- a/app/src/main/res/layout/dialog_donate.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_dir_explorer.xml b/app/src/main/res/layout/item_dir_explorer.xml
deleted file mode 100644
index 4b6ad90ee..000000000
--- a/app/src/main/res/layout/item_dir_explorer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/item_excluded_languages.xml b/app/src/main/res/layout/item_excluded_languages.xml
deleted file mode 100644
index f1d51bfcd..000000000
--- a/app/src/main/res/layout/item_excluded_languages.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_simple_list.xml b/app/src/main/res/layout/item_simple_list.xml
deleted file mode 100644
index c7b060f31..000000000
--- a/app/src/main/res/layout/item_simple_list.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/preference_dialog_default_categories.xml b/app/src/main/res/layout/preference_dialog_default_categories.xml
deleted file mode 100644
index f000a94ae..000000000
--- a/app/src/main/res/layout/preference_dialog_default_categories.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/progress_dialog_material.xml b/app/src/main/res/layout/progress_dialog_material.xml
deleted file mode 100644
index 34b79f1bc..000000000
--- a/app/src/main/res/layout/progress_dialog_material.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
index 705d2f7da..e4690dbf8 100644
--- a/app/src/main/res/layout/scene_download.xml
+++ b/app/src/main/res/layout/scene_download.xml
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
app:backgroundTint="?attr/widgetColorThemeAccent"
app:fabSize="mini"
- app:srcCompat="@drawable/v_play_dark_x24"
+ app:srcCompat="@drawable/v_play_x24"
app:tint="#fff" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index c0aa9ca49..07760a4ea 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -84,7 +84,7 @@
android:visibility="gone"
app:backgroundTint="?attr/widgetColorThemeAccent"
app:fabSize="mini"
- app:srcCompat="@drawable/v_delete_dark_x24"
+ app:srcCompat="@drawable/v_delete_x24"
app:tint="#fff" />
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/menu/scene_download_label.xml b/app/src/main/res/menu/scene_download_label.xml
deleted file mode 100644
index f701b5a05..000000000
--- a/app/src/main/res/menu/scene_download_label.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 48c699aa9..d0b5d011f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -18,7 +18,6 @@
#ffffffff
#4dffffff
- #ff303030
@color/grey_825
@color/grey_600
@@ -27,113 +26,19 @@
@color/grey_775
@color/grey_775
@color/grey_800
- #fff44336
- #ff009688
- #ff00796b
- #ff9c27b0
- #ffe040fb
- #ffd500f9
- #ffaa00ff
- #ff00acc1
- #ff7cb342
- #fff9a825
- #ffff7043
- #ff080808
- #ff111111
- #ff191919
- #ff212121
- #ff292929
- #ff323232
- #ff3a3a3a
- #ff424242
- #ff4a4a4a
- #ff525252
- #ff595959
- #ff616161
- #ff666666
- #ff6b6b6b
- #ff707070
- #ff757575
- #ff7f7f7f
- #ff8a8a8a
- #ff949494
- #ff9e9e9e
- #ffa6a6a6
- #ffaeaeae
- #ffb5b5b5
- #ffbdbdbd
- #ffc6c6c6
- #ffcfcfcf
- #ffd7d7d7
- #ffe0e0e0
- #ffe4e4e4
- #ffe7e7e7
- #ffebebeb
- #ffeeeeee
- #fff0f0f0
- #fff2f2f2
- #fff3f3f3
- #fff5f5f5
- #ff795548
-
- @color/teal_500
- @color/teal_700
- @color/purple_a200
-
- #80ffffff
-
- #ffe53935
- @color/purple_a700
- #ff1d87e4
- @color/cyan_600
- @color/light_green_600
- @color/yellow_800
- @color/deep_orange_400
-
- #4a000000
-
-
- #fff44336
-
- #ffff9800
-
- #ffFbc02d
-
- #ff4caf50
-
- #ff8bc34a
-
- #ff2196f3
-
- #ff3f51b5
-
- #ff9c27b0
-
- #ff9575cd
-
- #fff06292
- @android:color/black
#20ffffff
- #38000000
@color/grey_900
- #1f000000
-
- #e5009688
-
#8affffff
- @color/colorPrimary
- @color/red_500
- #F5F5F5
@color/colorBackground
#303030
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d35512d35..51b9ad4a0 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -16,18 +16,6 @@
-
- - @string/settings_eh_theme_light
- - @string/settings_eh_theme_dark
- - @string/settings_eh_theme_black
-
-
-
- - 0
- - 1
- - 2
-
-
- @string/settings_eh_list_mode_detail
- @string/settings_eh_list_mode_thumb
@@ -249,11 +237,6 @@
- 640
-
- - @string/download
- - @string/add_to_favourites
-
-
- @string/filter_title
- @string/filter_uploader
@@ -261,11 +244,6 @@
- @string/filter_tag_namespace
-
- - @string/show_definition
- - @string/add_filter
-
-
- @string/app_language_system
- @string/app_language_de
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 09e800ddb..7cadf1133 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -16,7 +16,6 @@
- false
true
true
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7a6021ed6..f1ab4ceca 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,18 +24,13 @@
#8a000000
#42000000
- #8a000000
- #42000000
#ffffffff
- #4dffffff
#ccffffff
#3dffffff
#d9ffffff
#4dffffff
- #fffafafa
-
#fff
@color/grey_925
@@ -60,16 +55,12 @@
#fff44336
#ff009688
#ff00796b
- #ff9c27b0
#ffe040fb
- #ffd500f9
#ffaa00ff
#ff00acc1
#ff7cb342
#fff9a825
#ffff7043
- #ff080808
- #ff111111
#ff191919
#ff212121
#ff292929
@@ -77,32 +68,11 @@
#ff3a3a3a
#ff424242
#ff4a4a4a
- #ff525252
- #ff595959
#ff616161
- #ff666666
- #ff6b6b6b
- #ff707070
#ff757575
- #ff7f7f7f
- #ff8a8a8a
- #ff949494
#ff9e9e9e
- #ffa6a6a6
- #ffaeaeae
- #ffb5b5b5
- #ffbdbdbd
- #ffc6c6c6
- #ffcfcfcf
- #ffd7d7d7
#ffe0e0e0
- #ffe4e4e4
- #ffe7e7e7
- #ffebebeb
#ffeeeeee
- #fff0f0f0
- #fff2f2f2
- #fff3f3f3
#fff5f5f5
#ff795548
@@ -110,8 +80,6 @@
@color/teal_700
@color/purple_a200
- #80ffffff
-
#ffe53935
@color/purple_a700
#ff1d87e4
@@ -142,20 +110,16 @@
#ff9575cd
#fff06292
- @android:color/black
#20000000
#20ffffff
- #38000000
@color/grey_100
- #1f000000
-
#e5009688
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f923fb77b..84d96527e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,13 +20,9 @@
260dp
280dp
- 18dp
-
24sp
- 22sp
20sp
- 18sp
16sp
14sp
12sp
@@ -118,7 +114,6 @@
128dp
192dp
- 56sp
12dp
12dp
@@ -131,8 +126,6 @@
48dp
- 8dip
- 8dip
48dp
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index 7744e8084..0c49197d4 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -15,9 +15,6 @@
-->
- @color/grey_200
- @color/grey_800
- @color/grey_900
@android:color/transparent
#7f9c27b0
@color/colorPrimary
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index 634c2cbaa..d65b6f3e9 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -21,7 +21,6 @@
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
M21,13H13V21H11V13H3V11H11V3H13V11H21V13Z
M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z
@@ -38,12 +37,10 @@
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
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,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
M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z
M12,15.89V6.59L13.71,10.63L18.09,11L14.77,13.88L15.76,18.16M22,9.74L14.81,9.13L12,2.5L9.19,9.13L2,9.74L7.45,14.47L5.82,21.5L12,17.77L18.18,21.5L16.54,14.47L22,9.74Z
@@ -53,7 +50,6 @@
M19,3H5C3.9,3,3,3.9,3,5V19C3,20.1,3.9,21,5,21H19C20.1,21,21,20.1,21,19V5C21,3.9,20.1,3,19,3ZM12,17L7,12H10V8H14V12H17L12,17Z
M16,11.78L20.24,4.45L21.97,5.45L16.74,14.5L10.23,10.75L5.46,19H22V21H2V3H4V17.54L9.5,8L16,11.78Z
M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z
- M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z
M15,9A1,1 0 0,1 14,8A1,1 0 0,1 15,7A1,1 0 0,1 16,8A1,1 0 0,1 15,9M9,9A1,1 0 0,1 8,8A1,1 0 0,1 9,7A1,1 0 0,1 10,8A1,1 0 0,1 9,9M16.12,4.37L18.22,2.27L17.4,1.44L15.09,3.75C14.16,3.28 13.11,3 12,3C10.88,3 9.84,3.28 8.91,3.75L6.6,1.44L5.78,2.27L7.88,4.37C6.14,5.64 5,7.68 5,10V11H19V10C19,7.68 17.86,5.64 16.12,4.37M5,16C5,19.86 8.13,23 12,23A7,7 0 0,0 19,16V12H5V16Z
M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z
M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7
@@ -61,28 +57,17 @@
M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z
M9,13A3,3 0 0,0 12,16A3,3 0 0,0 15,13A3,3 0 0,0 12,10A3,3 0 0,0 9,13M20,19.59V8L14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18C18.45,22 18.85,21.85 19.19,21.6L14.76,17.17C13.96,17.69 13,18 12,18A5,5 0 0,1 7,13A5,5 0 0,1 12,8A5,5 0 0,1 17,13C17,14 16.69,14.96 16.17,15.75L20,19.59Z
M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z
- M3,15H21V13H3V15M3,19H21V17H3V19M3,11H21V9H3V11M3,5V7H21V5H3Z
M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M6,20H15L18,20V12L14,16L12,14L6,20M8,9A2,2 0 0,0 6,11A2,2 0 0,0 8,13A2,2 0 0,0 10,11A2,2 0 0,0 8,9Z
M20,8H4V6h16V8 M18,2H6v2h12V2 M20,10H4c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2v-8C22,10.9,21.1,10,20,10zM11,14H7v1h4v2H7v1h4v2H5v-8h6V14z M19,20h-2v-3h-2v3h-2v-8h2v3h2v-3h2V20z
- M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z
M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z
- M12.88,2H4V11L14.97,22.14L24,13.1L12.88,2ZM7.26,5.26C7.96,4.58,9.06,4.58,9.74,5.26C10.42,5.96,10.42,7.06,9.74,7.74S7.94,8.42,7.26,7.74S6.58,5.94,7.26,5.26ZM14.98,19.3L8.76,12.95L14.88,6.83L21.18,13.11L14.98,19.31ZM11.6,21.56L10.23,23L0,12.74V5H2V11.9L11.6,21.56Z
- M20.46,14.65C21.86,16.15,20.31,18.6,18.32,17.87C19.78,17.57,20.79,16.37,20.46,14.65ZM4.32,17.87C6.32,18.6,7.86,16.17,6.46,14.65C6.79,16.38,5.78,17.55,4.32,17.87ZM16.87,4.3C16.6,3.56,15.87,3,15,3C13.7,3,12.7,4.24,13.1,5.58C14.2,5.18,15.44,4.48,16.87,4.31ZM24,16C24,18.76,21.76,21,19,21C14.96,21,14.84,16.88,12,16.88S9.04,21,5,21C2.24,21,0,18.76,0,16C0,13.87,1.53,11.43,3.94,7.18C5.84,3.81,8.69,5.92,10.76,6.58C11.54,6.85,12.41,6.88,13.24,6.58C15.3,5.92,18.14,3.81,20.06,7.18C22.46,11.43,24,13.88,24,16ZM8,16C8,14.35,6.65,13,5,13S2,14.35,2,16S3.35,19,5,19S8,17.65,8,16ZM13,14C13,13.45,12.55,13,12,13S11,13.45,11,14S11.45,15,12,15S13,14.55,13,14ZM22,16C22,14.35,20.65,13,19,13S16,14.35,16,16S17.35,19,19,19S22,17.65,22,16ZM9,3C8.14,3,7.4,3.55,7.13,4.3C8.56,4.48,9.79,5.2,10.9,5.58C11.3,4.24,10.3,3,9,3Z
M5.5,2H22V0H5C3.3,0,2,1.3,2,3V21C2,22.7,3.3,24,5,24H22V4H5.5C4.1,4,4.1,2,5.5,2ZM20,6V22H6V6H20M12.5,11.8V14.4L14.9,15.8L15.3,15.2L13.3,14V11.9M13.3,9.3C11.5,9.3,10,10.3,9.2,11.7L8,10.5V13.8H11.3L9.9,12.4C10.5,11.1,11.8,10.3,13.3,10.3C15.4,10.3,17.1,12,17.1,14.1S15.4,17.9,13.3,17.9C11.7,17.9,10.3,16.9,9.8,15.4H8.7C9.3,17.4,11.1,18.9,13.3,18.9C15.9,18.9,18.1,16.8,18.1,14.1C18,11.4,15.9,9.3,13.3,9.3Z
M0,19V24H24V19H0ZM16,22H15V21H16V22ZM19,22H18V21H19V22ZM22,22H21V21H22V22M15,11L15,0L9,0L9,11L5,11L12,18L19,11Z
- M12.9,21.3C11.3,19.4,10.5,18.3,8.6,17.1C7.5,16.4,6.6,15.4,5.9,14.4L6.4,13.9L6.4,13.9C8.9,15.9,11.2,16.2,15.8,16.2C15.8,16.2,17,17.4,18.2,18.8C21.1,22,16.1,25,12.9,21.3ZM10.9,21.9C5.9,21.4,2,17.1,2,12C2,6.5,6.5,2,12,2S22,6.5,22,12C22,14.2,21.3,16.2,20.1,17.8C20.6,18.4,20.9,19.1,21.1,19.8C22.9,17.7,24,15,24,12C24,5.4,18.6,0,12,0S0,5.4,0,12S5.4,24,12,24C12.3,24,12.6,24,12.9,24C12,23.3,11.6,22.8,10.9,21.9M15.5,10.7L14.2,12L13,10.8L14.3,9.5L13,8.2L14.2,7L15.5,8.3L16.8,7L18,8.2L16.7,9.5L18,10.8L16.8,12L15.5,10.7M8.5,6C6.6,6,5,7.6,5,9.5S6.6,13,8.5,13S12,11.4,12,9.5S10.4,6,8.5,6ZM8.5,11C7.7,11,7,10.3,7,9.5S7.7,8,8.5,8C9.3,8,10,8.7,10,9.5S9.3,11,8.5,11Z
M22.9,2.84C24,0.44,15.08,0,12,0C9.06,0,0,0.43,1.1,2.84C1.6,3.94,10,15.76,10,15.76V21L14,24V15.76S22.4,3.96,22.9,2.84ZM12,1.94C16.25,1.94,20.15,2.51,20.15,3.17S16.25,4.34,12,4.34S3.97,3.8,3.97,3.17S7.76,1.94,12,1.94Z
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
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.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b0b9454a..09d223b2d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,16 +31,6 @@
- 48dp
-
-
-
-
-
-
-
-
-
-
-
-