Skip to content

B
Browser White
Commit 7158f089 authored by wanglei's avatar wanglei
Browse files
Options

...

parent 60f073df
Show whitespace changes
Inline Side-by-side
Showing with 182 additions and 47 deletions
app/src/main/java/com/base/browserwhite/bean/ConstObject.kt 0 → 100644
View file @ 7158f089
package com.base.browserwhite.bean
object ConstObject {
const val GOOGLE = "Google"
const val BING = "Bing"
const val YAHOO = "Yahoo"
const val DUCKDUCKGO = "DuckDuckGo"
const val YANDEX = "Yandex"
const val BAIDU = "Baidu"
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ui/fragment/HomeFragment.kt
View file @ 7158f089
......@@ -4,9 +4,11 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
import com.base.browserwhite.R
import com.base.browserwhite.bean.ConstObject.GOOGLE
import com.base.browserwhite.bean.WebSiteBean
import com.base.browserwhite.databinding.FragmentHomeBinding
import com.base.browserwhite.ui.adapter.WebsiteAdapter
import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import com.base.browserwhite.ui.views.itemtouch.MyItemTouchHelperCallBack
......@@ -44,4 +46,16 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
websiteAdapter.setData(recommendWebSite)
}
override fun setListener() {
super.setListener()
binding.flSearchEngine.setOnClickListener {
requireContext().showSearchEngineDialog { website ->
when (website) {
GOOGLE -> {}
}
}
}
}
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ui/views/DialogViews.kt
View file @ 7158f089
......@@ -3,12 +3,19 @@ package com.base.browserwhite.ui.views
import android.app.AlertDialog
import android.content.Context
import android.view.LayoutInflater
import android.widget.FrameLayout
import com.base.browserwhite.R
import com.base.browserwhite.bean.ConstObject.BAIDU
import com.base.browserwhite.bean.ConstObject.BING
import com.base.browserwhite.bean.ConstObject.DUCKDUCKGO
import com.base.browserwhite.bean.ConstObject.GOOGLE
import com.base.browserwhite.bean.ConstObject.YAHOO
import com.base.browserwhite.bean.ConstObject.YANDEX
import com.base.browserwhite.databinding.DialogSearchEngineBinding
object DialogViews {
fun Context.showSearchEngineDialog() {
fun Context.showSearchEngineDialog(selectWebSite: String = GOOGLE, confirmAction: (webSite: String) -> Unit) {
val binding = DialogSearchEngineBinding.inflate(LayoutInflater.from(this))
val dialog = AlertDialog.Builder(this).create()
......@@ -16,9 +23,71 @@ object DialogViews {
dialog.show()
val params = dialog.window?.attributes
// params?.width = resources.getDimensionPixelOffset(R.dimen.dp_300)
params?.width = resources.getDimensionPixelOffset(R.dimen.dp_345)
// params?.width = FrameLayout.LayoutParams.WRAP_CONTENT
params?.height = FrameLayout.LayoutParams.WRAP_CONTENT
dialog.window?.attributes = params
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
binding.tvCancel.setOnClickListener {
dialog.dismiss()
}
when (selectWebSite) {
GOOGLE -> binding.llGoogle.isSelected = true
BING -> binding.llBing.isSelected = true
YAHOO -> binding.llYahoo.isSelected = true
DUCKDUCKGO -> binding.llDuck.isSelected = true
YANDEX -> binding.llYandex.isSelected = true
BAIDU -> binding.llBaidu.isSelected = true
}
val dismissSelect = {
binding.llGoogle.isSelected = false
binding.llBing.isSelected = false
binding.llYahoo.isSelected = false
binding.llDuck.isSelected = false
binding.llYandex.isSelected = false
binding.llBaidu.isSelected = false
}
var tempSelectWebSite = GOOGLE
binding.llGoogle.setOnClickListener {
dismissSelect.invoke()
binding.llGoogle.isSelected = true
tempSelectWebSite = GOOGLE
}
binding.llBing.setOnClickListener {
dismissSelect.invoke()
binding.llBing.isSelected = true
tempSelectWebSite = BING
}
binding.llYahoo.setOnClickListener {
dismissSelect.invoke()
binding.llYahoo.isSelected = true
tempSelectWebSite = YAHOO
}
binding.llDuck.setOnClickListener {
dismissSelect.invoke()
binding.llDuck.isSelected = true
tempSelectWebSite = DUCKDUCKGO
}
binding.llYandex.setOnClickListener {
dismissSelect.invoke()
binding.llYandex.isSelected = true
tempSelectWebSite = YANDEX
}
binding.llBaidu.setOnClickListener {
dismissSelect.invoke()
binding.llBaidu.isSelected = true
tempSelectWebSite = BAIDU
}
binding.tvConfirm.setOnClickListener {
dialog.dismiss()
confirmAction.invoke(tempSelectWebSite)
}
}
}
\ No newline at end of file
app/src/main/res/layout/dialog_search_engine.xml
View file @ 7158f089
......@@ -2,8 +2,8 @@
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="290dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
app:cardBackgroundColor="#EDF1F4"
app:cardCornerRadius="15dp">
......@@ -16,15 +16,16 @@
android:id="@+id/ll_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="6dp"
android:padding="8dp"
android:paddingVertical="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_google"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -53,7 +54,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_bing"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -65,7 +67,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:src="@mipmap/x_google"
android:src="@mipmap/x_bing"
tools:ignore="ContentDescription" />
<TextView
......@@ -73,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="Google"
android:text="Bing"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -82,7 +84,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_yahoo"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -94,7 +97,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:src="@mipmap/x_google"
android:src="@mipmap/x_yahoo"
tools:ignore="ContentDescription" />
<TextView
......@@ -102,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="Google"
android:text="Yahoo"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -111,7 +114,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_duck"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -123,15 +127,18 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:src="@mipmap/x_google"
android:src="@mipmap/x_duckd"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="10dp"
android:text="Google"
android:ellipsize="end"
android:singleLine="true"
android:text="DuckDuckGo"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -146,14 +153,15 @@
android:id="@+id/ll_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:padding="8dp"
android:layout_marginHorizontal="6dp"
android:paddingVertical="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_1">
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_yandex"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -165,7 +173,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:src="@mipmap/x_google"
android:src="@mipmap/x_yandex"
tools:ignore="ContentDescription" />
<TextView
......@@ -173,7 +181,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="Google"
android:text="Yandex"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -182,7 +190,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/ll_baidu"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
......@@ -194,7 +203,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:src="@mipmap/x_google"
android:src="@mipmap/x_baidu"
tools:ignore="ContentDescription" />
<TextView
......@@ -202,7 +211,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="Google"
android:text="Baidu"
android:textColor="@color/black"
android:textSize="14sp"
tools:ignore="HardcodedText" />
......@@ -211,11 +220,12 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="invisible">
<ImageView
android:layout_width="wrap_content"
......@@ -240,11 +250,12 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="70dp"
android:layout_height="90dp"
android:layout_marginHorizontal="6dp"
android:background="@drawable/bg_search_engine_selector"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="invisible">
<ImageView
android:layout_width="wrap_content"
......@@ -275,6 +286,7 @@
android:id="@+id/tv_cancel"
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginVertical="15dp"
android:background="@drawable/bg_e1e4e9_25"
android:gravity="center"
android:text="Cancel"
......@@ -290,6 +302,7 @@
android:id="@+id/tv_confirm"
android:layout_width="150dp"
android:layout_height="50dp"
android:layout_marginVertical="15dp"
android:background="@drawable/bg_0571ed_25"
android:gravity="center"
android:text="Confirm"
......
app/src/main/res/layout/fragment_home.xml
View file @ 7158f089
......@@ -90,25 +90,40 @@
android:gravity="center"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fl_search_engine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="?android:attr/selectableItemBackground"
android:padding="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription">
<ImageView
android:id="@+id/iv_search_yingqing"
android:id="@+id/iv_search_engine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:src="@mipmap/google_search"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/xuanze"
app:layout_constraintBottom_toBottomOf="@id/iv_search_yingqing"
app:layout_constraintEnd_toEndOf="@id/iv_search_yingqing"
app:layout_constraintBottom_toBottomOf="@id/fl_search_engine"
app:layout_constraintEnd_toEndOf="@id/fl_search_engine"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout>
<EditText
android:id="@+id/edit_web"
android:layout_width="0dp"
......@@ -121,20 +136,28 @@
android:singleLine="true"
android:textColorHint="#858587"
android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@id/iv_scan"
app:layout_constraintStart_toEndOf="@id/iv_search_yingqing"
app:layout_constraintEnd_toStartOf="@id/fl_scan"
app:layout_constraintStart_toEndOf="@id/fl_search_engine"
tools:ignore="Autofill,HardcodedText,TextFields" />
<ImageView
android:id="@+id/iv_scan"
<FrameLayout
android:id="@+id/fl_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:src="@mipmap/saoyisao"
android:layout_margin="10dp"
android:padding="5dp"
android:background="?android:attr/selectableItemBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/saoyisao" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......
app/src/main/res/values/dimens.xml 0 → 100644
View file @ 7158f089
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dp_300">300dp</dimen>
<dimen name="dp_345">345dp</dimen>
</resources>
\ No newline at end of file
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