This commit is contained in:
kunfei
2023-04-18 10:57:06 +08:00
parent e03b2d7c7e
commit 24e352cccc
5 changed files with 20 additions and 2 deletions
@@ -77,8 +77,8 @@ abstract class BaseActivity<VB : ViewBinding>(
findViewById<TitleBar>(R.id.title_bar) findViewById<TitleBar>(R.id.title_bar)
?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen) ?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen)
} }
onActivityCreated(savedInstanceState)
observeLiveBus() observeLiveBus()
onActivityCreated(savedInstanceState)
} }
@RequiresApi(Build.VERSION_CODES.O) @RequiresApi(Build.VERSION_CODES.O)
@@ -32,8 +32,8 @@ abstract class BaseFragment(@LayoutRes layoutID: Int) : Fragment(layoutID),
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
onMultiWindowModeChanged() onMultiWindowModeChanged()
onFragmentCreated(view, savedInstanceState)
observeLiveBus() observeLiveBus()
onFragmentCreated(view, savedInstanceState)
} }
abstract fun onFragmentCreated(view: View, savedInstanceState: Bundle?) abstract fun onFragmentCreated(view: View, savedInstanceState: Bundle?)
@@ -7,6 +7,7 @@ import android.view.MotionEvent
import android.widget.EditText import android.widget.EditText
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.view.allViews
import io.legado.app.R import io.legado.app.R
import io.legado.app.base.VMBaseActivity import io.legado.app.base.VMBaseActivity
import io.legado.app.constant.AppLog import io.legado.app.constant.AppLog
@@ -119,6 +120,13 @@ class SearchContentActivity :
mLayoutManager.scrollToPositionWithOffset(adapter.itemCount - 1, 0) mLayoutManager.scrollToPositionWithOffset(adapter.itemCount - 1, 0)
} }
} }
binding.tvCurrentSearchInfo.setOnClickListener {
searchView.allViews.forEach { view ->
if (view is EditText) {
view.showSoftInput()
}
}
}
binding.fbStop.setOnClickListener { binding.fbStop.setOnClickListener {
searchJob?.cancel() searchJob?.cancel()
} }
@@ -10,6 +10,7 @@ import android.os.Build
import android.text.Html import android.text.Html
import android.view.View import android.view.View
import android.view.View.* import android.view.View.*
import android.view.inputmethod.InputMethodManager
import android.widget.* import android.widget.*
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
@@ -41,6 +42,11 @@ fun View.hideSoftInput() = run {
inputMethodManager.hideSoftInputFromWindow(this.windowToken, 0) inputMethodManager.hideSoftInputFromWindow(this.windowToken, 0)
} }
fun View.showSoftInput() = run {
requestFocus()
inputMethodManager.showSoftInput(this, InputMethodManager.RESULT_SHOWN)
}
fun View.disableAutoFill() = run { fun View.disableAutoFill() = run {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
this.importantForAutofill = IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS this.importantForAutofill = IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS
@@ -54,6 +54,10 @@
android:textColor="@color/primaryText" android:textColor="@color/primaryText"
android:textSize="12sp" /> android:textSize="12sp" />
<Space
android:layout_width="20dp"
android:layout_height="1dp" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_search_content_top" android:id="@+id/iv_search_content_top"
android:layout_width="36dp" android:layout_width="36dp"