Merge remote-tracking branch 'origin/master'

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

@@ -92,7 +92,7 @@ class ScreenshotCleanActivity : BaseActivity2() {
     }
 
     private fun updateView(isSelection: Boolean) {
-        binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
+        binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
         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

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

@@ -81,7 +81,7 @@ class WhatsappCleanDetailActivity : BaseActivity2() {
     }
 
     private fun updateView(isSelection: Boolean) {
-        binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
+        binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
         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]

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

@@ -21,6 +21,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI
 import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean
 import com.base.scanqrclear.databinding.FragmentCreateBinding
 import com.base.scanqrclear.luma.WeatherInterface
+import com.base.scanqrclear.luma.WeatherUtils
 import com.base.scanqrclear.ui.contact.ContractActivity
 import com.base.scanqrclear.ui.email.EmailActivity
 import com.base.scanqrclear.ui.event.EventActivity
@@ -33,6 +34,7 @@ import com.base.scanqrclear.ui.wifi.WifiActivity
 import com.base.scanqrclear.utils.AppPreferences
 import com.base.scanqrclear.utils.BarUtils
 import com.gyf.immersionbar.ktx.immersionBar
+import kotlin.random.Random
 
 class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding::inflate) {
 
@@ -58,13 +60,6 @@ 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()
@@ -96,6 +91,40 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
         }
     }
 
