Migrate to mdc search view
parent
a52730fff0
commit
1b5720f2a5
GPG Key ID:
676DEE768C17A9D7
@ -0,0 +1,44 @@
|
|||||||
|
package org.koitharu.kotatsu.main.ui
|
||||||
|
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuInflater
|
||||||
|
import android.view.MenuItem
|
||||||
|
import androidx.core.view.MenuProvider
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.core.nav.AppRouter
|
||||||
|
|
||||||
|
class MainMenuProvider(
|
||||||
|
private val router: AppRouter,
|
||||||
|
private val viewModel: MainViewModel,
|
||||||
|
) : MenuProvider {
|
||||||
|
|
||||||
|
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
|
||||||
|
menuInflater.inflate(R.menu.opt_main, menu)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPrepareMenu(menu: Menu) {
|
||||||
|
menu.findItem(R.id.action_incognito)?.isChecked =
|
||||||
|
viewModel.isIncognitoModeEnabled.value
|
||||||
|
val hasAppUpdate = viewModel.appUpdate.value != null
|
||||||
|
menu.findItem(R.id.action_app_update)?.isVisible = hasAppUpdate
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
|
||||||
|
R.id.action_settings -> {
|
||||||
|
router.openSettings()
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
R.id.action_incognito -> {
|
||||||
|
viewModel.setIncognitoMode(!menuItem.isChecked)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
R.id.action_app_update -> {
|
||||||
|
router.openAppUpdate()
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> false
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,67 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.search.ui.suggestion
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.core.view.WindowInsetsCompat
|
|
||||||
import androidx.fragment.app.activityViewModels
|
|
||||||
import androidx.recyclerview.widget.ItemTouchHelper
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
|
||||||
import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
|
|
||||||
import org.koitharu.kotatsu.core.os.VoiceInputContract
|
|
||||||
import org.koitharu.kotatsu.core.ui.BaseFragment
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.addMenuProvider
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.consumeAll
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.observe
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.observeEvent
|
|
||||||
import org.koitharu.kotatsu.databinding.FragmentSearchSuggestionBinding
|
|
||||||
import org.koitharu.kotatsu.search.ui.suggestion.adapter.SearchSuggestionAdapter
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
class SearchSuggestionFragment :
|
|
||||||
BaseFragment<FragmentSearchSuggestionBinding>(),
|
|
||||||
SearchSuggestionItemCallback.SuggestionItemListener {
|
|
||||||
|
|
||||||
private val viewModel by activityViewModels<SearchSuggestionViewModel>()
|
|
||||||
private val voiceInputLauncher = registerForActivityResult(VoiceInputContract()) { result ->
|
|
||||||
if (result != null) {
|
|
||||||
viewModel.onQueryChanged(result)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreateViewBinding(
|
|
||||||
inflater: LayoutInflater,
|
|
||||||
container: ViewGroup?,
|
|
||||||
) = FragmentSearchSuggestionBinding.inflate(inflater, container, false)
|
|
||||||
|
|
||||||
override fun onViewBindingCreated(binding: FragmentSearchSuggestionBinding, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewBindingCreated(binding, savedInstanceState)
|
|
||||||
val adapter = SearchSuggestionAdapter(
|
|
||||||
listener = requireActivity() as SearchSuggestionListener,
|
|
||||||
)
|
|
||||||
addMenuProvider(SearchSuggestionMenuProvider(binding.root.context, voiceInputLauncher, viewModel))
|
|
||||||
binding.root.adapter = adapter
|
|
||||||
binding.root.setHasFixedSize(true)
|
|
||||||
viewModel.suggestion.observe(viewLifecycleOwner, adapter)
|
|
||||||
viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.root, this))
|
|
||||||
ItemTouchHelper(SearchSuggestionItemCallback(this))
|
|
||||||
.attachToRecyclerView(binding.root)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
|
|
||||||
val typeMask = WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.systemBars()
|
|
||||||
val barsInsets = insets.getInsets(typeMask)
|
|
||||||
v.setPadding(barsInsets.left, 0, barsInsets.right, barsInsets.bottom)
|
|
||||||
return insets.consumeAll(typeMask)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onRemoveQuery(query: String) {
|
|
||||||
viewModel.deleteQuery(query)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
viewModel.onResume()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
package org.koitharu.kotatsu.search.ui.suggestion
|
||||||
|
|
||||||
|
import android.text.Editable
|
||||||
|
import androidx.core.net.toUri
|
||||||
|
import com.google.android.material.search.SearchView
|
||||||
|
import org.koitharu.kotatsu.core.nav.AppRouter
|
||||||
|
import org.koitharu.kotatsu.core.parser.MangaLinkResolver
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||||
|
import org.koitharu.kotatsu.search.domain.SearchKind
|
||||||
|
|
||||||
|
class SearchSuggestionListenerImpl(
|
||||||
|
private val router: AppRouter,
|
||||||
|
private val searchView: SearchView,
|
||||||
|
private val viewModel: SearchSuggestionViewModel,
|
||||||
|
) : SearchSuggestionListener {
|
||||||
|
|
||||||
|
override fun onMangaClick(manga: Manga) {
|
||||||
|
router.openDetails(manga)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onQueryClick(query: String, kind: SearchKind, submit: Boolean) {
|
||||||
|
if (submit && query.isNotEmpty()) {
|
||||||
|
if (kind == SearchKind.SIMPLE && MangaLinkResolver.isValidLink(query)) {
|
||||||
|
router.openDetails(query.toUri())
|
||||||
|
} else {
|
||||||
|
router.openSearch(query, kind)
|
||||||
|
if (kind != SearchKind.TAG) {
|
||||||
|
viewModel.saveQuery(query)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
searchView.setText(query)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onTagClick(tag: MangaTag) {
|
||||||
|
router.openSearch(tag.title, SearchKind.TAG)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onSourceToggle(source: MangaSource, isEnabled: Boolean) {
|
||||||
|
viewModel.onSourceToggle(source, isEnabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onSourceClick(source: MangaSource) {
|
||||||
|
router.openList(source, null, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
|
||||||
|
|
||||||
|
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
|
||||||
|
|
||||||
|
override fun afterTextChanged(s: Editable?) {
|
||||||
|
viewModel.onQueryChanged(s?.toString().orEmpty())
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,161 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.search.ui.widget
|
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.content.Context
|
|
||||||
import android.os.Parcelable
|
|
||||||
import android.text.Spannable
|
|
||||||
import android.text.SpannableString
|
|
||||||
import android.text.style.TextAppearanceSpan
|
|
||||||
import android.util.AttributeSet
|
|
||||||
import android.view.InputDevice
|
|
||||||
import android.view.KeyEvent
|
|
||||||
import android.view.MotionEvent
|
|
||||||
import android.view.SoundEffectConstants
|
|
||||||
import android.view.accessibility.AccessibilityEvent
|
|
||||||
import android.view.inputmethod.EditorInfo
|
|
||||||
import androidx.annotation.AttrRes
|
|
||||||
import androidx.annotation.CheckResult
|
|
||||||
import androidx.annotation.StringRes
|
|
||||||
import androidx.appcompat.widget.AppCompatEditText
|
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import org.koitharu.kotatsu.R
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.drawableEnd
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.drawableStart
|
|
||||||
import org.koitharu.kotatsu.search.domain.SearchKind
|
|
||||||
import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
|
|
||||||
import androidx.appcompat.R as appcompatR
|
|
||||||
|
|
||||||
private const val DRAWABLE_END = 2
|
|
||||||
|
|
||||||
class SearchEditText @JvmOverloads constructor(
|
|
||||||
context: Context,
|
|
||||||
attrs: AttributeSet? = null,
|
|
||||||
@AttrRes defStyleAttr: Int = appcompatR.attr.editTextStyle,
|
|
||||||
) : AppCompatEditText(context, attrs, defStyleAttr) {
|
|
||||||
|
|
||||||
var searchSuggestionListener: SearchSuggestionListener? = null
|
|
||||||
private val clearIcon =
|
|
||||||
ContextCompat.getDrawable(context, appcompatR.drawable.abc_ic_clear_material)
|
|
||||||
private var isEmpty = text.isNullOrEmpty()
|
|
||||||
|
|
||||||
init {
|
|
||||||
hint = wrapHint()
|
|
||||||
}
|
|
||||||
|
|
||||||
var query: String
|
|
||||||
get() = text?.trim()?.toString().orEmpty()
|
|
||||||
set(value) {
|
|
||||||
if (value != text?.toString()) {
|
|
||||||
setText(value)
|
|
||||||
setSelection(value.length)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onKeyPreIme(keyCode: Int, event: KeyEvent): Boolean {
|
|
||||||
if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
|
|
||||||
if (hasFocus()) {
|
|
||||||
clearFocus()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return super.onKeyPreIme(keyCode, event)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
|
|
||||||
if (event.isFromSource(InputDevice.SOURCE_KEYBOARD)
|
|
||||||
&& (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)
|
|
||||||
&& event.hasNoModifiers()
|
|
||||||
&& query.isNotEmpty()
|
|
||||||
) {
|
|
||||||
cancelLongPress()
|
|
||||||
searchSuggestionListener?.onQueryClick(query, SearchKind.SIMPLE, submit = true)
|
|
||||||
clearFocus()
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return super.onKeyUp(keyCode, event)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onEditorAction(actionCode: Int) {
|
|
||||||
super.onEditorAction(actionCode)
|
|
||||||
if (actionCode == EditorInfo.IME_ACTION_SEARCH) {
|
|
||||||
searchSuggestionListener?.onQueryClick(query, SearchKind.SIMPLE, submit = true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onTextChanged(
|
|
||||||
text: CharSequence?,
|
|
||||||
start: Int,
|
|
||||||
lengthBefore: Int,
|
|
||||||
lengthAfter: Int,
|
|
||||||
) {
|
|
||||||
super.onTextChanged(text, start, lengthBefore, lengthAfter)
|
|
||||||
val empty = text.isNullOrEmpty()
|
|
||||||
if (isEmpty != empty) {
|
|
||||||
isEmpty = empty
|
|
||||||
updateActionIcon()
|
|
||||||
}
|
|
||||||
searchSuggestionListener?.onQueryChanged(query)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onRestoreInstanceState(state: Parcelable?) {
|
|
||||||
super.onRestoreInstanceState(state)
|
|
||||||
updateActionIcon()
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("ClickableViewAccessibility")
|
|
||||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
|
||||||
if (event.action == MotionEvent.ACTION_UP) {
|
|
||||||
val drawable =
|
|
||||||
compoundDrawablesRelative[DRAWABLE_END] ?: return super.onTouchEvent(event)
|
|
||||||
val isOnDrawable = drawable.isVisible && if (layoutDirection == LAYOUT_DIRECTION_RTL) {
|
|
||||||
event.x.toInt() in paddingLeft..(drawable.bounds.width() + paddingLeft)
|
|
||||||
} else {
|
|
||||||
event.x.toInt() in (width - drawable.bounds.width() - paddingRight)..(width - paddingRight)
|
|
||||||
}
|
|
||||||
if (isOnDrawable) {
|
|
||||||
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED)
|
|
||||||
playSoundEffect(SoundEffectConstants.CLICK)
|
|
||||||
onActionIconClick()
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return super.onTouchEvent(event)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun clearFocus() {
|
|
||||||
super.clearFocus()
|
|
||||||
text?.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setHintCompat(@StringRes resId: Int) {
|
|
||||||
hint = wrapHint(context.getString(resId))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun onActionIconClick() {
|
|
||||||
when {
|
|
||||||
!text.isNullOrEmpty() -> text?.clear()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateActionIcon() {
|
|
||||||
val icon = when {
|
|
||||||
!text.isNullOrEmpty() -> clearIcon
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
if (icon !== drawableEnd) {
|
|
||||||
setCompoundDrawablesRelativeWithIntrinsicBounds(drawableStart, null, icon, null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@CheckResult
|
|
||||||
private fun wrapHint(raw: CharSequence? = hint): SpannableString? {
|
|
||||||
val rawHint = raw?.toString() ?: return null
|
|
||||||
val formatted = SpannableString(rawHint)
|
|
||||||
formatted.setSpan(
|
|
||||||
TextAppearanceSpan(context, R.style.TextAppearance_Kotatsu_SearchView),
|
|
||||||
0,
|
|
||||||
formatted.length,
|
|
||||||
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
|
|
||||||
)
|
|
||||||
return formatted
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.search.ui.widget
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.graphics.Color
|
|
||||||
import android.util.AttributeSet
|
|
||||||
import androidx.annotation.AttrRes
|
|
||||||
import com.google.android.material.appbar.MaterialToolbar
|
|
||||||
import com.google.android.material.shape.MaterialShapeDrawable
|
|
||||||
import androidx.appcompat.R as appcompatR
|
|
||||||
|
|
||||||
class SearchToolbar @JvmOverloads constructor(
|
|
||||||
context: Context,
|
|
||||||
attrs: AttributeSet? = null,
|
|
||||||
@AttrRes defStyleAttr: Int = appcompatR.attr.toolbarStyle,
|
|
||||||
) : MaterialToolbar(context, attrs, defStyleAttr) {
|
|
||||||
|
|
||||||
private val bgDrawable = MaterialShapeDrawable(context, attrs, defStyleAttr, 0)
|
|
||||||
|
|
||||||
init {
|
|
||||||
bgDrawable.initializeElevationOverlay(context)
|
|
||||||
bgDrawable.setShadowColor(Color.DKGRAY)
|
|
||||||
background = bgDrawable
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue