Commit 5e27bdb6 authored by wanglei's avatar wanglei

...

parent 7357d28f
...@@ -101,7 +101,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -101,7 +101,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
homeFragment?.onActivityResult(resultCode, resultCode, data) homeFragment?.onActivityResult(resultCode, resultCode, data)
} }
override fun initListener() { override fun initListener() {
......
...@@ -9,10 +9,8 @@ import android.graphics.Color ...@@ -9,10 +9,8 @@ import android.graphics.Color
import android.os.Handler import android.os.Handler
import android.util.TypedValue import android.util.TypedValue
import android.view.View import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import com.base.browserwhite.R import com.base.browserwhite.R
import com.base.browserwhite.bean.ConstObject import com.base.browserwhite.bean.ConstObject
...@@ -159,6 +157,29 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -159,6 +157,29 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
}) })
animator.start() animator.start()
} }
fun startActivityWithButtonExpandAnimation(currentActivity: Activity, button: View, verticalOffset: Int) {
// val finalPosition =
// TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, currentActivity.resources.displayMetrics).toInt()
// val buttonTop = button.top - finalPosition
// val distanceToTop = -buttonTop - verticalOffset
// val animator = ObjectAnimator.ofFloat(button, "scaleX", 1f, 1.05f)
// animator.setDuration(500)
// animator.addListener(object : Animator.AnimatorListener {
// override fun onAnimationStart(animation: Animator) {}
// override fun onAnimationEnd(animation: Animator) {
// button.visibility = View.VISIBLE
val intent = Intent(currentActivity, SearchActivity::class.java)
currentActivity.startActivityForResult(intent, 10086)
currentActivity.overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
// }
//
// override fun onAnimationCancel(animation: Animator) {}
// override fun onAnimationRepeat(animation: Animator) {}
// })
// animator.start()
}
} }
private fun switchSearch(website: String) { private fun switchSearch(website: String) {
......
...@@ -4,6 +4,7 @@ package com.base.browserwhite.ui.activity.webbrowser ...@@ -4,6 +4,7 @@ package com.base.browserwhite.ui.activity.webbrowser
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.view.KeyEvent import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.widget.TextView import android.widget.TextView
import androidx.activity.addCallback import androidx.activity.addCallback
...@@ -20,6 +21,7 @@ import com.base.browserwhite.databinding.ActivityWebBrowserBinding ...@@ -20,6 +21,7 @@ import com.base.browserwhite.databinding.ActivityWebBrowserBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity import com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
import com.base.browserwhite.ui.activity.search.SearchActivity
import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog import com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import com.base.browserwhite.utils.BarUtils import com.base.browserwhite.utils.BarUtils
...@@ -92,6 +94,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -92,6 +94,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
binding.ivShare.visibility = View.VISIBLE
}
private fun checkLeftRight() { private fun checkLeftRight() {
if (currentFragment?.canGoBack() == true) { if (currentFragment?.canGoBack() == true) {
...@@ -214,6 +221,22 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -214,6 +221,22 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
startActivity(Intent(this, BookmarkEditActivity::class.java)) startActivity(Intent(this, BookmarkEditActivity::class.java))
}) })
} }
binding.ivShare.setOnClickListener {
val shareIntent = Intent()
shareIntent.setAction(Intent.ACTION_SEND)
shareIntent.putExtra(Intent.EXTRA_TEXT, currentFragment?.url)
shareIntent.setType("text/plain")
}
binding.editWeb.setOnFocusChangeListener { v, hasFocus ->
if (hasFocus) {
binding.editWeb.selectAll()
binding.ivShare.visibility = View.GONE
SearchActivity.startActivityWithButtonExpandAnimation(this, binding.clSearch, 0)
v.clearFocus()
}
}
} }
private fun addNewWebSite(uri: String) { private fun addNewWebSite(uri: String) {
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_top" android:id="@+id/cl_search"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/container" app:layout_constraintBottom_toTopOf="@id/container"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/iv_share"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
...@@ -88,21 +88,34 @@ ...@@ -88,21 +88,34 @@
tools:ignore="ContentDescription"> tools:ignore="ContentDescription">
<ImageView <ImageView
android:id="@+id/iv_refresh"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/saoyisao" android:src="@mipmap/shuaxin" />
android:visibility="gone" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:src="@mipmap/fenxiang"
app:layout_constraintBottom_toBottomOf="@id/cl_search"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cl_search"
app:layout_constraintTop_toTopOf="@id/cl_search"
tools:ignore="ContentDescription" />
<FrameLayout <FrameLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/cl_bottom" app:layout_constraintBottom_toTopOf="@id/cl_bottom"
app:layout_constraintTop_toBottomOf="@id/cl_top" app:layout_constraintTop_toBottomOf="@id/cl_search"
tools:ignore="UselessLeaf" /> tools:ignore="UselessLeaf" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
......
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