Commit bf1c4230 authored by wanglei's avatar wanglei

...

parent 86b85cda
...@@ -2,6 +2,7 @@ package com.base.datarecovery.activity ...@@ -2,6 +2,7 @@ package com.base.datarecovery.activity
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import androidx.activity.addCallback
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
...@@ -12,6 +13,7 @@ import com.base.datarecovery.databinding.ActivityMainBinding ...@@ -12,6 +13,7 @@ import com.base.datarecovery.databinding.ActivityMainBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.help.PermissionHelp.checkStorePermission import com.base.datarecovery.help.PermissionHelp.checkStorePermission
import com.base.datarecovery.utils.BarUtils import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.view.DialogViews.showExitDialog
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import com.base.datarecovery.view.PermissionDialog.showPermissionBottomSheet import com.base.datarecovery.view.PermissionDialog.showPermissionBottomSheet
import com.base.datarecovery.view.RateStarPop import com.base.datarecovery.view.RateStarPop
...@@ -35,6 +37,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -35,6 +37,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
// showExitFunctionDialog() // showExitFunctionDialog()
} }
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
showExitDialog()
}
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (!checkStorePermission()) { if (!checkStorePermission()) {
......
...@@ -114,7 +114,7 @@ object AdMaxNativeUtils { ...@@ -114,7 +114,7 @@ object AdMaxNativeUtils {
parent.isVisible = true parent.isVisible = true
nativeAdLoader.render(adView, nativeAd) nativeAdLoader.render(adView, nativeAd)
parent.addView(adView) parent.addView(adView)
nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd", activity) } nativeAd?.let { AdMaxEvent.showAd(it, "nativeAd") }
AdDisplayUtils.getInstance().incrementAdDisplayCount() AdDisplayUtils.getInstance().incrementAdDisplayCount()
} }
} }
......
...@@ -5,6 +5,7 @@ import android.app.Activity ...@@ -5,6 +5,7 @@ import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.view.Gravity import android.view.Gravity
...@@ -15,6 +16,7 @@ import android.widget.ImageView ...@@ -15,6 +16,7 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.lifecycle.LifecycleCoroutineScope import androidx.lifecycle.LifecycleCoroutineScope
import com.base.datarecovery.R import com.base.datarecovery.R
import com.base.datarecovery.activity.junkclean.ScanJunkActivity
import com.base.datarecovery.ads.AdmobMaxHelper import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showInterAdSp import com.base.datarecovery.ads.admob.AdmobInterstitialUtils.showInterAdSp
import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER
...@@ -291,7 +293,7 @@ object DialogViews { ...@@ -291,7 +293,7 @@ object DialogViews {
} }
} }
fun Context.showExitDialog() { fun Activity.showExitDialog() {
val dialog = BottomSheetDialog(this) val dialog = BottomSheetDialog(this)
val binding = DialogExitAppBinding.inflate(LayoutInflater.from(this)) val binding = DialogExitAppBinding.inflate(LayoutInflater.from(this))
dialog.setContentView(binding.root) dialog.setContentView(binding.root)
...@@ -299,8 +301,16 @@ object DialogViews { ...@@ -299,8 +301,16 @@ object DialogViews {
dialog.setCancelable(false) dialog.setCancelable(false)
dialog.show() dialog.show()
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
val parentView = binding.root.parent as View val parentView = binding.root.parent as View
BottomSheetBehavior.from(parentView).state = BottomSheetBehavior.STATE_EXPANDED BottomSheetBehavior.from(parentView).state = BottomSheetBehavior.STATE_EXPANDED
binding.tvY.setOnClickListener {
startActivity(Intent(this, ScanJunkActivity::class.java))
}
binding.tvExit.setOnClickListener {
this.finish()
}
} }
} }
...@@ -3,16 +3,9 @@ ...@@ -3,16 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="@android:color/transparent">
<ImageView
android:id="@+id/iv"
android:layout_width="95dp"
android:layout_height="95dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="-30dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:id="@+id/ll" android:id="@+id/ll"
...@@ -62,10 +55,26 @@ ...@@ -62,10 +55,26 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<TextView <TextView
android:textColor="#999999" android:id="@+id/tv_exit"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal"
android:layout_marginVertical="15dp"
android:gravity="center"
android:text="Exit"
android:textColor="#999999"
android:textSize="17sp"
tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
<ImageView
android:id="@+id/iv"
android:layout_width="95dp"
android:layout_height="95dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="-30dp"
android:src="@mipmap/junk_exit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ 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