Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/AndroidManifest.xml

app/src/main/AndroidManifest.xml

@@ -24,6 +24,11 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
@@ -177,6 +182,42 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
 
+        <activity
+            android:name=".luma.CleanResultActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+        <activity
+            android:name=".luma.AppProcessActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+        <activity
+            android:name=".luma.ScreenshotCleanActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+        <activity
+            android:name=".luma.SimilarPhotosActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+        <activity
+            android:name=".luma.WhatsappCleanActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
+        <activity
+            android:name=".luma.WhatsappCleanDetailActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
         <activity
             android:name=".luma.WeatherInterface"
             android:exported="false"

app/src/main/java/com/base/scanqrclear/luma/ActivityJumpHelps.kt

@@ -22,14 +22,10 @@ object ActivityJumpHelps {
     ) {
         when(nameId) {
             R.string.junk_scan -> requestPermission(context, launcher) { CleanJunkActivity.start(context) }
-//            R.string.battery_info -> BatteryInfoActivity.start(context)
-//            R.string.app_process -> AppProcessActivity.start(context)
-//            R.string.whatsapp_clean -> requestPermission(context, launcher) { com.base.scanqrclear.luma.WhatsappCleanActivity.start(context) }
-//            R.string.screenshot_clean -> requestPermission(context, launcher) { ScreenshotCleanActivity.start(context) }
-//            R.string.app_manager -> AppManagerActivity.start(context)
-//            R.string.large_files -> requestPermission(context, launcher) { LargeFileCleanActivity.start(context) }
-//            R.string.image_compressor -> requestPermission(context, launcher) { PhotoCompressionActivity.start(context) }
-//            R.string.similar_photos -> requestPermission(context, launcher) { com.base.scanqrclear.luma.SimilarPhotosActivity.start(context) }
+            R.string.app_process -> AppProcessActivity.start(context)
+            R.string.whatsapp_clean -> requestPermission(context, launcher) { WhatsappCleanActivity.start(context) }
+            R.string.screenshot_clean -> requestPermission(context, launcher) { ScreenshotCleanActivity.start(context) }
+            R.string.similar_photos -> requestPermission(context, launcher) { SimilarPhotosActivity.start(context) }
         }
     }
 

app/src/main/java/com/base/scanqrclear/luma/CleanResultActivity.kt

@@ -58,13 +58,13 @@ 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_battery_1, R.string.battery_info, R.string.result_battery_info, text = R.string.view))
+           // 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_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_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_app_1, R.string.app_manager, R.string.result_app_manager, text = R.string.view))
+          //  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))
         }
 

app/src/main/java/com/base/scanqrclear/ui/main/CreateFragment.kt

@@ -2,6 +2,7 @@ package com.base.scanqrclear.ui.main
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.base.scanqrclear.R
 import com.base.scanqrclear.ads.AdsMgr
@@ -26,6 +27,7 @@ import com.base.scanqrclear.ui.message.MessageActivity
 import com.base.scanqrclear.ui.telephone.TelephoneActivity
 import com.base.scanqrclear.ui.text.TextActivity
 import com.base.scanqrclear.ui.website.WebsiteActivity
+import com.base.scanqrclear.ui.webview.WebBrowserActivity
 import com.base.scanqrclear.ui.wifi.WifiActivity
 import com.base.scanqrclear.utils.AppPreferences
 import com.base.scanqrclear.utils.BarUtils
@@ -55,6 +57,13 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
 
     override fun initView() {
         super.initView()
+        binding.tvWeather.setCompoundDrawablesWithIntrinsicBounds(
+            ContextCompat.getDrawable(requireContext(), R.mipmap.x_qing),
+            null,
+            null,
+            null
+        )
+        binding.tvWeather.text = "40℃"
         binding.space.layoutParams.height = BarUtils.getStatusBarHeight()
         // binding.ivVip.updatePadding(top = BarUtils.getStatusBarHeight())
         adapter = FunctionAdapter()
@@ -147,7 +156,11 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
         binding.tvLogo.setOnClickListener {
             goToAc(ScanAc::class.java)
         }
-
+        binding.tvZodiac.setOnClickListener {
+            startActivity(Intent(context, WebBrowserActivity::class.java).apply {
+                putExtra("url", "https://www.horoscope.com/us/index.aspx")
+            })
+        }
 //        binding.rv.setOnClickListener {
 //            if (isContinuousTimesClick()) {
 //                val sb = StringBuilder()

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

@@ -150,7 +150,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             //https://www.jianshu.com/p/f69bd30cf5b0
             //FragmentStateAdapter 这里必须传人fragment
             adapter = pageAdapter
-            offscreenPageLimit = 5
+            offscreenPageLimit = 4
         }
         binding.viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
 
@@ -190,7 +190,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
         })
 
-        val defaultTab = binding.tabLayout.getTabAt(1)
+        val defaultTab = binding.tabLayout.getTabAt(0)
         defaultTab?.select()
     }
 

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

@@ -17,14 +17,16 @@
     <TextView
         android:id="@+id/tv_weather"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginTop="4dp"
         android:layout_marginStart="16dp"
         android:includeFontPadding="false"
+        tools:drawableStart="@mipmap/x_qing"
+        android:gravity="center"
         android:background="@drawable/bg_gradient_weather"
-        android:paddingHorizontal="17dp"
-        android:paddingVertical="8dp"
+        android:paddingHorizontal="14dp"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/space"
         tools:text="30℃" />
@@ -32,7 +34,7 @@
     <TextView
         android:id="@+id/tv_zodiac"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="36dp"
         android:includeFontPadding="false"
         android:background="@drawable/bg_gradient_zodiac"
         android:paddingHorizontal="17dp"
@@ -40,7 +42,7 @@
         android:layout_marginEnd="16dp"
         android:text="@string/zodiac"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_weather" />