Skip to content

B
Browser White
Commit 21acec49 authored by wanglei's avatar wanglei
Browse files
Options

...

parent 83bdb3aa
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 30 deletions
app/src/main/java/com/base/browserwhite/ui/activity/result/ResultActivity.kt
View file @ 21acec49
......@@ -2,6 +2,7 @@ package com.base.browserwhite.ui.activity.result
import android.annotation.SuppressLint
import android.graphics.Color
import androidx.activity.addCallback
import com.base.browserwhite.bean.ConstObject.JUNK_CLEANER
import com.base.browserwhite.databinding.ActivityResultBinding
import com.base.browserwhite.ui.activity.BaseActivity
......@@ -36,5 +37,15 @@ class ResultActivity : BaseActivity<ActivityResultBinding>() {
}
}
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
finishToMain()
}
binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
}
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ui/fragment/HomeFragment.kt
View file @ 21acec49
package com.base.browserwhite.ui.fragment
import android.content.Intent
import android.view.View
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.ItemTouchHelper
......@@ -118,36 +117,42 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
}
binding.flSearchEngine.setOnClickListener {
requireContext().showSearchEngineDialog { website ->
when (website) {
GOOGLE -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_google)
}
BING -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_bing)
}
YAHOO -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_yahoo)
}
DUCKDUCKGO -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_xuckd)
}
YANDEX -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_yandex)
}
BAIDU -> {
binding.ivSearchEngine.setImageResource(R.mipmap.h_s_baidu)
}
}
}
// requireContext().showSearchEngineDialog { website ->
// when (website) {
// GOOGLE -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_google)
// }
//
// BING -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_bing)
// }
//
// YAHOO -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_yahoo)
// }
//
// DUCKDUCKGO -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_xuckd)
// }
//
// YANDEX -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_yandex)
// }
//
// BAIDU -> {
// binding.ivSearchEngine.setImageResource(R.mipmap.h_s_baidu)
// }
//
// }
// }
}
// binding.editWeb.setOnEditorActionListener { v, actionId, event ->
// if (actionId == EditorInfo.IME_ACTION_DONE){
// return true; // 返回true表示事件已处理
// }
// }
binding.flScan.setOnClickListener {
requireContext().startActivity(Intent(requireContext(), ScanQRCActivity::class.java))
}
......
app/src/main/res/drawable/bg_ffffff_tlf15.xml 0 → 100644
View file @ 21acec49
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<corners
android:topLeftRadius="15dp"
android:topRightRadius="15dp" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_result.xml
View file @ 21acec49
......@@ -67,19 +67,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="50dp"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/card"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_wancheng"
tools:text="Cleaned up 108.7 KB" />
<androidx.cardview.widget.CardView
android:id="@+id/card"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="40dp"
android:visibility="gone"
app:cardCornerRadius="8dp"
app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -156,4 +159,30 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="-30dp"
android:background="@drawable/bg_ffffff_tlf15"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="30dp"
android:text="Recommended news"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_news"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="16dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_home.xml
View file @ 21acec49
......@@ -136,6 +136,7 @@
android:background="@null"
android:gravity="center_vertical"
android:hint="Search or enter website address"
android:imeOptions="actionDone"
android:paddingHorizontal="15dp"
android:singleLine="true"
android:textColorHint="#858587"
......
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