[调整] 调整返回图标

app/proguard-rules.pro

@@ -22,7 +22,7 @@
 
 -dontwarn javax.annotation.Nullable
 
-#-keep class com.base.locationsharewhite.bean.** { *; }
+-keep class com.easy.clean.bean.** { *; }
 -keep class com.google.gson.reflect.** { *; }
 -keep class * extends com.google.gson.reflect.TypeToken
 -keep class com.google.gson.stream.** { *; }
@@ -30,13 +30,13 @@
 -keepattributes *Annotation*
 -keep class * extends com.google.gson.TypeAdapter
 -keep class * extends com.google.gson.JsonSerializer
--keep class * extends com.google.gson.Deserializer
--keep class com.google.gson.TypeAdapters{*;}
+#-keep class * extends com.google.gson.Deserializer
+#-keep class com.google.gson.TypeAdapters{*;}
 -keep class com.bytedance.sdk.** { *; }
 
 # 保持 Facebook SDK 的类和方法
 -keep class com.facebook.** { *; }
 -keep interface com.facebook.** { *; }
--obfuscationdictionary dictionary.txt
--classobfuscationdictionary dictionary.txt
--packageobfuscationdictionary dictionary.txt
+#-obfuscationdictionary dictionary.txt
+#-classobfuscationdictionary dictionary.txt
+#-packageobfuscationdictionary dictionary.txt
\ No newline at end of file

app/src/main/java/com/easy/clean/ui/batteryinfo/BatteryInfoActivity.kt

@@ -39,6 +39,7 @@ class BatteryInfoActivity :
         showAdAnimation(LottieEnum.BATTERY_INFO_LOTTIE) {
             adAdapter.submitList(listOf(""))
         }
+        binding.llTitle.tvTitle.text = getString(R.string.battery_info)
         batteryReceiver = BatteryReceiver { updateBatteryInfo() }
         registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
 
@@ -48,7 +49,7 @@ class BatteryInfoActivity :
             listOf(BatteryHead(1))
         )
 
