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

app/src/main/java/com/base/appzxhy/ui/main/MainActivity.kt

@@ -36,7 +36,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
 //        Home2Fragment(),
         Home3Fragment(),
         RecoveryFragment(),
-        RecycleBinFragment()
+//        RecycleBinFragment()
     )
 
     private val viewPagerAdapter by lazy {
@@ -54,7 +54,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         initViewPager2()
         initDialogFlow()
         AdsMgr.showBanner(binding.flBanner, false)
-        exitDialog= ExitDialog(this)
+        exitDialog = ExitDialog(this)
         exitDialog.init()
     }
 
@@ -83,9 +83,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         binding.viewPager2.adapter = viewPagerAdapter
         binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
-                if (position==0){
+                if (position == 0) {
                     setStatusBarColor(getColor(R.color.colorPrimary))
-                }else{
+                } else {
                     setStatusBarColor(getColor(R.color.transparent))
                 }
                 val defaultTab = binding.tabLayout.getTabAt(position)
@@ -97,16 +97,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
 
     private fun initTab() {
         arrayOf(
-            HomeTabUIBean(R.drawable.tab_clean_selector, getString(R.string.clean)),
-            HomeTabUIBean(R.drawable.tab_recovery_selector, getString(R.string.recovery)),
-            HomeTabUIBean(R.drawable.tab_recyclebin_selector, getString(R.string.recyclebin)),
+            HomeTabUIBean(R.drawable.tab_home_selector, getString(R.string.home)),
+//            HomeTabUIBean(R.drawable.tab_recovery_selector, getString(R.string.recovery)),
+            HomeTabUIBean(R.drawable.tab_settings_selector, getString(R.string.settings)),
         ).forEachIndexed { index, homeTab ->
             val tab = binding.tabLayout.newTab()
             val view = LayoutInflater.from(this).inflate(R.layout.item_home_tab, null)
             val tabBinding = ItemHomeTabBinding.bind(view)
             tabBinding.ivIcon.setImageResource(homeTab.icon)
             tabBinding.tvTab.text = homeTab.tab
-//            tabBinding.tvTab.setTextColor(ContextCompat.getColor(this, R.color.color_tab_home))
+//            tabBinding.tvTab.setTextColor(ContextCompat.getColor(this, R.color.colorPrimary))
             tab.customView = tabBinding.root
             tab.id = index
             if (index == 1) {
@@ -121,6 +121,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
                 tab?.let {
                     if (binding.viewPager2.currentItem == tab.id) return
                     binding.viewPager2.setCurrentItem(tab.id, false)
+                    tab.setSelected()
                 }
             }
 

app/src/main/res/drawable-xxhdpi/tab_clean_selector.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_clean_s" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_clean_n" android:state_selected="false" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/bg_03b988_35.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="#03B988" />
-    <corners android:radius="35dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/bg_f2f2f2_r16.xml

-<?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

app/src/main/res/drawable/bg_ff8a00_10.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ff8a00" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/bg_selector_home.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-<!--    <item android:drawable="@mipmap/tab_create_s" android:state_selected="true" />-->
-<!--    <item android:drawable="@mipmap/tab_create_n" android:state_selected="false" />-->
-</selector>
\ No newline at end of file

app/src/main/res/drawable/ic_launcher_foreground.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file

app/src/main/res/drawable/log_svg.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0,0h24v24h-24z"/>
-<!--    <path-->
-<!--        android:pathData="M0,0h24v24h-24z"-->
-<!--        android:fillColor="#ffffff"/>-->
-<!--    <path-->
-    <!--        android:pathData="M12,24C18.627,24 24,18.627 24,12C24,5.373 18.627,0 12,0C5.373,0 0,5.373 0,12C0,18.627 5.373,24 12,24Z"-->
-    <!--        android:fillColor="#ABABAB"/>-->
-    <path
-        android:pathData="M10.98,18.118H6.392C6.257,18.118 6.127,18.064 6.032,17.968C5.936,17.873 5.882,17.743 5.882,17.608V13.02C5.882,12.738 6.111,12.51 6.392,12.51H10.98C11.262,12.51 11.49,12.738 11.49,13.02V17.608C11.49,17.889 11.262,18.118 10.98,18.118ZM10.471,13.53H6.902V17.098H10.471V13.53ZM10.98,11.49H6.392C6.111,11.49 5.882,11.262 5.882,10.981V6.392C5.882,6.111 6.111,5.883 6.392,5.883H10.98C11.262,5.883 11.49,6.111 11.49,6.392V10.981C11.49,11.262 11.262,11.49 10.98,11.49ZM10.471,6.902H6.902V10.471H10.471V6.902ZM17.608,18.118H13.02C12.738,18.118 12.51,17.889 12.51,17.608V13.02C12.51,12.738 12.738,12.51 13.02,12.51H17.608C17.889,12.51 18.118,12.738 18.118,13.02V17.608C18.118,17.889 17.889,18.118 17.608,18.118ZM17.098,13.53H13.53V17.098H17.098V13.53ZM7.921,16.078H9.451V14.549H7.921V16.078ZM7.921,9.451H9.451V7.922H7.921V9.451ZM16.588,11.49H18.118V9.961H16.588V11.49ZM16.588,7.412H15.568V5.882H18.118V8.431H16.588V7.412L16.588,7.412ZM12.51,7.412H14.039V5.882H12.51V7.412ZM14.549,16.078H16.078V14.549H14.549V16.078ZM12.51,11.49H14.039V9.961H12.51V11.49ZM14.039,9.961H15.568V7.412H14.039V9.961Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M4.605,4C4.271,4 4,4.271 4,4.605V6.508C4,6.747 4.194,6.941 4.432,6.941C4.671,6.941 4.865,6.747 4.865,6.508V4.865H6.508C6.747,4.865 6.941,4.671 6.941,4.432C6.941,4.194 6.747,4 6.508,4H4.605ZM19.395,4C19.729,4 20,4.271 20,4.605V6.508C20,6.747 19.806,6.941 19.568,6.941C19.329,6.941 19.135,6.747 19.135,6.508V4.865H17.492C17.253,4.865 17.059,4.671 17.059,4.432C17.059,4.194 17.253,4 17.492,4H19.395ZM4,19.395C4,19.729 4.271,20 4.605,20H6.508C6.747,20 6.941,19.806 6.941,19.568C6.941,19.329 6.747,19.135 6.508,19.135H4.865V17.492C4.865,17.253 4.671,17.059 4.432,17.059C4.194,17.059 4,17.253 4,17.492V19.395ZM19.395,20C19.729,20 20,19.729 20,19.395V17.751C20,17.513 19.806,17.319 19.568,17.319C19.329,17.319 19.135,17.513 19.135,17.751V19.135H17.751C17.513,19.135 17.319,19.329 17.319,19.568C17.319,19.806 17.513,20 17.751,20H19.395Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M4,14.353H20V11.529H4V14.353Z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:startX="12"
-            android:startY="14.353"
-            android:endX="12"
-            android:endY="11.529"
-            android:type="linear">
-          <item android:offset="0" android:color="#00E6E7E7"/>
-          <item android:offset="1" android:color="#7FE6E7E7"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M4,11.529V10.588H20V11.529H4Z"
-        android:fillColor="#E6E7E7"
-        android:fillType="evenOdd"/>
-  </group>
-</vector>

app/src/main/res/drawable/tab_recovery_selector.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_recovery_s" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_recovery_n" android:state_selected="false" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_recyclebin_selector.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_recyclebin_s" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_recyclebin_n" android:state_selected="false" />
-</selector>
\ No newline at end of file

app/src/main/res/drawable/white_background_16.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
-    <corners android:radius="16dp" />
-</shape>
\ No newline at end of file

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

@@ -27,9 +27,7 @@
             android:textColor="@color/black"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@id/fl_back"
-            app:layout_constraintStart_toEndOf="@id/fl_back"
-            app:layout_constraintTop_toTopOf="@id/fl_back" />
+            />
 
     </FrameLayout>
 

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

-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView 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="180dp"
-    android:layout_height="136dp"
-    android:layout_margin="5dp"
-    app:cardCornerRadius="25dp"
-    app:cardElevation="0dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:id="@+id/iv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="23dp"
-            android:src="@drawable/jiazai_ad"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="18dp"
-            android:layout_marginBottom="22dp"
-            android:includeFontPadding="false"
-            android:text="@string/preparing_advertisement"
-            android:textColor="@color/black"
-            android:textSize="13sp"
-            tools:ignore="HardcodedText" />
-    </LinearLayout>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file

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

-<?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"
-    android:background="#FFFFFF">
-
-    <TextView
-        android:id="@+id/tvSkip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:layout_marginEnd="20dp"
-        android:text="Skip"
-        android:textColor="#B6B6B6"
-        android:textSize="16sp"
-        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="HardcodedText" />
-
-    <ImageView
-        android:id="@+id/iv"
-        android:layout_width="@dimen/dp_300"
-        android:layout_height="@dimen/dp_300"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.3"
-        tools:ignore="ContentDescription"
-        tools:src="@drawable/chahua01" />
-
-
-    <TextView
-        android:id="@+id/tvContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginTop="18dp"
-        android:gravity="center"
-        android:text="Clean up clutter to unlock more space and keep your phone running smoothly."
-        android:textColor="#000000"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/iv"
-        tools:ignore="HardcodedText" />
-
-    <ImageView
-        android:id="@+id/ivDian"
-        android:layout_width="@dimen/dp_50"
-        android:layout_height="@dimen/dp_10"
-        android:layout_marginTop="25dp"
-        android:src="@drawable/icon1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvContent"
-        tools:ignore="ContentDescription" />
-
-
-    <TextView
-        android:id="@+id/tv_btn"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:layout_marginHorizontal="80dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="28dp"
-        android:background="@drawable/bg_primary_r64"
-        android:gravity="center"
-        android:text="Next"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivDian"
-        tools:ignore="HardcodedText,MissingConstraints" />
-
-
-    <com.base.appzxhy.business.ads.NativeParentView
-        android:id="@+id/flAd"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#D9D9D9"
-        android:minHeight="75dp"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:src="@drawable/zhanwei1"
-            tools:ignore="ImageContrastCheck,ImageContrastCheck" />
-    </com.base.appzxhy.business.ads.NativeParentView>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values-night/themes.xml

 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.LocalWeatherWhite" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-    </style>
 </resources>
\ No newline at end of file

app/src/main/res/values/colors.xml

@@ -13,14 +13,9 @@
     <color name="fontsGray85">#85909D</color>
 
     <color name="color_66000000">#66000000</color>
-    <color name="color_00fac8">#00FAC8</color>
-    <color name="color_00cec4">#00CEC4</color>
     <color name="color_1a1a1a">#1A1A1A</color>
     <color name="color_181b1f">#181B1F</color>
     <color name="color_666666">#666666</color>
-    <color name="color_27d07e">#27D07E</color>
-    <color name="color_ff6651">#FF6651</color>
-    <color name="color_cccccc">#CCCCCC</color>
     <color name="color_f7fafa">#F7FAFA</color>
     <color name="color_aeb4bd">#AEB4BD</color>
     <color name="color_f0f0f0">#F0F0F0</color>
@@ -29,10 +24,7 @@
     <color name="color_d9d9d9">#D9D9D9</color>
     <color name="color_9b9595">#9B9595</color>
     <color name="color_8b8b8b">#8B8B8B</color>
-    <color name="color_4f4f4f">#4F4F4F</color>
     <color name="color_999999">#999999</color>
-    <color name="color_f3f4f6">#F3F4F6</color>
-    <color name="color_4990fa">#4990FA</color>
     <color name="color_fafafa">#FAFAFA</color>
 
 </resources>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -34,7 +34,6 @@
     <dimen name="dp_70">70dp</dimen>
     <dimen name="dp_38">38dp</dimen>
     <dimen name="dp_320">320dp</dimen>
-    <dimen name="dp_330">330dp</dimen>
     <dimen name="dp_55">55dp</dimen>
     <dimen name="dp_6">6dp</dimen>
     <dimen name="dp_345">345dp</dimen>

app/src/main/res/values/strings.xml

 <resources>
     <string name="app_name">Super Easy Clean</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="facebook_app_id">4512448902756291</string>
 
-    <string name="preparing_advertisement">Preparing advertisement</string>
     <string name="involve_ad">This process may involve ad.</string>
     <string name="consent_required">Consent Required</string>
 
@@ -29,7 +27,6 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="junk_clean">Junk Clean</string>
     <string name="battery_info">Battery Info</string>
     <string name="screenshot_clean">Screenshot Clean</string>
-    <string name="app_manager">App Manager</string>
     <string name="large_file_clean">Large File Clean</string>
     <string name="photo_compression">Photo Compression</string>
     <string name="similar_photos">Similar Photos</string>
@@ -38,18 +35,9 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="settings">Settings</string>
 
 
-    <string name="battery_status">Battery status</string>
-    <string name="temperature">Temperature</string>
-    <string name="voltage">Voltage</string>
-    <string name="health">Health</string>
-    <string name="good">Good</string>
     <string name="normal">Normal</string>
-    <string name="battery_type">Battery Type</string>
-    <string name="battery_capacity">Battery Capacity</string>
 
     <string name="please_wait">Please wait</string>
-    <string name="power">Power</string>
-    <string name="charging">Charging</string>
     <string name="left_with_current_power_consumption">left with current power consumption</string>
     <string name="finish">Finish</string>
     <string name="found">Found</string>
@@ -119,7 +107,6 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="version">Version</string>
     <string name="recycle_bin">Recycle Bin</string>
     <string name="recyclebin_tip"><![CDATA[Mobispeedy is protecting your photos, videos, files & App files from being deleted]]></string>
-    <string name="recyclebin">Recycle Bin</string>
     <string name="thank_you_for_using_app">Thank you for using %s!</string>
     <string name="thank_you_very_much_for_taking_the_time_to_rate_us">Thank you very much for taking the time to rate us.</string>
     <string name="submit">SUBMIT</string>
@@ -141,10 +128,9 @@ Please rest assured that we will handle your information in strict accordance wi
     <string name="exit_photo_compression_content">Exit Photo Compression? Uncompressed photos may be taking up space.</string>
     <string name="exit_screenshot_cleaner">Exit Screenshot Clean</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_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>
+    <string name="Video_Clean">Video Clean</string>
 </resources>