PegUtils

epegasus · Jul 20, 2024 · d75bccd · d75bccd
1 parent f3571dc
commit d75bccd
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 39 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/dev/pegasus/utils/sample/MainActivity.kt b/app/src/main/java/dev/pegasus/utils/sample/MainActivity.kt
@@ -20,4 +20,15 @@ class MainActivity : AppCompatActivity() {
         binding.mbDateMain.setOnClickListener { startActivity(Intent(this, DateActivity::class.java)) }
         binding.mbFileMain.setOnClickListener { startActivity(Intent(this, FileActivity::class.java)) }
     }
+
+    /*override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashTheme()
+        hideStatusBar(1)
+        enableMaterialDynamicTheme()
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreated() {
+
+    }*/
 }
diff --git a/pegutils/src/main/java/dev/pegasus/utils/base/ParentActivity.kt b/pegutils/src/main/java/dev/pegasus/utils/base/ParentActivity.kt
@@ -3,34 +3,26 @@ package dev.pegasus.utils.base
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.updatePadding
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.color.DynamicColors
 import dev.pegasus.utils.utils.PegasusHelperUtils.TAG
 
-abstract class ParentActivity<T : ViewBinding>(private val bindingFactory: (LayoutInflater) -> T, private val installSplash: Boolean = false) : AppCompatActivity() {
+abstract class ParentActivity<T : ViewBinding>(private val bindingFactory: (LayoutInflater) -> T) : AppCompatActivity() {
 
     protected val binding by lazy { bindingFactory(layoutInflater) }
     protected var includeTopPadding = true
     protected var includeBottomPadding = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        if (installSplash) {
-            installSplashScreen()
-        }
-        enableEdgeToEdge()
-        enableDynamicTheme()
-
         setContentView(binding.root)
         setPadding()
-        hideStatusBar(-1)
         onCreated()
     }
 
@@ -44,7 +36,15 @@ abstract class ParentActivity<T : ViewBinding>(private val bindingFactory: (Layo
         }
     }
 
-    protected open fun enableDynamicTheme() {}
+    protected open fun installSplashTheme() {
+        Log.d(TAG, "installSplashTheme: installed")
+        installSplashScreen()
+    }
+
+    protected open fun enableMaterialDynamicTheme() {
+        Log.d(TAG, "enableMaterialDynamicTheme: enabling")
+        DynamicColors.applyToActivityIfAvailable(this)
+    }
 
     /**
      * @param type
@@ -55,15 +55,17 @@ abstract class ParentActivity<T : ViewBinding>(private val bindingFactory: (Layo
      */
 
     protected open fun hideStatusBar(type: Int) {
+        Log.d(TAG, "hideStatusBar: Showing/Hiding: Type: $type")
         WindowInsetsControllerCompat(window, window.decorView).apply {
             systemBarsBehavior = when (type) {
                 0 -> WindowInsetsControllerCompat.BEHAVIOR_DEFAULT
                 else -> WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             }
             when (type) {
                 0 -> show(WindowInsetsCompat.Type.systemBars())
-                1 -> hide(WindowInsetsCompat.Type.statusBars())
-                2 -> hide(WindowInsetsCompat.Type.navigationBars())
+                1 -> hide(WindowInsetsCompat.Type.systemBars())
+                2 -> hide(WindowInsetsCompat.Type.statusBars())
+                3 -> hide(WindowInsetsCompat.Type.navigationBars())
                 else -> hide(WindowInsetsCompat.Type.systemBars())
             }
         }