+    @SuppressLint("SetTextI18n")
+    private fun setWeather(){
+        val weatherEntity = WeatherUtils.getWeatherEntity()
+        var icon:Int
+        var value = 22
+        weatherEntity?.let {
+            val subBean = weatherEntity.list[0]
+            val min = subBean.tempMin.toInt()
+            val max = subBean.tempMax.toInt()
+            if (min == max) {
+                value = max
+            }
+            if (min < max) {
+                value = Random.nextInt(min, max)
+            }
+            icon = when (WeatherUtils.getWeatherType(subBean.iconDay.toInt())) {
+                "Sunny day" -> R.mipmap.x_qing
+                "Cloudy day" -> R.mipmap.x_yin
+                "Rainy day" -> R.mipmap.x_dayu
+                "Snowy day" -> R.mipmap.x_xiaxue
+                "Greasy day" -> R.mipmap.x_wumaishachengbao
+                "Unknown" -> R.mipmap.x_qing
+                else -> R.mipmap.x_qing
+            }
+            binding.tvWeather.setCompoundDrawablesWithIntrinsicBounds(
+                ContextCompat.getDrawable(requireContext(), icon),
+                null,
+                null,
+                null
+            )
+            binding.tvWeather.text = "${value}℃"
+        }
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun itemKeyClick(key: String) {
         val bean = functions.find { it.key == key }
@@ -142,6 +171,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
     override fun onResumeOneShoot() {
         super.onResumeOneShoot()
         adapter?.changeGuide()
+        setWeather()
     }
 
     override fun onResume() {

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

@@ -142,7 +142,7 @@
                 android:id="@+id/iv_select_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/icon_all_photo_off" />
+                android:src="@mipmap/ic_check_n" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"

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

@@ -124,7 +124,7 @@
                 android:id="@+id/iv_select_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/icon_all_photo_off" />
+                android:src="@mipmap/ic_check_n" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"

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

@@ -109,19 +109,19 @@
     <string name="guide_3">Die verschiedenen Informationen, die Sie teilen möchten, in QR-Codes bearbeiten</string>
     <string name="continue_">Weiter</string>
     <string name="complete">Fertig</string>
-    <string name="files_manager">Files Manager</string>
+    <string name="files_manager">Dateimanager</string>
     <string name="storage_used">Storage Used</string>
     <string name="memory_used">Memory Used</string>
-    <string name="junk_files">Junk Files</string>
-    <string name="hot_tools">Hot Tools</string>
-    <string name="have_been_with_you_for">Have been with you for</string>
-    <string name="days">days</string>
+    <string name="junk_files">Junk-Dateien</string>
+    <string name="hot_tools">Heiße Werkzeuge</string>
+    <string name="have_been_with_you_for">Bin seit langem bei Ihnen</string>
+    <string name="days">Tage</string>
     <string name="hot">Hot</string>
-    <string name="screenshot_clean">Screenshot Clean</string>
-    <string name="similar_photos">Similar Photos</string>
-    <string name="junk_scan">Junk Scan</string>
-    <string name="whatsapp_clean">WhatsApp Clean</string>
-    <string name="app_process">App Process</string>
-    <string name="files">Files</string>
-    <string name="zodiac">Zodiac</string>
+    <string name="screenshot_clean">Screenshot Reinigen</string>
+    <string name="similar_photos">Ähnliche Fotos</string>
+    <string name="junk_scan">Junk-Scan</string>
+    <string name="whatsapp_clean">WhatsApp Reinigen</string>
+    <string name="app_process">App-Prozess</string>
+    <string name="files">Dateien</string>
+    <string name="zodiac">Tierkreis</string>
 </resources>
\ No newline at end of file

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

@@ -109,19 +109,19 @@
     <string name="guide_3">Edita la información que deseas compartir en códigos QR</string>
     <string name="continue_">Continuar</string>
     <string name="complete">Completar</string>
-    <string name="files_manager">Files Manager</string>
-    <string name="storage_used">Storage Used</string>
-    <string name="memory_used">Memory Used</string>
-    <string name="junk_files">Junk Files</string>
-    <string name="hot_tools">Hot Tools</string>
-    <string name="have_been_with_you_for">Have been with you for</string>
-    <string name="days">days</string>
+    <string name="files_manager">Administrador de archivos</string>
+    <string name="storage_used">Almacenamiento utilizado</string>
+    <string name="memory_used">Memoria utilizada</string>
+    <string name="junk_files">Archivos basura</string>
+    <string name="hot_tools">Herramientas calientes</string>
+    <string name="have_been_with_you_for">He estado contigo por</string>
+    <string name="days">Días</string>
     <string name="hot">Hot</string>
-    <string name="screenshot_clean">Screenshot Clean</string>
-    <string name="similar_photos">Similar Photos</string>
-    <string name="junk_scan">Junk Scan</string>
-    <string name="whatsapp_clean">WhatsApp Clean</string>
-    <string name="app_process">App Process</string>
-    <string name="files">Files</string>
-    <string name="zodiac">Zodiac</string>
+    <string name="screenshot_clean">Captura de pantalla limpia</string>
+    <string name="similar_photos">Fotos similares</string>
+    <string name="junk_scan">Escaneo de basura</string>
+    <string name="whatsapp_clean">Limpieza de WhatsApp</string>
+    <string name="app_process">Proceso de la aplicación</string>
+    <string name="files">Archivos</string>
+    <string name="zodiac">Zodiaco</string>
 </resources>
\ No newline at end of file

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

@@ -136,13 +136,6 @@
     <string name="share_app_with_friends">Share app with friends</string>
     <string name="found">Found</string>
     <string name="normal">Normal</string>
-    <string name="charging">Charging</string>
-    <string name="battery_status">Battery status</string>
-    <string name="temperature">Temperature</string>
-    <string name="voltage">Voltage</string>
-    <string name="power">Power</string>
-    <string name="battery_type">Battery Type</string>
-    <string name="battery_capacity">Battery Capacity</string>
     <string name="finish">Finish</string>
     <string name="storage_permission_title">Need to obtain storage permissions</string>
     <string name="storage_permission_content">To ensure proper functionality,please allow Fast Phone Cleaner to access all files on your device.</string>
@@ -173,46 +166,30 @@
     <string name="selected">Selected</string>
     <string name="delete_title">Sure to delete？</string>
     <string name="delete_content">Selected files cannot be recoverd after deleting, continue anyway？</string>
-    <string name="large_file">Large File</string>
-    <string name="large_files">Large Files</string>
-    <string name="battery">Battery</string>
     <string name="low">Low</string>
     <string name="low_lower">low</string>
-    <string name="charging_lower">charging</string>
     <string name="exit_clean_junk">Exit Junk Scan</string>
     <string name="exit_clean_junk_content">Exit Junk Scan? Uncleared junk files might be taking up space.</string>
     <string name="exit_app_process">Exit App Process</string>
     <string name="exit_app_manager_content">Exit App manager? Unused applications may occupy phone memory.</string>
-    <string name="exit_battery_info">Exit Battery Info</string>
-    <string name="exit_battery_info_content">Exit Battery Info? Continuing to use it can help you better understand the battery condition.</string>
     <string name="exit_whatsapp_clean">Exit WhatsApp Clean</string>
     <string name="exit_whatsapp_clean_content">Exit WhatsApp Clean? Possible WhatsApp junk files may be using space.</string>
-    <string name="exit_large_file_clean">Exit Large Files</string>
-    <string name="exit_large_file_clean_content">Exit Large Files? Undeleted large files may be occupying valuable space.</string>
-    <string name="exit_app_process_content1">Exit App Process?</string>
+   <string name="exit_app_process_content1">Exit App Process?</string>
     <string name="exit_app_process_content2">background processes are still running.</string>
-    <string name="exit_photo_compression">Exit Image Compression</string>
-    <string name="exit_photo_compression_content">Exit Image Compression? Uncompressed photos may be occupying space.</string>
     <string name="exit_screenshot_cleaner">Exit Screenshot Clean</string>
     <string name="exit_screenshot_cleaner_content">Exit Screenshot Clean? Unremoved screenshots may be taking up space.</string>
     <string name="exit_similar_photos">Exit Similar Photos</string>
     <string name="exit_similar_photos_content">Exit Similar Photos? Unremoved similar photos might be occupying space.</string>
     <string name="notification_clean_junk">Clean out junk fles to free up space on your phone!</string>
     <string name="notification_whatsapp_clean">Free up space by cleaning up WhatsApp junk files!</string>
-    <string name="notification_battery_info">View phone battery consumption recently!</string>
-    <string name="notification_large_file">Clean out large files to free up your storage space!</string>
-    <string name="notification_photo_compression">Compress photos to free up phone storage space!</string>
     <string name="notification_screenshot_clean">Clear screenshot clutter to free up space!</string>
     <string name="notification_installed">Installed successfully \nClean up files from your device!</string>
     <string name="notification_uninstalled">Uninstalled successfully \nClean up files from your device!</string>
     <string name="notification_not_clean">Not cleaned in</string>
     <string name="notification_not_clean_days">day(s)</string>
     <string name="result_clean_junk">Clean up unnecessary junk files!</string>
-    <string name="result_battery_info">View battery usage and details</string>
-    <string name="result_app_processes">Manage backend processes</string>
-    <string name="result_large_file">Clean large fles to free up storage space</string>
-    <string name="result_screenshot_clean">Check Screenshot Clean to release more space</string>
-    <string name="result_photo_compression">Compress photos to optimize storage usage</string>
+   <string name="result_app_processes">Manage backend processes</string>
+   <string name="result_screenshot_clean">Check Screenshot Clean to release more space</string>
     <string name="result_similar_photos">Clean up similar photos to free up space</string>
     <string name="result_app_manager">Clear out apps you no longer need</string>
     <string name="result_whatsapp_clean">Free up space by cleaning up WhatsApp junkfiles</string>
@@ -249,13 +226,11 @@
     <string name="month_3">3 month</string>
     <string name="month_6">6 month</string>
     <string name="year_1">1 year</string>
-    <string name="please_wait">Please wait...</string>
+    <string name="please_wait">Please wait…</string>
     <string name="wait_a_moment">Wait a moment</string>
-    <string name="compress">Compress</string>
     <string name="best_quality_photo">Best quality photo</string>
     <string name="most_space_saved">Most space saved</string>
-    <string name="compress_all">Compress all</string>
-    <string name="confirm_content">The original photos will be replaced by the compressed ones</string>
+   <string name="confirm_content">The original photos will be replaced by the compressed ones</string>
     <string name="process_ad">This process may contain ads</string>
     <string name="app">App</string>
     <string name="larger_than">Larger than</string>
@@ -272,13 +247,7 @@
     <string name="the_best_we_can_get">The best we can get</string>
     <string name="whatsapp">WhatsApp</string>
     <string name="view">View</string>
-    <string name="equipment">Equipment</string>
-    <string name="device_manufacturer">Device Manufacturer</string>
-    <string name="google_advertiser_id">Google Advertiser Id</string>
-    <string name="android_version">Android Version</string>
-    <string name="initialize_engine">Initialize engine</string>
-    <string name="device_ready">Device Ready</string>
-    <string name="loading_point">loading...</string>
+    <string name="loading_point">loading…</string>
     <string name="files">Files</string>
     <string name="clean_junk_pop">Clean out junk files to free up space on your phone!</string>
     <string name="app_process_pop">app process management for smooth performance.</string>