Commit 32306ef5 authored by songjianyu's avatar songjianyu

[调整] 闪屏页,首页的ui,修改图标

parent c058ff36
Pipeline #1740 failed with stages
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/logo" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/logo" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.AppTheme" android:theme="@style/Theme.AppTheme"
tools:targetApi="31"> tools:targetApi="31">
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</activity> </activity>
<activity <activity
android:name=".ui.main.MainActivity" android:name=".ui.main.MainActivity"
android:exported="false" android:exported="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity <activity
......
...@@ -26,8 +26,8 @@ import kotlin.random.Random ...@@ -26,8 +26,8 @@ import kotlin.random.Random
*/ */
object NotificationUiUtil { object NotificationUiUtil {
private val CHANNEL_ID = "dumpster cleaner Channel" private val CHANNEL_ID = "Super Easy Clean Channel"
private val CHANNEL_NAME = "dumpster cleaner Channel NAME" private val CHANNEL_NAME = "Super Easy Clean Channel NAME"
/** /**
* 这部分准备UI的代码不能放入IO * 这部分准备UI的代码不能放入IO
...@@ -65,7 +65,7 @@ object NotificationUiUtil { ...@@ -65,7 +65,7 @@ object NotificationUiUtil {
} }
sendBean.bigRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_large).apply { sendBean.bigRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_large).apply {
setTextViewText(R.id.tv1, text) setTextViewText(R.id.tv1, text)
setImageViewResource(R.id.ivIcon, R.drawable.icon_large_file_cleanner) setImageViewResource(R.id.ivIcon, R.drawable.icon_files)
} }
} }
...@@ -76,7 +76,7 @@ object NotificationUiUtil { ...@@ -76,7 +76,7 @@ object NotificationUiUtil {
} }
sendBean.bigRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_large).apply { sendBean.bigRemoteViews = RemoteViews(context.packageName, R.layout.notification_common_large).apply {
setTextViewText(R.id.tv1, text) setTextViewText(R.id.tv1, text)
setImageViewResource(R.id.ivIcon, R.drawable.icon_duplicate_photos) setImageViewResource(R.id.ivIcon, R.drawable.icon_screenshots)
} }
} }
...@@ -129,7 +129,7 @@ object NotificationUiUtil { ...@@ -129,7 +129,7 @@ object NotificationUiUtil {
//设置状态栏内的小图标 //设置状态栏内的小图标
val smallIcon = IconCompat.createFromIcon( val smallIcon = IconCompat.createFromIcon(
context, Icon.createWithResource( context, Icon.createWithResource(
context, R.drawable.log_svg context, R.mipmap.ic_launcher
) )
) )
smallIcon?.let { smallIcon?.let {
......
package com.base.appzxhy.ui.dialog
import android.app.Activity
import android.app.Dialog
import android.view.Gravity
import android.widget.LinearLayout
import androidx.appcompat.app.AppCompatDialog
import com.applovin.impl.cl
import com.base.appzxhy.R
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.DialogExitBinding
class ExitDialog(val activity: Activity) {
val dialog = AppCompatDialog(activity)
val bind = DialogExitBinding.inflate(activity.layoutInflater)
var exit: (() -> Unit)? = null
var clean: (() -> Unit)? = null
var ad: (() -> Unit)? = null
fun init() {
dialog.setContentView(bind.root)
dialog.setCanceledOnTouchOutside(true)
val params = dialog.window?.attributes
dialog.window?.attributes = params
params?.width = LinearLayout.LayoutParams.MATCH_PARENT
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
initView()
}
private fun initView() {
bind.ivClose.setOnClickListener {
dialog.dismiss()
}
bind.tvExit.setOnClickListener {
dialog.dismiss()
activity.finish()
}
bind.tvClean.setOnClickListener {
dialog.dismiss()
clean?.invoke()
}
}
fun show() {
dialog.show()
AdsMgr.showNative(bind.flAd, R.layout.layout_admob_native_custom_r16)
}
fun hide() {
dialog.hide()
}
}
\ No newline at end of file
...@@ -2,6 +2,7 @@ package com.base.appzxhy.ui.dialog ...@@ -2,6 +2,7 @@ package com.base.appzxhy.ui.dialog
import android.app.Activity import android.app.Activity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.widget.LinearLayout
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.base.appzxhy.R import com.base.appzxhy.R
import com.base.appzxhy.business.ads.AdsMgr import com.base.appzxhy.business.ads.AdsMgr
...@@ -26,7 +27,7 @@ class FunctionBackDialog( ...@@ -26,7 +27,7 @@ class FunctionBackDialog(
dialog.setCanceledOnTouchOutside(true) dialog.setCanceledOnTouchOutside(true)
val params = dialog.window?.attributes val params = dialog.window?.attributes
// params?.width = LinearLayout.LayoutParams.MATCH_PARENT params?.width = LinearLayout.LayoutParams.MATCH_PARENT
// params?.height = LinearLayout.LayoutParams.WRAP_CONTENT // params?.height = LinearLayout.LayoutParams.WRAP_CONTENT
// params?.gravity = Gravity.BOTTOM // params?.gravity = Gravity.BOTTOM
dialog.window?.attributes = params dialog.window?.attributes = params
...@@ -70,7 +71,7 @@ class FunctionBackDialog( ...@@ -70,7 +71,7 @@ class FunctionBackDialog(
} }
dialog.show() dialog.show()
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom) AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom_r16)
binding.ivCancel.setOnClickListener { binding.ivCancel.setOnClickListener {
dialog.dismiss() dialog.dismiss()
......
package com.base.appzxhy.ui.main
import android.graphics.Color
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.text.SpannedString
import android.text.style.ForegroundColorSpan
import androidx.lifecycle.lifecycleScope
import com.base.appzxhy.base.BaseFragment
import com.base.appzxhy.databinding.FragmentHome3Binding
import com.base.appzxhy.utils.Utils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
class Home3Fragment : BaseFragment<FragmentHome3Binding>(FragmentHome3Binding::inflate) {
override fun initView() {
super.initView()
getData()
}
fun getData() {
lifecycleScope.launch(Dispatchers.IO) {
val totalStorageSize = async { Utils.getTotalStorageSize() }.await()
val availableStorageSize = async { Utils.getAvailableStorageSize() }.await()
val usedStorageSize = totalStorageSize - availableStorageSize
val totalStorage = Utils.getSizeFormat(totalStorageSize)
val usedStorage = Utils.getSizeFormat(usedStorageSize)
val percent = (usedStorageSize * 100 / totalStorageSize).toInt()
launch(Dispatchers.Main) {
val spanned = SpannableStringBuilder(usedStorage + " / $totalStorage")
spanned.setSpan(
ForegroundColorSpan(Color.parseColor("#F22525")),
0,
usedStorage.length,
Spanned.SPAN_EXCLUSIVE_INCLUSIVE
)
binding.tvUseSpace.text = spanned
binding.circleProgress.setProgressWithAnimation(percent.toFloat(), 1000)
}
}
}
}
\ No newline at end of file
...@@ -4,6 +4,7 @@ import android.graphics.Color ...@@ -4,6 +4,7 @@ import android.graphics.Color
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.activity.enableEdgeToEdge
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
...@@ -17,6 +18,7 @@ import com.base.appzxhy.bean.HomeTabUIBean ...@@ -17,6 +18,7 @@ import com.base.appzxhy.bean.HomeTabUIBean
import com.base.appzxhy.business.ads.AdsMgr import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.ActivityMainBinding import com.base.appzxhy.databinding.ActivityMainBinding
import com.base.appzxhy.databinding.ItemHomeTabBinding import com.base.appzxhy.databinding.ItemHomeTabBinding
import com.base.appzxhy.ui.dialog.ExitDialog
import com.base.appzxhy.ui.dialog.StoragePermissionDialog import com.base.appzxhy.ui.dialog.StoragePermissionDialog
import com.base.appzxhy.ui.recyclebin.RecycleBinFragment import com.base.appzxhy.ui.recyclebin.RecycleBinFragment
import com.base.appzxhy.utils.PermissionUtils.requestStoragePermission import com.base.appzxhy.utils.PermissionUtils.requestStoragePermission
...@@ -29,8 +31,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -29,8 +31,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
val viewModel by lazy { ViewModelProvider(this)[MainViewModel::class.java] } val viewModel by lazy { ViewModelProvider(this)[MainViewModel::class.java] }
lateinit var exitDialog: ExitDialog
private val fragmentList = listOf( private val fragmentList = listOf(
Home2Fragment(), // Home2Fragment(),
Home3Fragment(),
RecoveryFragment(), RecoveryFragment(),
RecycleBinFragment() RecycleBinFragment()
) )
...@@ -50,6 +54,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -50,6 +54,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
initViewPager2() initViewPager2()
initDialogFlow() initDialogFlow()
AdsMgr.showBanner(binding.flBanner, false) AdsMgr.showBanner(binding.flBanner, false)
exitDialog= ExitDialog(this)
exitDialog.init()
} }
private fun initDialogFlow() { private fun initDialogFlow() {
...@@ -77,6 +83,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -77,6 +83,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
binding.viewPager2.adapter = viewPagerAdapter binding.viewPager2.adapter = viewPagerAdapter
binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
if (position==0){
setStatusBarColor(getColor(R.color.colorPrimary))
}else{
setStatusBarColor(getColor(R.color.transparent))
}
val defaultTab = binding.tabLayout.getTabAt(position) val defaultTab = binding.tabLayout.getTabAt(position)
defaultTab?.select() defaultTab?.select()
defaultTab?.setSelected() defaultTab?.setSelected()
...@@ -143,4 +154,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -143,4 +154,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
viewModel.refreshRecycleBin() viewModel.refreshRecycleBin()
} }
override fun handleBackCallBack() {
exitDialog.show()
}
} }
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="16dp" />
<solid android:color="@color/color_F2F2F2" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F2F5F6" />
<corners android:radius="8dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffff" />
<corners android:radius="24dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="30dp">
<color android:color="@color/colorPrimary" />
</item>
<item
android:end="-100dp"
android:gravity="bottom"
android:start="-100dp">
<shape android:shape="oval">
<solid android:color="@color/colorPrimary" />
<corners
android:bottomLeftRadius="110dp"
android:bottomRightRadius="110dp" />
<size android:height="180dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:endColor="#FF3D7AF7" <solid android:color="@color/colorPrimary" />
android:startColor="#FF6AB4FF" />
<corners android:radius="64dp" /> <corners android:radius="64dp" />
</shape> </shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimary" />
<corners android:radius="8dp" />
</shape>
\ No newline at end of file
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
android:background="@drawable/bg_splash_button" android:background="@drawable/bg_primary_r64"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="16dp" android:padding="16dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/logo" android:src="@mipmap/ic_launcher"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@mipmap/logo" /> android:src="@mipmap/ic_launcher" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.2" /> app:layout_constraintGuide_percent="0.2" />
<androidx.appcompat.widget.AppCompatImageView <androidx.constraintlayout.utils.widget.ImageFilterView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
android:layout_width="@dimen/dp_150" android:layout_width="@dimen/dp_150"
android:layout_height="@dimen/dp_150" android:layout_height="@dimen/dp_150"
android:src="@mipmap/logo" android:src="@mipmap/ic_launcher"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/guide_line" app:layout_constraintTop_toBottomOf="@id/guide_line"
app:round="24dp"
tools:ignore="ImageContrastCheck" /> tools:ignore="ImageContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="@color/black" android:textColor="@color/fontsBlack"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="@string/consent_required" android:text="@string/consent_required"
android:textColor="#838383" android:textColor="@color/fontsGray83"
android:textSize="16sp" android:textSize="16sp"
tools:ignore="TextContrastCheck" /> tools:ignore="TextContrastCheck" />
...@@ -101,7 +102,7 @@ ...@@ -101,7 +102,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="36dp" android:layout_marginHorizontal="36dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/bg_splash_button" android:background="@drawable/bg_primary_r64"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:text="@string/start" android:text="@string/start"
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="40dp"
android:background="@drawable/bj"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.utils.widget.ImageFilterView
android:id="@+id/iv_close"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_margin="21dp"
android:background="@color/color_F2F2F2"
android:padding="5dp"
android:src="@drawable/icon_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundPercent="50" />
<TextView
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:text="@string/Please_wait_a_moment"
android:textColor="@color/fontsBlack"
android:textSize="@dimen/sp_20"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/iv_icon"
app:layout_constraintEnd_toStartOf="@id/iv_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/iv_icon" />
<androidx.constraintlayout.utils.widget.ImageFilterView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:layout_marginEnd="30dp"
android:src="@mipmap/ic_launcher"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:round="10dp" />
<TextView
android:id="@+id/tv_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30dp"
android:layout_marginTop="17dp"
android:text="@string/exit_content"
android:textColor="@color/fontsGray66"
android:textSize="@dimen/sp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_icon" />
<TextView
android:id="@+id/tv_exit"
android:layout_width="107dp"
android:layout_height="wrap_content"
android:layout_marginStart="17dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_f2f5f6_r8"
android:gravity="center"
android:paddingVertical="10dp"
android:text="@string/Exit"
android:textColor="@color/fontsGray85"
android:textSize="@dimen/sp_18"
app:layout_constraintEnd_toStartOf="@id/tv_clean"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_content" />
<TextView
android:id="@+id/tv_clean"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="17dp"
android:layout_marginBottom="32dp"
android:background="@drawable/bg_primary_r8"
android:gravity="center"
android:paddingVertical="10dp"
android:text="@string/clean_now"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_exit"
app:layout_constraintTop_toBottomOf="@id/tv_content" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="40dp"
android:layout_marginTop="8dp"
android:background="@drawable/bg_ffffff_24"
android:paddingVertical="12dp"
android:paddingHorizontal="11dp"
app:layout_constraintTop_toBottomOf="@id/cl_content">
<com.base.appzxhy.business.ads.NativeParentView
android:id="@+id/flAd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/zhanwei1" />
</com.base.appzxhy.business.ads.NativeParentView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -9,19 +9,22 @@ ...@@ -9,19 +9,22 @@
android:id="@+id/cl_exit" android:id="@+id/cl_exit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="40dp"
android:background="@drawable/white_background_24" android:background="@drawable/white_background_24"
android:paddingBottom="30dp" android:paddingBottom="30dp"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView <androidx.constraintlayout.utils.widget.ImageFilterView
android:id="@+id/ivCancel" android:id="@+id/ivCancel"
android:layout_width="wrap_content" android:layout_width="26dp"
android:layout_height="wrap_content" android:layout_height="26dp"
android:layout_marginTop="20dp" android:layout_margin="21dp"
android:layout_marginEnd="20dp" android:background="@color/color_F2F2F2"
android:padding="5dp"
android:src="@drawable/icon_close" android:src="@drawable/icon_close"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:roundPercent="50" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
...@@ -32,7 +35,7 @@ ...@@ -32,7 +35,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:lineSpacingExtra="4dp" android:lineSpacingExtra="4dp"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/color_1a1a1a" android:textColor="@color/fontsBlack"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -61,13 +64,12 @@ ...@@ -61,13 +64,12 @@
android:layout_marginStart="28dp" android:layout_marginStart="28dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:background="@drawable/bg_enable_no_50" android:background="@drawable/bg_f2f5f6_r8"
android:paddingVertical="10dp" android:paddingVertical="10dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="#85909D"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/tv_sure" app:layout_constraintEnd_toStartOf="@id/tv_sure"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_content" /> app:layout_constraintTop_toBottomOf="@id/tv_content" />
...@@ -79,7 +81,7 @@ ...@@ -79,7 +81,7 @@
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:background="@drawable/bg_btn_50" android:background="@drawable/bg_primary_r8"
android:paddingVertical="10dp" android:paddingVertical="10dp"
android:text="@string/sure" android:text="@string/sure"
android:textAlignment="center" android:textAlignment="center"
...@@ -91,19 +93,27 @@ ...@@ -91,19 +93,27 @@
app:layout_constraintTop_toBottomOf="@id/tv_content" /> app:layout_constraintTop_toBottomOf="@id/tv_content" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.base.appzxhy.business.ads.NativeParentView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/flAd"
app:layout_constraintTop_toBottomOf="@id/cl_exit"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="40dp"
android:layout_marginTop="10dp"> android:layout_marginTop="8dp"
android:background="@drawable/bg_ffffff_24"
android:paddingHorizontal="11dp"
android:paddingVertical="12dp"
app:layout_constraintTop_toBottomOf="@id/cl_exit">
<androidx.appcompat.widget.AppCompatImageView <com.base.appzxhy.business.ads.NativeParentView
android:id="@+id/flAd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/zhanwei1" /> app:layout_constraintBottom_toBottomOf="parent">
</com.base.appzxhy.business.ads.NativeParentView>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/zhanwei1" />
</com.base.appzxhy.business.ads.NativeParentView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
android:layout_marginHorizontal="80dp" android:layout_marginHorizontal="80dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="28dp" android:layout_marginBottom="28dp"
android:background="@drawable/bg_splash_button" android:background="@drawable/bg_primary_r64"
android:gravity="center" android:gravity="center"
android:text="Next" android:text="Next"
android:textColor="@color/white" android:textColor="@color/white"
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent">
<View
android:id="@+id/top_bg"
android:layout_width="match_parent"
android:layout_height="505dp"
android:background="@drawable/bg_home"
app:layout_constrainedHeight="true"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/colorPrimary"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="@dimen/sp_19"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />
<com.mikhaellopez.circularprogressbar.CircularProgressBar
android:id="@+id/circleProgress"
android:layout_width="247dp"
android:layout_height="247dp"
android:layout_marginTop="68dp"
android:background="@drawable/bg_oval_ffffff"
app:cpb_background_progressbar_color="#51D1F5"
app:cpb_background_progressbar_width="29dp"
app:cpb_progress_direction="to_right"
app:cpb_progress_max="100"
app:cpb_progressbar_color="#AAF7FF"
app:cpb_progressbar_width="29dp"
app:cpb_round_border="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:cpb_progress="20" />
<ImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="61dp"
android:layout_marginBottom="272dp"
android:src="@drawable/icon_home_clean"
app:layout_constraintBottom_toBottomOf="@id/top_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/circleProgress" />
<TextView
android:id="@+id/tv_use_space"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textSize="@dimen/sp_19"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_icon"
tools:text="50GB/100GB" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:text="@string/Used_Space"
android:textColor="#999999"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_use_space" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
android:id="@+id/iv_icon" android:id="@+id/iv_icon"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:src="@mipmap/logo" android:src="@mipmap/ic_launcher"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
<com.google.android.gms.ads.nativead.NativeAdView 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:id="@+id/nativeAdView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="#F0F0F0"
android:baselineAligned="false"
android:paddingHorizontal="9dp"
android:paddingVertical="8dp">
<com.google.android.gms.ads.nativead.MediaView
android:id="@+id/ad_media"
android:layout_width="108dp"
android:layout_height="77dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="8dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/ad_headline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/black"
android:textSize="14sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_ad_pop" />
<TextView
android:id="@+id/ad_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="10dp"
android:ellipsize="end"
android:maxLines="2"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="5dp">
<ImageView
android:id="@+id/ad_app_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
tools:ignore="ContentDescription" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action"
android:layout_width="match_parent"
android:layout_height="26dp"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="12dp"
android:background="@drawable/bg_btn_ad"
android:gravity="center"
android:textColor="@color/white"
android:textSize="15sp"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck,VisualLintButtonSize" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.gms.ads.nativead.NativeAdView>
\ No newline at end of file
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
android:id="@+id/ivIcon" android:id="@+id/ivIcon"
android:layout_width="@dimen/dp_40" android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:src="@mipmap/logo" android:src="@mipmap/ic_launcher"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" /> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground" /> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" /> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground" /> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
...@@ -3,8 +3,14 @@ ...@@ -3,8 +3,14 @@
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="colorPrimary">#328EF6</color> <color name="colorPrimary">#25C5F2</color>
<color name="colorDisEnable">#FF7DB9FF</color> <color name="colorDisEnable">#FF7DB9FF</color>
<color name="color_F2F2F2">#F2F2F2</color>
<color name="fontsBlack">#1A1A1A</color>
<color name="fontsGray83">#838383</color>
<color name="fontsGray66">#666666</color>
<color name="fontsGray85">#85909D</color>
<color name="color_66000000">#66000000</color> <color name="color_66000000">#66000000</color>
<color name="color_00fac8">#00FAC8</color> <color name="color_00fac8">#00FAC8</color>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<dimen name="dp_90">90dp</dimen> <dimen name="dp_90">90dp</dimen>
<dimen name="dp_45">45dp</dimen> <dimen name="dp_45">45dp</dimen>
<dimen name="sp_18">18sp</dimen> <dimen name="sp_18">18sp</dimen>
<dimen name="sp_19">19sp</dimen>
<dimen name="dp_4">4dp</dimen> <dimen name="dp_4">4dp</dimen>
<dimen name="dp_60">60dp</dimen> <dimen name="dp_60">60dp</dimen>
<dimen name="sp_14">14sp</dimen> <dimen name="sp_14">14sp</dimen>
......
<resources> <resources>
<string name="app_name">Dumpster Cleaner</string> <string name="app_name">Super Easy Clean</string>
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="facebook_app_id">4512448902756291</string> <string name="facebook_app_id">4512448902756291</string>
...@@ -143,4 +143,8 @@ Please rest assured that we will handle your information in strict accordance wi ...@@ -143,4 +143,8 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="exit_screenshot_cleaner_content">Exit Screenshot Clean? Undeleted screenshots might be using space.</string> <string name="exit_screenshot_cleaner_content">Exit Screenshot Clean? Undeleted screenshots might be using space.</string>
<string name="exit_similar_photos">Exit Similar Photos</string> <string name="exit_similar_photos">Exit Similar Photos</string>
<string name="exit_similar_photos_content">Exit Similar Photos? Unmoved similar photos might be occupying space.</string> <string name="exit_similar_photos_content">Exit Similar Photos? Unmoved similar photos might be occupying space.</string>
<string name="Please_wait_a_moment">Please wait a moment</string>
<string name="exit_content">Are you sure you want to quit without trying to clean up the garbage again?</string>
<string name="Exit">Exit</string>
<string name="Used_Space">Used Space</string>
</resources> </resources>
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