Merge branch 'devel' into feature/shikimori

2022-06-21 13:31:44 +03:00
parent 82efa8298d 8d47b09e80
commit 0695103589
247 changed files with 5766 additions and 2342 deletions
--- a/app/src/main/res/xml/pref_content.xml
+++ b/app/src/main/res/xml/pref_content.xml
@@ -18,6 +18,12 @@
 		android:title="@string/shikimori"
 		android:key="shikimori" />

+	<ListPreference
+		android:entries="@array/doh_providers"
+		android:key="doh"
+		android:title="@string/dns_over_https"
+		app:useSimpleSummaryProvider="true" />
+
 	<Preference
 		android:key="local_storage"
 		android:persistent="false"