Fix search bar hint font

pull/308/head
Koitharu 3 years ago
parent b6e3cb929b
commit 66817ae545
No known key found for this signature in database
GPG Key ID: 8E861F8CE6E7CE27

@ -327,8 +327,10 @@ class MainActivity :
TrackWorker.setup(applicationContext) TrackWorker.setup(applicationContext)
SuggestionsWorker.setup(applicationContext) SuggestionsWorker.setup(applicationContext)
} }
MangaPrefetchService.prefetchLast(this@MainActivity) whenResumed {
requestNotificationsPermission() MangaPrefetchService.prefetchLast(this@MainActivity)
requestNotificationsPermission()
}
} }
} }

@ -3,6 +3,9 @@ package org.koitharu.kotatsu.search.ui.widget
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.os.Parcelable import android.os.Parcelable
import android.text.Spannable
import android.text.SpannableString
import android.text.style.TextAppearanceSpan
import android.util.AttributeSet import android.util.AttributeSet
import android.view.KeyEvent import android.view.KeyEvent
import android.view.MotionEvent import android.view.MotionEvent
@ -12,11 +15,11 @@ import android.view.inputmethod.EditorInfo
import androidx.annotation.AttrRes import androidx.annotation.AttrRes
import androidx.appcompat.widget.AppCompatEditText import androidx.appcompat.widget.AppCompatEditText
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.google.android.material.R as materialR
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
import org.koitharu.kotatsu.utils.ext.drawableEnd import org.koitharu.kotatsu.utils.ext.drawableEnd
import org.koitharu.kotatsu.utils.ext.drawableStart import org.koitharu.kotatsu.utils.ext.drawableStart
import com.google.android.material.R as materialR
private const val DRAWABLE_END = 2 private const val DRAWABLE_END = 2
@ -31,6 +34,10 @@ class SearchEditText @JvmOverloads constructor(
private val voiceIcon = ContextCompat.getDrawable(context, R.drawable.ic_voice_input) private val voiceIcon = ContextCompat.getDrawable(context, R.drawable.ic_voice_input)
private var isEmpty = text.isNullOrEmpty() private var isEmpty = text.isNullOrEmpty()
init {
wrapHint()
}
var isVoiceSearchEnabled: Boolean = false var isVoiceSearchEnabled: Boolean = false
set(value) { set(value) {
field = value field = value
@ -124,4 +131,16 @@ class SearchEditText @JvmOverloads constructor(
setCompoundDrawablesRelativeWithIntrinsicBounds(drawableStart, null, icon, null) setCompoundDrawablesRelativeWithIntrinsicBounds(drawableStart, null, icon, null)
} }
} }
private fun wrapHint() {
val rawHint = hint?.toString() ?: return
val formatted = SpannableString(rawHint)
formatted.setSpan(
TextAppearanceSpan(context, materialR.style.TextAppearance_Material3_SearchView),
0,
formatted.length,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
)
hint = formatted
}
} }

@ -86,7 +86,6 @@
<style name="Widget.Kotatsu.SearchView" parent="@style/Widget.AppCompat.SearchView"> <style name="Widget.Kotatsu.SearchView" parent="@style/Widget.AppCompat.SearchView">
<item name="iconifiedByDefault">false</item> <item name="iconifiedByDefault">false</item>
<item name="searchIcon">@null</item> <item name="searchIcon">@null</item>
<item name="hintTextAppearance">?textAppearanceBodyMedium</item>
<item name="queryBackground">@null</item> <item name="queryBackground">@null</item>
<item name="android:textColorHint">?attr/colorControlNormal</item> <item name="android:textColorHint">?attr/colorControlNormal</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>

Loading…
Cancel
Save