Merge branch 'devel' into feature/shikimori

2022-06-26 10:13:57 +03:00
parent 87b62aef70 781438d83a
commit c6785bfda0
38 changed files with 503 additions and 109 deletions
--- a/app/src/main/res/menu/opt_config.xml
+++ b/app/src/main/res/menu/opt_config.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/action_done"
-		android:orderInCategory="0"
-		android:title="@string/done"
-		app:showAsAction="always|withText" />
-</menu>
--- a/app/src/main/res/menu/opt_sources.xml
+++ b/app/src/main/res/menu/opt_sources.xml
@@ -10,4 +10,9 @@
 		app:actionViewClass="androidx.appcompat.widget.SearchView"
 		app:showAsAction="ifRoom|collapseActionView" />

+	<item
+		android:id="@+id/action_disable_all"
+		android:title="@string/disable_all"
+		app:showAsAction="never" />
+
 </menu>