-        if (AdConfigBean.adsConfigBean.isAdShow){
+        if (AdConfigBean.adsConfigBean.isAdShow) {
             concatAdapter.addAdapter(adAdapter)
         }
         concatAdapter.addAdapter(batteryInfoAdapter)
@@ -57,7 +58,7 @@ class BatteryInfoActivity :
 
     override fun initListener() {
         super.initListener()
-        binding.ivBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        binding.llTitle.ivBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
         binding.tvBtn.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()
         }

app/src/main/java/com/easy/clean/ui/clean/JunkCleanActivity.kt

@@ -154,6 +154,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle
     override fun initView() {
         super.initView()
         AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
+        binding.llTitle.tvTitle.text=getString(R.string.junk_clean)
         binding.expandableFiles.adapter = adapter
         binding.expandableFiles.layoutManager = LinearLayoutManager(this)
         binding.expandableFiles.itemAnimator = ExpandableItemAnimator(binding.expandableFiles)
@@ -164,7 +165,7 @@ class JunkCleanActivity : BaseActivity<ActivityJunkCleanBinding>(ActivityJunkCle
     override fun initListener() {
         super.initListener()
 
-        binding.ivBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        binding.llTitle.ivBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
         binding.tvClean.setOnClickListener {
             if (isBackDisable) return@setOnClickListener
 

app/src/main/java/com/easy/clean/ui/cleanresult/CleanResultActivity.kt

@@ -9,6 +9,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.easy.clean.R
+import com.easy.clean.SpConstObject
 import com.easy.clean.base.BaseActivity
 import com.easy.clean.base.jumpAction
 import com.easy.clean.bean.FeatureBean
@@ -25,7 +26,8 @@ import com.easy.clean.databinding.ItemCleanResultBinding
 import com.easy.clean.utils.MyAnimationUtils
 import com.easy.clean.utils.Utils
 
-class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCleanResultBinding::inflate) {
+class CleanResultActivity :
+    BaseActivity<ActivityCleanResultBinding>(ActivityCleanResultBinding::inflate) {
 
     companion object {
         var total: Long = 0
@@ -35,11 +37,16 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
 
     private var list = mutableListOf<FeatureBean>()
     private val adapter by lazy {
-        class ViewHolder(val binding: ItemCleanResultBinding) : RecyclerView.ViewHolder(binding.root)
+        class ViewHolder(val binding: ItemCleanResultBinding) :
+            RecyclerView.ViewHolder(binding.root)
 
         object : RecyclerView.Adapter<ViewHolder>() {
             override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-                val binding = ItemCleanResultBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+                val binding = ItemCleanResultBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
                 return ViewHolder(binding)
             }
 
@@ -56,7 +63,13 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
 
                 val translationX = resources.displayMetrics.widthPixels.toFloat()
                 holder.itemView.translationX = -translationX
-                MyAnimationUtils.translationX(holder.itemView, -translationX, 0f, 1000, (position + 1) * 300L)
+                MyAnimationUtils.translationX(
+                    holder.itemView,
+                    -translationX,
+                    0f,
+                    1000,
+                    (position + 1) * 300L
+                )
 
                 if (position == 0) {
                     AdsMgr.showNative(holder.binding.flAd, R.layout.layout_admob_native_custom)
@@ -81,8 +94,10 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
         binding.rvResult.adapter = adapter
         binding.rvResult.layoutManager = LinearLayoutManager(this)
 
-        if (titleName.isNotEmpty()) binding.tvTitle.text = titleName
+        if (titleName.isEmpty()) titleName = getString(R.string.clean)
+        binding.llTitle.tvTitle.text = titleName
         binding.tvCleanedUp.text = "${getString(R.string.cleaned_up)} ${Utils.getSizeFormat(total)}"
+        SpConstObject.cleanedSize += total
 
         list = getData()
         adapter.notifyDataSetChanged()
@@ -97,7 +112,7 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
                 }
             })
         }
-        binding.ivBack.setOnClickListener {
+        binding.llTitle.ivBack.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()
         }
 
@@ -105,9 +120,30 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
 
     private fun getData(): MutableList<FeatureBean> {
         val list = mutableListOf<FeatureBean>().apply {
-            add(FeatureBean(JUNK_CLEAN, R.string.clean_junk, R.drawable.icon_clean_clean_result, R.string.result_junk_clean))
-            add(FeatureBean(BATTERY_INFO, R.string.battery_info, R.drawable.icon_battery_clean_result, R.string.result_battery_info))
-            add(FeatureBean(LARGE_FILE_CLEAN, R.string.large_file_clean, R.drawable.icon_file_clean_result, R.string.result_large_file_clean))
+            add(
+                FeatureBean(
+                    JUNK_CLEAN,
+                    R.string.clean_junk,
+                    R.drawable.icon_clean_clean_result,
+                    R.string.result_junk_clean
+                )
+            )
+            add(
+                FeatureBean(
+                    BATTERY_INFO,
+                    R.string.battery_info,
+                    R.drawable.icon_battery_clean_result,
+                    R.string.result_battery_info
+                )
+            )
+            add(
+                FeatureBean(
+                    LARGE_FILE_CLEAN,
+                    R.string.large_file_clean,
+                    R.drawable.icon_file_clean_result,
+                    R.string.result_large_file_clean
+                )
+            )
             add(
                 FeatureBean(
                     PHOTO_COMPRESSION,
@@ -116,8 +152,22 @@ class CleanResultActivity : BaseActivity<ActivityCleanResultBinding>(ActivityCle
                     R.string.result_photo_compression
                 )
             )
-            add(FeatureBean(SCREENSHOT_CLEAN, R.string.screenshot_clean, R.drawable.icon_screenshot_2, R.string.result_screenshot_clean))
-            add(FeatureBean(SIMILAR_PHOTOS, R.string.similar_photos, R.drawable.icon_similar_photos_clean_result, R.string.result_similar_photos))
+            add(
+                FeatureBean(
+                    SCREENSHOT_CLEAN,
+                    R.string.screenshot_clean,
+                    R.drawable.icon_screenshot_2,
+                    R.string.result_screenshot_clean
+                )
+            )
+            add(
+                FeatureBean(
+                    SIMILAR_PHOTOS,
+                    R.string.similar_photos,
+                    R.drawable.icon_similar_photos_clean_result,
+                    R.string.result_similar_photos
+                )
+            )
         }
 
         val filteredList = list.filter { it.key != functionKey }

app/src/main/res/layout/activity_battery_info_2.xml

@@ -13,24 +13,9 @@
         android:background="@color/colorPrimary"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/ivBack"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:foreground="@drawable/ripple_8"
-            android:padding="@dimen/dp_16"
-            android:src="@drawable/icon_back" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start|center_vertical"
-            android:layout_marginStart="53dp"
-            android:text="@string/battery_info"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
+        <include
+            android:id="@+id/ll_title"
+            layout="@layout/layout_title" />
     </FrameLayout>
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/activity_clean_result.xml

@@ -13,38 +13,10 @@
         android:background="@drawable/bg_gradient_03efdb_25c5f2"
         app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
-            android:id="@+id/ll_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout_editor_absoluteX="16dp">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/ivBack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:foreground="@drawable/ripple_8"
-                android:padding="@dimen/dp_16"
-                android:src="@drawable/icon_back" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                android:layout_marginStart="58dp"
-                android:text="@string/clean"
-                android:textColor="@color/white"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-
-        </FrameLayout>
 
+        <include layout="@layout/layout_title"
+            android:id="@+id/ll_title"
+            />
         <!--        <com.airbnb.lottie.LottieAnimationView-->
         <!--            android:id="@+id/idLottie"-->
         <!--            android:layout_width="wrap_content"-->

app/src/main/res/layout/activity_junk_clean.xml

@@ -13,35 +13,10 @@
         android:background="@color/colorPrimary"
         app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
-            android:id="@+id/ll_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/ivBack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:foreground="@drawable/ripple_8"
-                android:padding="16dp"
-                android:src="@drawable/icon_back" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                android:layout_marginStart="53dp"
-                android:text="@string/junk_clean"
-                android:textColor="@color/white"
-                android:textSize="20sp"
-                android:textStyle="bold" />
-
-        </FrameLayout>
+        <include
+            android:id="@+id/ll_title"
+            layout="@layout/layout_title" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/ll_size"

app/src/main/res/layout/layout_title.xml

@@ -15,7 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:foreground="@drawable/ripple_8"
-        android:padding="16dp"
+        android:padding="14dp"
         android:src="@drawable/icon_back" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -23,7 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start|center_vertical"
-        android:layout_marginStart="53dp"
+        android:layout_marginStart="58dp"
         android:text="@string/Video_Clean"
         android:textColor="@color/white"
         android:textSize="20sp"