Skip to content

S
scanqrwhitecopy
Commit 9287ace5 authored by wanglei's avatar wanglei
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a53f9c44 9ea06a8c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 318 additions and 255 deletions
app/src/main/java/com/base/scanqrclear/fcm/notification/NotificationUiUtil.kt
View file @ 9287ace5
......@@ -120,7 +120,7 @@ object NotificationUiUtil {
smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.clean_junk_pop))
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.clean_junk_pop))
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_junk_scan1)
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_junk_scan)
sendBean.bigRemoteViews = bigRemoteViews
sendBean.smallRemoteViews = smallRemoteViews
......@@ -131,7 +131,7 @@ object NotificationUiUtil {
smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.app_process_pop))
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.app_process_pop))
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_app_process_1)
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_app_t)
sendBean.bigRemoteViews = bigRemoteViews
sendBean.smallRemoteViews = smallRemoteViews
......@@ -142,7 +142,7 @@ object NotificationUiUtil {
smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.whatsapp_pop))
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.whatsapp_pop))
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_whatsapp_1)
bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_whatsapp_clean_t)
sendBean.bigRemoteViews = bigRemoteViews
sendBean.smallRemoteViews = smallRemoteViews
......
app/src/main/java/com/base/scanqrclear/luma/AppProcessActivity.kt
View file @ 9287ace5
......@@ -17,6 +17,7 @@ import com.base.scanqrclear.R
import com.base.scanqrclear.bean.AppInfoBean
import com.base.scanqrclear.databinding.ActivityAppProcessBinding
import com.base.scanqrclear.luma.DialogHelps.showExitDialog
import com.base.scanqrclear.luma.StatusBarHelps.immersiveStatusBar
import com.base.scanqrclear.utils.AnimationHelps
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
......@@ -31,7 +32,7 @@ class AppProcessActivity : BaseActivity2() {
}
}
private val binding by lazy {
private val binding by lazy(LazyThreadSafetyMode.NONE) {
ActivityAppProcessBinding.inflate(layoutInflater)
}
......@@ -44,6 +45,7 @@ class AppProcessActivity : BaseActivity2() {
initData()
showAnimationAd(LottieType.APP_PROCESS) {
AnimationHelps.progress(binding.pbProcess, end = binding.pbProcess.progress)
immersiveStatusBar(this, getColor(R.color.white),true)
}
onBackPressedDispatcher.addCallback {
val title = getString(R.string.exit_app_process)
......
app/src/main/java/com/base/scanqrclear/luma/BaseActivity2.kt
View file @ 9287ace5
......@@ -74,7 +74,7 @@ open class BaseActivity2 : AppCompatActivity() {
}
protected open fun immersive() {
StatusBarHelps.immersive(this, getColor(R.color.color_ffb764))
StatusBarHelps.immersive(this, getColor(R.color.color_8eb0ff))
}
protected fun showAnimationAd(
......@@ -88,7 +88,7 @@ open class BaseActivity2 : AppCompatActivity() {
val animationView = findViewById<ConstraintLayout>(R.id.animation)
animationView.setOnClickListener { }
if (isShowAnimation) {
StatusBarHelps.immersive(this, getColor(R.color.color_ffb764))
StatusBarHelps.immersive(this, getColor(R.color.color_8eb0ff))
showAnimation(animationView, lottieType, complete)
} else {
complete?.invoke()
......
app/src/main/java/com/base/scanqrclear/luma/CleanDetailAdapter.kt
View file @ 9287ace5
......@@ -79,6 +79,6 @@ class CleanDetailAdapter(
}
private fun setSelection(imageView: ImageView, item: FileBean) {
imageView.setImageResource(if (item.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n)
imageView.setImageResource(if (item.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
}
}
\ No newline at end of file
app/src/main/java/com/base/scanqrclear/luma/CleanJunkActivity.kt
View file @ 9287ace5
......@@ -33,7 +33,7 @@ class CleanJunkActivity : BaseActivity2() {
}
}
private val binding by lazy {
private val binding by lazy(LazyThreadSafetyMode.NONE) {
ActivityCleanJunkBinding.inflate(layoutInflater)
}
......
app/src/main/java/com/base/scanqrclear/luma/CleanJunkAdapter.kt
View file @ 9287ace5
......@@ -73,7 +73,7 @@ class CleanJunkAdapter(
holder.binding.tvLength.text = Utils.getSize(data.length)
holder.binding.ivIcon.setImageResource(data.icon)
holder.binding.ivIndicator.setImageResource(if (expand) R.mipmap.icon_up_setting else R.mipmap.icon_down_setting)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yixuan_s else R.mipmap.icon_yixuan_n)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.binding.clItem.setBackgroundResource(if (expand && child[groupPosition].isNotEmpty()) R.drawable.white_background_top else R.drawable.white_background)
holder.binding.ivSelect.setOnClickListener {
data.isSelected = !data.isSelected
......@@ -109,7 +109,7 @@ class CleanJunkAdapter(
val groupData = group[groupPosition]
holder.binding.tvName.text = data.name
holder.binding.tvLength.text = Utils.getSize(data.length)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.itemView.setBackgroundResource(if (childPosition == child[groupPosition].size - 1) R.drawable.white_background_bottom else R.color.white)
holder.itemView.setOnClickListener {
data.isSelected = !data.isSelected
......
app/src/main/java/com/base/scanqrclear/luma/CleanResultActivity.kt
View file @ 9287ace5
......@@ -20,7 +20,7 @@ class CleanResultActivity : BaseActivity2() {
}
}
private val binding by lazy {
private val binding by lazy(LazyThreadSafetyMode.NONE) {
ActivityCleanResultBinding.inflate(layoutInflater)
}
......@@ -57,15 +57,15 @@ class CleanResultActivity : BaseActivity2() {
private fun getData(): List<FunctionBean> {
val list = mutableListOf<FunctionBean>().apply {
add(FunctionBean(R.mipmap.icon_junk_scan1, R.string.junk_scan, R.string.result_clean_junk, text = R.string.clean_now))
add(FunctionBean(R.mipmap.icon_junk_scan, R.string.junk_scan, R.string.result_clean_junk, text = R.string.clean_now))
// add(FunctionBean(R.mipmap.icon_battery_1, R.string.battery_info, R.string.result_battery_info, text = R.string.view))
add(FunctionBean(R.mipmap.icon_app_process_1, R.string.app_process, R.string.result_app_processes, text = R.string.view))
add(FunctionBean(R.mipmap.icon_app_t, R.string.app_process, R.string.result_app_processes, text = R.string.view))
// add(FunctionBean(R.mipmap.icon_large_1, R.string.large_files, R.string.result_large_file, text = R.string.clean_now))
// add(FunctionBean(R.mipmap.icon_image, R.string.image_compressor, R.string.result_photo_compression, text = R.string.compress))
add(FunctionBean(R.mipmap.icon_screenshot_1, R.string.screenshot_clean, R.string.result_screenshot_clean, text = R.string.clean_now))
add(FunctionBean(R.mipmap.icon_similar_1, R.string.similar_photos, R.string.result_similar_photos, text = R.string.clean_now))
add(FunctionBean(R.mipmap.icon_similar, R.string.similar_photos, R.string.result_similar_photos, text = R.string.clean_now))
// add(FunctionBean(R.mipmap.icon_app_1, R.string.app_manager, R.string.result_app_manager, text = R.string.view))
add(FunctionBean(R.mipmap.icon_whatsapp_1, R.string.whatsapp_clean, R.string.result_whatsapp_clean, text = R.string.clean_now))
add(FunctionBean(R.mipmap.icon_whatsapp_clean_t, R.string.whatsapp_clean, R.string.result_whatsapp_clean, text = R.string.clean_now))
}
val filteredList = list.filter { getString(it.name) != titleName }
......
app/src/main/java/com/base/scanqrclear/luma/ScreenshotCleanActivity.kt
View file @ 9287ace5
......@@ -92,8 +92,8 @@ class ScreenshotCleanActivity : BaseActivity2() {
}
private fun updateView(isSelection: Boolean) {
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4)
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_26 else R.drawable.btn_not_clickable)
val delete = getString(R.string.delete)
val text = if (total > 0) "${delete} (${Utils.getSize(total)})" else delete
binding.tvDelete.text = text
......
app/src/main/java/com/base/scanqrclear/luma/ScreenshotCleanAdapter.kt
View file @ 9287ace5
......@@ -104,10 +104,10 @@ class ScreenshotCleanAdapter(
.apply(options)
.into(holder.binding.ivImage)
holder.binding.tvSize.text = Utils.getSize(data.length)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.binding.clContainer.setOnClickListener {
data.isSelected = !data.isSelected
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
_selectionData.value = child.flatten()
}
}
......
app/src/main/java/com/base/scanqrclear/luma/SimilarPhotosActivity.kt
View file @ 9287ace5
......@@ -66,9 +66,8 @@ class SimilarPhotosActivity : BaseActivity2() {
binding.rvPhoto.layoutManager = LinearLayoutManager(this)
binding.flBack.setOnClickListener { backPressed() }
binding.ivSelect.setOnClickListener {
it.isSelected = !it.isSelected
setSelectAll(it.isSelected, adapter.list)
binding.ivSelect.setOnCheckedChangeListener { _, isChecked ->
setSelectAll(isChecked, adapter.list)
}
binding.tvDelete.setOnClickListener {
val list = getAllList(adapter.list).filter { it.isSelect }
......@@ -126,7 +125,6 @@ class SimilarPhotosActivity : BaseActivity2() {
}
}
adapter.submitList(list)
binding.ivSelect.setImageResource(if (isSelected) R.mipmap.icon_s else R.mipmap.icon_n)
val total = getAllList(adapter.list).filter { it.isSelect }.sumOf { it.size }
showSelection(isSelected && list.isNotEmpty(), total)
}
......@@ -144,7 +142,8 @@ class SimilarPhotosActivity : BaseActivity2() {
private fun showSelection(isSelection: Boolean, total: Long) {
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient else R.drawable.gradient_not_clickable)
val delete = getString(R.string.delete)
binding.tvDelete.text = if (total > 0) "${delete} (${Utils.getFormatSize(total)})" else delete
binding.tvDelete.text =
if (total > 0) "${delete} (${Utils.getFormatSize(total)})" else delete
}
private fun getAllList(beans: List<SimilarBean>): MutableList<SimilarBean> {
......
app/src/main/java/com/base/scanqrclear/luma/SimilarPhotosAdapter.kt
View file @ 9287ace5
......@@ -46,10 +46,10 @@ class SimilarPhotosAdapter(
.override(largePhotoWidth, largePhotoHeight)
.apply(options)
.into(holder.binding.ivFirstPhoto)
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_weixuanzhong_photo_off)
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n_photo)
holder.binding.ivFirstPhoto.setOnClickListener {
item.items[0].isSelect = !item.items[0].isSelect
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_weixuanzhong_photo_off)
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n_photo)
setItemClick(item, item.items[0], 0, holder)
}
......
app/src/main/java/com/base/scanqrclear/luma/SimilarPhotosChildAdapter.kt
View file @ 9287ace5
......@@ -32,10 +32,10 @@ class SimilarPhotosChildAdapter(
holder.binding.ivPhoto.layoutParams.width = imageWidth
holder.binding.ivPhoto.layoutParams.height = (imageWidth * 0.91).toInt()
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_yuan_n)
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n)
holder.itemView.setOnClickListener {
item.isSelect = !item.isSelect
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_yuan_n)
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n)
callback?.onClicked(it, position, item)
}
......
app/src/main/java/com/base/scanqrclear/luma/WhatsappCleanDetailActivity.kt
View file @ 9287ace5
......@@ -81,8 +81,8 @@ class WhatsappCleanDetailActivity : BaseActivity2() {
}
private fun updateView(isSelection: Boolean) {
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4)
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_26 else R.drawable.btn_not_clickable)
val value = Utils.getSizeArray(total)
binding.tvSize.text = value[0]
binding.tvUnit.text = value[1]
......
app/src/main/java/com/base/scanqrclear/ui/main/MainActivity.kt
View file @ 9287ace5
......@@ -126,7 +126,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
LogEx.logDebug(TAG, "actionId=$actionId")
when (actionId) {
ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> {
val defaultTab = binding.tabLayout.getTabAt(1)
val defaultTab = binding.tabLayout.getTabAt(0)
defaultTab?.select()
defaultTab?.setSelected()
}
......
app/src/main/res/drawable/app_process_progress.xml
View file @ 9287ace5
......@@ -2,14 +2,14 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="@color/color_ffcda0" />
<solid android:color="#EBEDFF" />
<corners android:radius="8dp" />
</shape>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape>
<solid android:color="@color/white" />
<solid android:color="@color/color_6473f8" />
<corners android:radius="8dp" />
</shape>
</scale>
......
app/src/main/res/drawable/gradient_not_clickable_4.xml → app/src/main/res/drawable/btn_not_clickable.xml
View file @ 9287ace5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ffb462"
android:endColor="@color/color_ffc889"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
<corners android:radius="4dp" />
<solid android:color="#FFC9C9C9" />
<corners android:radius="26dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/gradient.xml
View file @ 9287ace5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ff6400"
android:endColor="@color/color_ff8200"
android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_6473f8"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/drawable/gradient_26.xml
View file @ 9287ace5
......@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/color_ff6400"
android:endColor="@color/color_ff8200"
android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_6473f8"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/drawable/gradient_37.xml
View file @ 9287ace5
......@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/color_ff6400"
android:endColor="@color/color_ff8200"
android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_6473f8"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/drawable/gradient_4.xml
View file @ 9287ace5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ff6400"
android:endColor="@color/color_ff8200"
android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_6473f8"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/drawable/gradient_background.xml
View file @ 9287ace5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ffb764"
android:endColor="@color/color_ffae52"
android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_6473f8"
android:angle="270"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/drawable/gradient_not_clickable.xml
View file @ 9287ace5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ffb462"
android:endColor="@color/color_ffc889"
android:startColor="#EBEDFF"
android:endColor="#EBEDFF"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
......
app/src/main/res/layout/activity_app_process.xml
View file @ 9287ace5
......@@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_f7fafa">
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/gradient_background"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.LinearLayoutCompat
......@@ -32,6 +32,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/black"
android:src="@mipmap/icon_return_bar_nor" />
</FrameLayout>
......@@ -39,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_process"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/fl_back"
......@@ -53,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/already_occupied"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -64,8 +65,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="58.6%"
android:textColor="@color/white"
tools:text="22%"
android:textColor="@color/black"
android:textSize="32sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
......@@ -103,15 +104,11 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingTop="20dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="18dp"
android:paddingBottom="14dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="@drawable/white_background"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintTop_toBottomOf="@id/cl_top">
......@@ -138,7 +135,7 @@
android:id="@+id/tv_process_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="121"
tools:text="999"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -154,7 +151,7 @@
android:id="@+id/tv_total_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="127"
tools:text="999"
android:textColor="@color/color_181b1f"
android:textSize="14sp"
android:textStyle="bold" />
......
app/src/main/res/layout/activity_clean_junk.xml
View file @ 9287ace5
......@@ -16,24 +16,22 @@
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="6dp"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
<ImageView
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:importantForAccessibility="no"
android:padding="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_return_bar_nor" />
</FrameLayout>
android:src="@mipmap/icon_return_bar_nor"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
......@@ -42,25 +40,27 @@
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/fl_back"
app:layout_constraintBottom_toBottomOf="@id/fl_back"
app:layout_constraintStart_toEndOf="@id/fl_back" />
app:layout_constraintStart_toEndOf="@id/fl_back"
app:layout_constraintTop_toTopOf="@id/fl_back" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_size"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:layout_marginTop="27dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_length"
android:layout_width="wrap_content"
......@@ -88,8 +88,8 @@
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_size" />
</androidx.appcompat.widget.LinearLayoutCompat>
......@@ -106,62 +106,74 @@
android:id="@+id/pb_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_marginHorizontal="24dp"
android:layout_height="2dp"
android:layout_marginTop="32dp"
android:progress="0"
android:max="100"
android:progress="0"
android:progressDrawable="@drawable/clean_junk_progress"
app:layout_constraintTop_toBottomOf="@id/ll_size" />
app:layout_constraintTop_toBottomOf="@id/tv_path" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_ffffff_10"
android:backgroundTint="#29FFFFFF"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:paddingTop="6dp"
android:layout_marginTop="32dp"
android:paddingBottom="6dp"
android:text="@string/clean_tips"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/pb_progress" />
app:layout_constraintTop_toBottomOf="@id/ll_size" />
<View
android:layout_width="match_parent"
android:backgroundTint="@color/color_f7fafa"
android:background="@drawable/white_background_top"
android:layout_marginTop="9dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/pb_progress"
android:layout_height="10dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<pokercc.android.expandablerecyclerview.ExpandableRecyclerView
android:id="@+id/expandable_files"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:scrollbars="none"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/cl_top"
app:layout_constraintBottom_toTopOf="@id/tv_clean" />
app:layout_constraintBottom_toTopOf="@id/tv_clean"
app:layout_constraintTop_toBottomOf="@id/cl_top" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_clean"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/gradient"
android:gravity="center"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:gravity="center"
android:background="@drawable/gradient"
android:text="@string/clean"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toBottomOf="parent" />
<include
android:id="@+id/animation"
android:visibility="gone"
layout="@layout/custom_animation" />
layout="@layout/custom_animation"
android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_clean_result.xml
View file @ 9287ace5
......@@ -16,24 +16,23 @@
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="6dp"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
<ImageView
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:importantForAccessibility="no"
android:padding="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_return_bar_nor" />
</FrameLayout>
android:src="@mipmap/icon_return_bar_nor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title"
......@@ -43,9 +42,9 @@
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/fl_back"
app:layout_constraintBottom_toBottomOf="@id/fl_back"
app:layout_constraintStart_toEndOf="@id/fl_back" />
app:layout_constraintStart_toEndOf="@id/fl_back"
app:layout_constraintTop_toTopOf="@id/fl_back" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView
......@@ -57,8 +56,8 @@
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title" />
<androidx.appcompat.widget.AppCompatTextView
......@@ -70,8 +69,8 @@
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_cleaned_up" />
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -89,10 +88,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:lottie_fileName="ok.json"
app:lottie_autoPlay="true"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:lottie_autoPlay="true"
app:lottie_fileName="ok.json" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_screenshot_clean.xml
View file @ 9287ace5
......@@ -17,24 +17,23 @@
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="6dp"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
<ImageView
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:importantForAccessibility="no"
android:padding="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_return_bar_nor" />
</FrameLayout>
android:src="@mipmap/icon_return_bar_nor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
......@@ -43,9 +42,9 @@
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/fl_back"
app:layout_constraintBottom_toBottomOf="@id/fl_back"
app:layout_constraintStart_toEndOf="@id/fl_back" />
app:layout_constraintStart_toEndOf="@id/fl_back"
app:layout_constraintTop_toTopOf="@id/fl_back" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -53,9 +52,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_size"
android:layout_width="wrap_content"
......@@ -63,9 +63,9 @@
android:text="0"
android:textColor="@color/white"
android:textSize="32sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_unit"
......@@ -74,54 +74,61 @@
android:text="KB"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_size" />
app:layout_constraintStart_toEndOf="@id/tv_size"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="67dp"
android:layout_marginBottom="60dp"
android:text="@string/screenshots_totally"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_size" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginTop="9dp"
android:background="@drawable/white_background_top"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<pokercc.android.expandablerecyclerview.ExpandableRecyclerView
android:id="@+id/expandable_files"
android:layout_width="match_parent"
android:layout_height="0dp"
android:paddingTop="8dp"
android:paddingBottom="12dp"
android:background="@color/white"
app:layout_constraintStart_toStartOf="parent"
android:paddingBottom="12dp"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top"
app:layout_constraintBottom_toTopOf="@id/ll_bottom" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/kongzhuangtai"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@mipmap/ic_empty"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:gravity="center"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.LinearLayoutCompat
......@@ -130,6 +137,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_select_all"
android:layout_width="wrap_content"
......@@ -149,19 +157,18 @@
android:id="@+id/tv_delete"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_weight="1"
android:background="@drawable/btn_not_clickable"
android:gravity="center"
android:background="@drawable/gradient_not_clickable_4"
android:paddingVertical="10dp"
android:text="@string/delete"
android:textColor="@color/white"
android:textSize="14sp" />
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<include
android:id="@+id/animation"
android:visibility="gone"
layout="@layout/custom_animation" />
layout="@layout/custom_animation"
android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_similar_photos.xml
View file @ 9287ace5
......@@ -71,15 +71,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/iv_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:src="@mipmap/icon_n"
android:paddingHorizontal="10dp"
android:thumb="@drawable/bg_switch_thumb_ffffff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:thumbTint="@color/white"
app:track="@drawable/bg_switch_track"
app:trackTint="@color/switch_track_selector" />
</androidx.constraintlayout.widget.ConstraintLayout>
......
app/src/main/res/layout/activity_whatsapp_clean_detail.xml
View file @ 9287ace5
......@@ -141,13 +141,12 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingVertical="10dp"
android:gravity="center"
android:background="@drawable/gradient_not_clickable_4"
android:background="@drawable/btn_not_clickable"
android:text="@string/delete"
android:textColor="@color/white"
android:textSize="14sp" />
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
......
app/src/main/res/layout/dialog_exit.xml
View file @ 9287ace5
......@@ -69,7 +69,7 @@
android:paddingBottom="10dp"
android:text="@string/cancel"
android:textAlignment="center"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/tv_sure"
......
app/src/main/res/layout/fragment_create.xml
View file @ 9287ace5
......@@ -39,6 +39,7 @@
android:background="@drawable/bg_gradient_zodiac"
android:paddingHorizontal="17dp"
android:paddingVertical="8dp"
android:gravity="center"
android:layout_marginEnd="16dp"
android:text="@string/zodiac"
android:textColor="@color/white"
......
app/src/main/res/layout/fragment_home.xml
View file @ 9287ace5
<?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:id="@+id/cl_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -36,16 +37,17 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="404dp"
android:scaleType="fitXY"
android:importantForAccessibility="no"
android:scaleType="fitXY"
android:src="@mipmap/home_bg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
......@@ -64,10 +66,10 @@
android:id="@+id/tv_storage_used"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="17%"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="22%" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.base.scanqrclear.luma.MyProgressBar
......@@ -79,8 +81,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_storage_used"
app:max="100"
app:pBgColor="@color/white"
app:pColor="@color/color_e75506"
app:pBgColor="@color/color_e75506"
app:pColor="@color/white"
app:progress="0"
app:progressDirection="0" />
......@@ -99,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="22dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
......@@ -117,10 +119,10 @@
android:id="@+id/tv_memory_used"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="67%"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="21%" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.base.scanqrclear.luma.MyProgressBar
......@@ -132,10 +134,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_memory_used"
app:max="100"
app:pBgColor="@color/white"
app:pColor="@color/color_e75506"
app:pEndColor="@color/color_ff9a0c"
app:pStartColor="@color/color_ffc067"
app:pBgColor="@color/color_e75506"
app:pColor="@color/white"
app:progress="0"
app:progressDirection="1" />
......@@ -214,15 +214,23 @@
android:id="@+id/rv_function"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:paddingVertical="14dp"
android:layout_marginTop="28dp"
android:nestedScrollingEnabled="false"
android:paddingVertical="10dp"
app:layout_constraintTop_toBottomOf="@id/iv_upward" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/color_f8f8fb"
app:layout_constraintBottom_toTopOf="@id/cl_pet"
app:layout_constraintTop_toBottomOf="@id/rv_function" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_hot_tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:layout_marginTop="16dp"
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@id/rv_function">
......@@ -243,6 +251,7 @@
android:id="@+id/rv_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:layout_marginTop="14dp"
android:background="@drawable/white_background_top"
android:paddingBottom="9dp"
......@@ -250,9 +259,10 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_pet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:layout_marginTop="16dp"
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@id/cl_hot_tools">
......@@ -291,7 +301,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_day"
app:lottie_autoPlay="true"
app:lottie_fileName="home_bottom.json"
app:lottie_fileName="home_pet.json"
app:lottie_loop="true" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......
app/src/main/res/layout/item_child_clean_junk.xml
View file @ 9287ace5
......@@ -3,10 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingEnd="11dp"
android:background="@color/white">
<androidx.appcompat.widget.AppCompatImageView
......@@ -37,8 +38,8 @@
android:id="@+id/tv_length"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="67.4MB"
android:layout_marginEnd="3dp"
tools:text="100MB"
android:textSize="12sp"
android:textColor="@color/color_aeb4bd"
app:layout_constraintTop_toTopOf="parent"
......@@ -49,7 +50,8 @@
android:id="@+id/iv_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_all_photo_off"
android:padding="@dimen/dp_5"
android:src="@mipmap/ic_check_n"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
......
app/src/main/res/layout/item_child_screenshot_clean.xml
View file @ 9287ace5
......@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off"
android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_image"
app:layout_constraintEnd_toEndOf="parent" />
......
app/src/main/res/layout/item_clean_detail.xml
View file @ 9287ace5
......@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off"
android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_image"
app:layout_constraintEnd_toEndOf="parent" />
......@@ -107,7 +107,7 @@
android:id="@+id/iv_audio_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_weixuanzhong_photo_off"
android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/ll_audio"
app:layout_constraintBottom_toBottomOf="@id/ll_audio"
app:layout_constraintEnd_toEndOf="parent" />
......
app/src/main/res/layout/item_function_2.xml
View file @ 9287ace5
......@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:selectableItemBackground"
android:layout_marginTop="13dp">
android:layout_marginTop="10dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_icon"
......@@ -35,6 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:paddingBottom="5dp"
android:layout_marginHorizontal="10dp"
android:gravity="center"
android:text="@string/app_name"
......
app/src/main/res/layout/item_group_clean_junk.xml
View file @ 9287ace5
<?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="wrap_content">
......@@ -9,20 +10,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingVertical="16dp"
android:paddingHorizontal="16dp"
android:background="@drawable/white_background"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
android:paddingVertical="16dp"
android:paddingStart="16dp"
android:paddingEnd="11dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_empty_junk_nor"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_name"
......@@ -32,9 +34,9 @@
android:text="@string/app_name"
android:textColor="@color/color_181b1f"
android:textSize="16sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_icon" />
app:layout_constraintStart_toEndOf="@id/iv_icon"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indicator"
......@@ -42,30 +44,31 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@mipmap/icon_down_setting"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_name" />
app:layout_constraintStart_toEndOf="@id/tv_name"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_length"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="67.4MB"
android:layout_marginEnd="3dp"
android:textColor="@color/color_ff613e"
android:textSize="12sp"
android:textColor="@color/color_aeb4bd"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_select" />
app:layout_constraintEnd_toStartOf="@id/iv_select"
app:layout_constraintTop_toTopOf="parent"
tools:text="67.4MB" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_weixuan_junk"
app:layout_constraintTop_toTopOf="parent"
android:padding="@dimen/dp_5"
android:src="@mipmap/ic_check_n"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/item_similar_photos.xml
View file @ 9287ace5
......@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off"
android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_first_photo"
app:layout_constraintEnd_toEndOf="@id/iv_first_photo" />
......
app/src/main/res/layout/item_similar_photos_child.xml
View file @ 9287ace5
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off"
android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_photo"
app:layout_constraintEnd_toEndOf="@id/iv_photo" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/layout_ad_native.xml
View file @ 9287ace5
......@@ -15,6 +15,7 @@
android:layout_marginTop="4dp"
android:layout_marginStart="6dp"
android:src="@mipmap/icon_ad_pop"
android:tint="@color/colorPrimary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......@@ -53,7 +54,7 @@
app:layout_constraintStart_toEndOf="@id/ad_icon"
app:layout_constraintEnd_toStartOf="@id/ad_call_to_action" />
<Button
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/layout_ad_native_exit.xml
View file @ 9287ace5
......@@ -48,6 +48,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ad_small_icon"
android:layout_width="wrap_content"
android:tint="@color/colorPrimary"
android:layout_height="wrap_content"
android:src="@mipmap/icon_ad_pop"
app:layout_constraintTop_toTopOf="parent"
......@@ -81,7 +82,7 @@
android:layout_height="33dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<Button
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action"
android:layout_width="wrap_content"
android:layout_height="38dp"
......
app/src/main/res/layout/layout_admob_app_exit.xml
View file @ 9287ace5
......@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="#FDBA55"
android:background="@color/colorPrimary"
android:paddingHorizontal="3dp"
android:paddingVertical="2dp"
android:text="Ad"
......@@ -98,7 +98,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="12dp"
android:background="@drawable/bg_f3a10f_10"
android:background="@drawable/gradient_26"
android:gravity="center"
android:textAllCaps="false"
android:textColor="@color/white"
......
app/src/main/res/layout/layout_admob_item.xml
View file @ 9287ace5
......@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:background="#FDBA55"
android:background="@color/colorPrimary"
android:paddingHorizontal="3dp"
android:paddingVertical="2dp"
android:text="Ad"
......@@ -93,7 +93,7 @@
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_gravity="center_vertical"
android:background="@drawable/bg_17a1ff_35"
android:background="@drawable/gradient_26"
android:gravity="center"
android:textAllCaps="false"
android:textColor="@color/white"
......
app/src/main/res/layout/layout_admob_native_custom.xml
View file @ 9287ace5
......@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="#FF923E"
android:background="@color/colorPrimary"
android:padding="2dp"
android:text="Ad"
android:textColor="@color/white"
......@@ -85,7 +85,7 @@
android:layout_height="26dp"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="12dp"
android:background="@drawable/bg_ff8a00_10"
android:background="@drawable/gradient_26"
android:gravity="center"
android:textColor="@color/white"
android:textSize="15sp"
......
app/src/main/res/values/colors.xml
View file @ 9287ace5
......@@ -3,9 +3,14 @@
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="colorPrimary">@color/color_fd891e</color>
<color name="colorPrimary">@color/color_2b91f1</color>
<color name="color_ff613e">#FF613E</color>
<color name="color_e75506">#E75506</color>
<color name="color_f78950">#F78950</color>
<color name="color_8eb0ff">#8EB0FF</color>
<color name="color_6473f8">#6473F8</color>
<color name="color_2b91f1">#2B91F1</color>
<color name="color_fd891e">#FD891E</color>
<color name="color_ff6400">#FF6400</color>
......
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