Update

Zenlua · Zenlua · commit e7635a889ff8 · 2026-04-12T12:49:38.000+07:00
diff --git a/app/src/main/java/com/omarea/common/ui/BlurEngine.java b/app/src/main/java/com/omarea/common/ui/BlurEngine.java
@@ -72,11 +72,7 @@ public Bitmap getUpdatedBlurBitmap() {
                 cachedCanvas.drawColor(0, PorterDuff.Mode.CLEAR); 
                 
                 if (!blurBitmap.isRecycled()) {
-                    int dstLeft = x < 0 ? -x : 0;
-                    int dstTop  = y < 0 ? -y : 0;
-                    Rect dstRect = new Rect(dstLeft, dstTop, dstLeft + srcRect.width(), dstTop + srcRect.height());
-                    
-                    cachedCanvas.drawBitmap(blurBitmap, srcRect, dstRect, null);
+                    cachedCanvas.drawBitmap(blurBitmap, srcRect, new Rect(0, 0, w, h), null);
                     cachedCanvas.drawColor(getBlurTintColor()); 
                     return cachedBitmap;
                 }
diff --git a/app/src/main/java/com/omarea/common/ui/FastBlurUtility.java b/app/src/main/java/com/omarea/common/ui/FastBlurUtility.java
@@ -13,7 +13,7 @@ public class FastBlurUtility {
 
     // Tỉ lệ thu nhỏ ảnh để xử lý nhanh (1/10 giúp giảm 100 lần số pixel cần tính toán)
     private static final float SCALE_FACTOR = 0.10f;
-    private static final int BLUR_RADIUS = 10;
+    private static final int BLUR_RADIUS = 8;
 
     /**
      * Chụp màn hình và làm mờ (Dùng làm phương án dự phòng khi không lấy được Wallpaper)
diff --git a/app/src/main/java/com/tool/tree/CrashHandler.java b/app/src/main/java/com/tool/tree/CrashHandler.java
@@ -25,9 +25,8 @@ public void uncaughtException(Thread thread, Throwable ex) {
 
             Intent intent = new Intent(context, CrashLogActivity.class);
             intent.putExtra("crash_log", stackTrace);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                    | Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK 
+                    | Intent.FLAG_ACTIVITY_CLEAR_TASK);
 
             context.startActivity(intent);
 
diff --git a/app/src/main/java/com/tool/tree/SplashActivity.kt b/app/src/main/java/com/tool/tree/SplashActivity.kt
@@ -29,6 +29,7 @@ import java.io.BufferedReader
 import java.io.DataOutputStream
 import java.io.File
 import java.util.Locale
+import com.tool.tree.databinding.ActivityMainBinding
 
 class SplashActivity : AppCompatActivity() {
 
@@ -66,8 +67,11 @@ class SplashActivity : AppCompatActivity() {
             }
         }
 
-        binding.startLogoXml.startAnimation(AnimationUtils.loadAnimation(this, R.anim.ic_settings_rotate))
-        // applyTheme()
+        binding.startLogoXml.postDelayed({
+            val animation = AnimationUtils.loadAnimation(this, R.anim.ic_settings_rotate)
+            binding.startLogoXml.startAnimation(animation)
+        }, 2000)
+
     }
 
     // =================== LOGIC XỬ LÝ QUYỀN ===================
@@ -83,7 +87,7 @@ class SplashActivity : AppCompatActivity() {
                 // Sau đó mới đi xin quyền hệ thống
                 requestRequiredPermissions() 
             },
-            Runnable { finishAffinity() }
+            Runnable { finish() }
         ).setCancelable(false)
     }
 
@@ -135,14 +139,12 @@ class SplashActivity : AppCompatActivity() {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == REQUEST_CODE_PERMISSIONS) {
-            if (grantResults.isNotEmpty() && grantResults.all { it == PackageManager.PERMISSION_GRANTED }) {
+            if (grantResults.all { it == PackageManager.PERMISSION_GRANTED }) {
                 checkPermissionsNextStep()
-            } else {
-                finishAffinity()
-            }
+            } else finish()
         }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -204,12 +206,11 @@ class SplashActivity : AppCompatActivity() {
     }
 
     private fun gotoHome() {
-        val intentToStart = if (intent?.getBooleanExtra("JumpActionPage", false) == true) {
-            Intent(this, ActionPage::class.java).apply { putExtras(intent!!) }
-        } else {
-            Intent(this, MainActivity::class.java)
-        }
-        startActivity(intentToStart)
+        startActivity(
+            if (intent?.getBooleanExtra("JumpActionPage", false) == true)
+                Intent(this, ActionPage::class.java).apply { putExtras(intent!!) }
+            else Intent(this, MainActivity::class.java)
+        )
         finish()
     }
 
diff --git a/app/src/main/java/com/tool/tree/ThemeModeState.kt b/app/src/main/java/com/tool/tree/ThemeModeState.kt
@@ -2,16 +2,21 @@ package com.tool.tree
 
 import android.app.Activity
 import android.app.WallpaperManager
-import android.graphics.BitmapFactory
+import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import com.omarea.common.ui.ThemeMode
-import java.io.File
 import com.omarea.common.ui.BlurEngine
+import java.io.File
 
-@Suppress("DEPRECATION")
 object ThemeModeState {
 
     private var themeMode: ThemeMode = ThemeMode()
@@ -21,19 +26,15 @@ object ThemeModeState {
 
     fun switchTheme(activity: Activity, themeLevel: Int? = null): ThemeMode {
         val level = themeLevel ?: ThemeConfig(activity).getThemeMode()
-        val wallpaper = WallpaperManager.getInstance(activity)
-        val wallpaperInfo = wallpaper.wallpaperInfo
-
-        val customWallpaperFile = File(activity.filesDir, "home/etc/wallpaper.jpg")
-        val useCustomWallpaper = customWallpaperFile.exists()
+        
+        // Cập nhật logic xác định Night Mode hệ thống nhanh hơn
+        val isSystemNight = (activity.resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES
 
         when (level.coerceIn(0, 5)) {
             0 -> {
-                val nightModeFlags = activity.resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK
-                val isNight = nightModeFlags == android.content.res.Configuration.UI_MODE_NIGHT_YES
-                themeMode.isDarkMode = isNight
+                themeMode.isDarkMode = isSystemNight
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-                activity.setTheme(if (isNight) R.style.AppThemeDark else R.style.AppTheme)
+                activity.setTheme(if (isSystemNight) R.style.AppThemeDark else R.style.AppTheme)
             }
             1 -> {
                 themeMode.isDarkMode = true
@@ -46,29 +47,29 @@ object ThemeModeState {
                 activity.setTheme(R.style.AppTheme)
             }
             3 -> {
-                val nightModeFlags = activity.resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK
-                val isNight = nightModeFlags == android.content.res.Configuration.UI_MODE_NIGHT_YES
-                themeMode.isDarkMode = isNight
+                themeMode.isDarkMode = isSystemNight
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-                applyWallpaperMode(activity, wallpaper, wallpaperInfo, useCustomWallpaper)
+                applyWallpaperMode(activity, isSystemNight)
             }
             4 -> {
                 themeMode.isDarkMode = true
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                applyWallpaperMode(activity, wallpaper, wallpaperInfo, useCustomWallpaper, true)
+                applyWallpaperMode(activity, true)
             }
             5 -> {
                 themeMode.isDarkMode = false
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                applyWallpaperMode(activity, wallpaper, wallpaperInfo, useCustomWallpaper, false)
+                applyWallpaperMode(activity, false)
             }
         }
 
-        // CẬP NHẬT: Luôn gọi captureAndBlur khi ở chế độ Wallpaper (level >= 3)
-        // Không sử dụng check null ở đây vì BlurController đã có logic so sánh File Size bên trong
+        // BlurEngine logic
         if (level >= 3) {
             BlurEngine.isPaused = false
-            BlurEngine.controller.captureAndBlur(activity)
+            // Đảm bảo View đã layout xong trước khi capture
+            activity.window.decorView.post {
+                BlurEngine.controller.captureAndBlur(activity)
+            }
         } else {
             BlurEngine.isPaused = true
         }
@@ -77,29 +78,23 @@ object ThemeModeState {
         return themeMode
     }
 
-    private fun applyWallpaperMode(
-        activity: Activity,
-        wallpaper: WallpaperManager,
-        wallpaperInfo: android.app.WallpaperInfo?,
-        useCustomWallpaper: Boolean,
-        forceDark: Boolean? = null
-    ) {
-        val night = forceDark ?: (activity.resources.configuration.uiMode and android.content.res.Configuration.UI_MODE_NIGHT_MASK == android.content.res.Configuration.UI_MODE_NIGHT_YES)
-        themeMode.isDarkMode = night
-        activity.setTheme(if (night) R.style.AppThemeWallpaper else R.style.AppThemeWallpaperLight)
+    private fun applyWallpaperMode(activity: Activity, isNight: Boolean) {
+        activity.setTheme(if (isNight) R.style.AppThemeWallpaper else R.style.AppThemeWallpaperLight)
         
+        val wallpaper = WallpaperManager.getInstance(activity)
+        val customWallpaperFile = File(activity.filesDir, "home/etc/wallpaper.jpg")
+
         try {
-            if (useCustomWallpaper) {
-                val customWallpaperFile = File(activity.filesDir, "home/etc/wallpaper.jpg")
-                if (customWallpaperFile.exists()) {
-                    val bitmap = BitmapFactory.decodeFile(customWallpaperFile.absolutePath)
-                    activity.window.setBackgroundDrawable(android.graphics.drawable.BitmapDrawable(activity.resources, bitmap))
-                }
-            } else if (wallpaperInfo != null && wallpaperInfo.packageName != null) {
+            if (customWallpaperFile.exists()) {
+                // Sử dụng createFromPath để tiết kiệm bộ nhớ hơn decode trực tiếp
+                val drawable = Drawable.createFromPath(customWallpaperFile.absolutePath)
+                activity.window.setBackgroundDrawable(drawable)
+            } else if (wallpaper.wallpaperInfo != null) {
+                // Nếu là Live Wallpaper, dùng flag SHOW_WALLPAPER
                 activity.window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER)
+                activity.window.setBackgroundDrawable(null)
             } else {
-                // CẬP NHẬT: Xóa cache của WallpaperManager trước khi lấy Drawable hệ thống
-                wallpaper.forgetLoadedWallpaper()
+                // Hình nền tĩnh hệ thống
                 activity.window.setBackgroundDrawable(wallpaper.drawable)
             }
         } catch (e: Exception) {
@@ -109,30 +104,29 @@ object ThemeModeState {
 
     private fun applyWindowFlags(activity: Activity) {
         val window = activity.window
-        androidx.core.view.WindowCompat.setDecorFitsSystemWindows(window, false)
-        window.statusBarColor = android.graphics.Color.TRANSPARENT
-        window.navigationBarColor = android.graphics.Color.TRANSPARENT
+        // Thiết lập Edge-to-Edge chuẩn SDK 23+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        window.statusBarColor = Color.TRANSPARENT
+        window.navigationBarColor = Color.TRANSPARENT
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val rootView = window.decorView.rootView
-            androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(rootView) { _, insets ->
-                val systemBars = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
-                activity.findViewById<View>(R.id.blur_top_container)?.setPadding(0, systemBars.top, 0, 0)
-                activity.findViewById<View>(R.id.file_selector_list)?.setPadding(0, systemBars.top, 0, 0)
-                activity.findViewById<View>(R.id.main_list)?.setPadding(0, systemBars.top, 0, 0)
-                activity.findViewById<View>(R.id.blur_bottom_container)?.setPadding(0, 0, 0, systemBars.bottom)
-                insets
-            }
+        val rootView = window.decorView
+        ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            
+            // Cập nhật padding cho các container nếu tồn tại
+            activity.findViewById<View>(R.id.blur_top_container)?.setPadding(0, systemBars.top, 0, 0)
+            activity.findViewById<View>(R.id.file_selector_list)?.setPadding(0, systemBars.top, 0, 0)
+            activity.findViewById<View>(R.id.main_list)?.setPadding(0, systemBars.top, 0, 0)
+            activity.findViewById<View>(R.id.blur_bottom_container)?.setPadding(0, 0, 0, systemBars.bottom)
+            
+            insets // Trả về insets để các view khác vẫn nhận được
         }
 
-        val controller = androidx.core.view.WindowInsetsControllerCompat(window, window.decorView)
-        if (!themeMode.isDarkMode) {
-            controller.isAppearanceLightStatusBars = true
-            controller.isAppearanceLightNavigationBars = true
-        } else {
-            controller.isAppearanceLightStatusBars = false
-            controller.isAppearanceLightNavigationBars = false
-        }
+        // Điều khiển màu icon trên thanh trạng thái
+        val controller = WindowInsetsControllerCompat(window, rootView)
+        val useLightIcons = !themeMode.isDarkMode
+        controller.isAppearanceLightStatusBars = useLightIcons
+        controller.isAppearanceLightNavigationBars = useLightIcons
     }
 
     fun getThemeMode(): ThemeMode = themeMode
