Commit 011308e7 authored by wanglei's avatar wanglei

...

parent 749c94f8
......@@ -4,7 +4,6 @@ import android.animation.Animator
import android.animation.ObjectAnimator
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Intent
import android.graphics.Color
import android.os.Handler
......@@ -59,6 +58,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
switchSearch(searchEngineSp)
searchAdapter = SearchAdapter()
searchAdapter.searchAction = { content ->
startActivity(Intent(this, WebBrowserActivity::class.java).apply {
......@@ -117,6 +117,19 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
searchAdapter.submitList(listOf())
querySearchTip(it.toString())
}
binding.editWeb.setOnFocusChangeListener { v, hasFocus ->
if (hasFocus) {
binding.editWeb.selectAll()
}
}
if (searchContent.isNotEmpty()) {
binding.editWeb.setText(searchContent)
binding.editWeb.requestFocus()
binding.tvCancel.visibility = View.GONE
binding.tvSearch.visibility = View.VISIBLE
binding.ivClear.visibility = View.VISIBLE
}
binding.editWeb.setOnClickListener {
binding.editWeb.selectAll()
......@@ -176,6 +189,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
}
companion object {
var searchContent: String = ""
fun startActivityWithButtonAnimation(currentActivity: Activity, button: View, verticalOffset: Int) {
val finalPosition =
TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, currentActivity.resources.displayMetrics).toInt()
......
......@@ -242,12 +242,14 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
if (hasFocus) {
binding.editWeb.selectAll()
binding.ivShare.visibility = View.GONE
SearchActivity.searchContent = binding.editWeb.text.toString()
SearchActivity.startActivityWithButtonExpandAnimation(this, binding.clSearch, 0)
v.clearFocus()
}
}
}
private fun addNewWebSite(uri: String) {
val myFragment = WebViewFragment().apply { url = uri }
val transaction: FragmentTransaction = supportFragmentManager.beginTransaction()
......
......@@ -277,6 +277,7 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
@SuppressLint("NotifyDataSetChanged")
fun parseVideoLink(view: WebView) {
if (isParsing) return
if (activity == null) return
isParsing = true
downloadList.clear()
view.evaluateJavascript("(function() {" +
......
......@@ -53,11 +53,14 @@
<EditText
android:selectAllOnFocus="true"
android:id="@+id/edit_web"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="5dp"
android:background="@null"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:hint="Search or enter website address"
android:imeOptions="actionDone"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment