diff --git a/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt b/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
new file mode 100644
index 00000000..3fe1fb31
--- /dev/null
+++ b/app/src/main/java/com/arlib/floatingsearchview/FloatingSearchViewDayNight.kt
@@ -0,0 +1,35 @@
+/*
+ * Pupil, Hitomi.la viewer for Android
+ * Copyright (C) 2020 tom5079
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.arlib.floatingsearchview
+
+import android.content.Context
+import android.os.Parcelable
+import android.util.AttributeSet
+
+class FloatingSearchViewDayNight @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null)
+ : FloatingSearchView(context, attrs) {
+
+ // hack to remove color attributes which should not be reused
+ override fun onSaveInstanceState(): Parcelable? {
+ super.onSaveInstanceState()
+ return null
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
index 0838470e..65f37e9e 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -41,6 +41,7 @@ import androidx.core.view.GravityCompat
import androidx.preference.PreferenceManager
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import com.arlib.floatingsearchview.FloatingSearchView
+import com.arlib.floatingsearchview.FloatingSearchViewDayNight
import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
import com.arlib.floatingsearchview.util.view.SearchInputView
import com.bumptech.glide.Glide
@@ -767,7 +768,7 @@ class MainActivity : AppCompatActivity() {
})
searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
- with(main_searchview as FloatingSearchView) {
+ with(main_searchview as FloatingSearchViewDayNight) {
val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
val serializer = Tag.serializer().list
@@ -870,14 +871,14 @@ class MainActivity : AppCompatActivity() {
ResourcesCompat.getDrawable(
resources,
when(item.n) {
- "female" -> R.drawable.ic_gender_female
- "male" -> R.drawable.ic_gender_male
- "language" -> R.drawable.ic_translate
- "group" -> R.drawable.ic_account_group
- "character" -> R.drawable.ic_account_star
- "series" -> R.drawable.ic_book_open
- "artist" -> R.drawable.ic_brush
- else -> R.drawable.ic_tag
+ "female" -> R.drawable.gender_female
+ "male" -> R.drawable.gender_male
+ "language" -> R.drawable.translate
+ "group" -> R.drawable.account_group
+ "character" -> R.drawable.account_star
+ "series" -> R.drawable.book_open
+ "artist" -> R.drawable.brush
+ else -> R.drawable.tag
},
null)
)
diff --git a/app/src/main/res/drawable-hdpi/ic_account_group.png b/app/src/main/res/drawable-hdpi/ic_account_group.png
deleted file mode 100644
index 2e8279db..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_account_star.png b/app/src/main/res/drawable-hdpi/ic_account_star.png
deleted file mode 100644
index 53b16e5d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_book_open.png b/app/src/main/res/drawable-hdpi/ic_book_open.png
deleted file mode 100644
index 144febb1..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_brush.png b/app/src/main/res/drawable-hdpi/ic_brush.png
deleted file mode 100644
index 5316c732..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_gender_female.png b/app/src/main/res/drawable-hdpi/ic_gender_female.png
deleted file mode 100644
index 76a7d4c4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_gender_male.png b/app/src/main/res/drawable-hdpi/ic_gender_male.png
deleted file mode 100644
index 4ee6cd07..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_tag.png b/app/src/main/res/drawable-hdpi/ic_tag.png
deleted file mode 100644
index aa3b8750..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_translate.png b/app/src/main/res/drawable-hdpi/ic_translate.png
deleted file mode 100644
index 1a8f4365..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_account_group.png b/app/src/main/res/drawable-ldpi/ic_account_group.png
deleted file mode 100644
index c7cbb8cb..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_account_star.png b/app/src/main/res/drawable-ldpi/ic_account_star.png
deleted file mode 100644
index 4373f45f..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_book_open.png b/app/src/main/res/drawable-ldpi/ic_book_open.png
deleted file mode 100644
index 1b1c6020..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_brush.png b/app/src/main/res/drawable-ldpi/ic_brush.png
deleted file mode 100644
index 48baadd4..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_gender_female.png b/app/src/main/res/drawable-ldpi/ic_gender_female.png
deleted file mode 100644
index 1070b7d4..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_gender_male.png b/app/src/main/res/drawable-ldpi/ic_gender_male.png
deleted file mode 100644
index fd054d81..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_tag.png b/app/src/main/res/drawable-ldpi/ic_tag.png
deleted file mode 100644
index 39459491..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_translate.png b/app/src/main/res/drawable-ldpi/ic_translate.png
deleted file mode 100644
index ffe6baf7..00000000
Binary files a/app/src/main/res/drawable-ldpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_group.png b/app/src/main/res/drawable-mdpi/ic_account_group.png
deleted file mode 100644
index 314120c4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_star.png b/app/src/main/res/drawable-mdpi/ic_account_star.png
deleted file mode 100644
index 48b75fa6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_book_open.png b/app/src/main/res/drawable-mdpi/ic_book_open.png
deleted file mode 100644
index b76cd538..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_brush.png b/app/src/main/res/drawable-mdpi/ic_brush.png
deleted file mode 100644
index 48ec2743..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_gender_female.png b/app/src/main/res/drawable-mdpi/ic_gender_female.png
deleted file mode 100644
index 7000159c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_gender_male.png b/app/src/main/res/drawable-mdpi/ic_gender_male.png
deleted file mode 100644
index 211cee7a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_tag.png b/app/src/main/res/drawable-mdpi/ic_tag.png
deleted file mode 100644
index 42e8255f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_translate.png b/app/src/main/res/drawable-mdpi/ic_translate.png
deleted file mode 100644
index 1d4c32d6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_group.png b/app/src/main/res/drawable-xhdpi/ic_account_group.png
deleted file mode 100644
index 4e6389bc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_star.png b/app/src/main/res/drawable-xhdpi/ic_account_star.png
deleted file mode 100644
index a8dc7cc7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_book_open.png b/app/src/main/res/drawable-xhdpi/ic_book_open.png
deleted file mode 100644
index dc925c77..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_brush.png b/app/src/main/res/drawable-xhdpi/ic_brush.png
deleted file mode 100644
index 01fde729..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_female.png b/app/src/main/res/drawable-xhdpi/ic_gender_female.png
deleted file mode 100644
index 734e0d99..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_male.png b/app/src/main/res/drawable-xhdpi/ic_gender_male.png
deleted file mode 100644
index 89a1948d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tag.png b/app/src/main/res/drawable-xhdpi/ic_tag.png
deleted file mode 100644
index 23658b82..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_translate.png b/app/src/main/res/drawable-xhdpi/ic_translate.png
deleted file mode 100644
index 73a5393b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_group.png b/app/src/main/res/drawable-xxhdpi/ic_account_group.png
deleted file mode 100644
index 2080d107..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_star.png b/app/src/main/res/drawable-xxhdpi/ic_account_star.png
deleted file mode 100644
index ca802350..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_open.png b/app/src/main/res/drawable-xxhdpi/ic_book_open.png
deleted file mode 100644
index fc7ea0d5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_brush.png b/app/src/main/res/drawable-xxhdpi/ic_brush.png
deleted file mode 100644
index 2a5a71a2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_gender_female.png b/app/src/main/res/drawable-xxhdpi/ic_gender_female.png
deleted file mode 100644
index f2cb8663..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_gender_male.png b/app/src/main/res/drawable-xxhdpi/ic_gender_male.png
deleted file mode 100644
index 3ba80a52..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tag.png b/app/src/main/res/drawable-xxhdpi/ic_tag.png
deleted file mode 100644
index 10494383..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_translate.png b/app/src/main/res/drawable-xxhdpi/ic_translate.png
deleted file mode 100644
index 49d105a1..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_group.png b/app/src/main/res/drawable-xxxhdpi/ic_account_group.png
deleted file mode 100644
index 7ad2921a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_account_group.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_star.png b/app/src/main/res/drawable-xxxhdpi/ic_account_star.png
deleted file mode 100644
index 2fa56e16..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_account_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_open.png b/app/src/main/res/drawable-xxxhdpi/ic_book_open.png
deleted file mode 100644
index db934527..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_book_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_brush.png b/app/src/main/res/drawable-xxxhdpi/ic_brush.png
deleted file mode 100644
index fa47de51..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_brush.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gender_female.png b/app/src/main/res/drawable-xxxhdpi/ic_gender_female.png
deleted file mode 100644
index 6b0c3dcd..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_gender_female.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_gender_male.png b/app/src/main/res/drawable-xxxhdpi/ic_gender_male.png
deleted file mode 100644
index d7251b2b..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_gender_male.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tag.png b/app/src/main/res/drawable-xxxhdpi/ic_tag.png
deleted file mode 100644
index d6804b45..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_tag.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_translate.png b/app/src/main/res/drawable-xxxhdpi/ic_translate.png
deleted file mode 100644
index 078e846a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable/account_group.xml b/app/src/main/res/drawable/account_group.xml
new file mode 100644
index 00000000..9e5f4d81
--- /dev/null
+++ b/app/src/main/res/drawable/account_group.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/account_star.xml b/app/src/main/res/drawable/account_star.xml
new file mode 100644
index 00000000..dc8e4492
--- /dev/null
+++ b/app/src/main/res/drawable/account_star.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/book_open.xml b/app/src/main/res/drawable/book_open.xml
new file mode 100644
index 00000000..66c81594
--- /dev/null
+++ b/app/src/main/res/drawable/book_open.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/brush.xml b/app/src/main/res/drawable/brush.xml
new file mode 100644
index 00000000..87b7c4c3
--- /dev/null
+++ b/app/src/main/res/drawable/brush.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gender_female.xml b/app/src/main/res/drawable/gender_female.xml
new file mode 100644
index 00000000..6620153b
--- /dev/null
+++ b/app/src/main/res/drawable/gender_female.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gender_male.xml b/app/src/main/res/drawable/gender_male.xml
new file mode 100644
index 00000000..eb3750bb
--- /dev/null
+++ b/app/src/main/res/drawable/gender_male.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tag.xml b/app/src/main/res/drawable/tag.xml
new file mode 100644
index 00000000..47689267
--- /dev/null
+++ b/app/src/main/res/drawable/tag.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/translate.xml b/app/src/main/res/drawable/translate.xml
new file mode 100644
index 00000000..f357ae5f
--- /dev/null
+++ b/app/src/main/res/drawable/translate.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index e3ce7e65..f427226b 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -118,11 +118,17 @@
-
+ app:floatingSearch_close_search_on_keyboard_dismiss="true"
+ tools:ignore="NewApi" />
\ No newline at end of file