Upload file

Author: Zenlua

common/src/main/java/com/omarea/common/ui/DialogFullScreen.kt

@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.omarea.common.R
-import androidx.fragment.app.DialogFragment
+
 
 /*
 继承使用示例：
@@ -29,41 +29,50 @@ class DialogAppChooser(private val darkMode: Boolean): DialogFullScreen(R.layout
 }
 */
 
-open class DialogFullScreen(
-    private val layout: Int,
-    darkMode: Boolean
-) : DialogFragment() {
-
-    init {
-        setStyle(
-            STYLE_NORMAL,
-            if (darkMode)
-                R.style.dialog_full_screen_dark
-            else
-                R.style.dialog_full_screen_light
-        )
+open class DialogFullScreen(private val layout: Int, darkMode: Boolean) : androidx.fragment.app.DialogFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        currentView = inflater.inflate(layout, container)
+        return currentView
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return inflater.inflate(layout, container, false)
+    private var themeResId: Int = 0
+    private lateinit var currentView: View
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Dialog(activity!!, if (themeResId != 0) themeResId else R.style.dialog_full_screen_light)
+        } else {
+            Dialog(activity!!, -1)
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        dialog?.window?.let { window ->
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                window.setWindowAnimations(android.R.style.Animation_Translucent)
+        val activity = this.activity
+        if (activity != null) {
+            dialog?.window?.run {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                    setWindowAnimations(android.R.style.Animation_Translucent)
+                }
+
+                DialogHelper.setWindowBlurBg(this, activity)
             }
-            DialogHelper.setWindowBlurBg(window, requireActivity())
         }
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+    }
+
     fun closeView() {
-        dismissAllowingStateLoss()
+        try {
+            dismiss()
+        } catch (ex: java.lang.Exception) {
+        }
+    }
+
+    init {
+        themeResId = if (darkMode) R.style.dialog_full_screen_dark else R.style.dialog_full_screen_light
     }
 }

krscript/src/main/java/com/omarea/krscript/ui/ParamsMultipleSelect.kt

@@ -8,12 +8,16 @@ import com.omarea.common.model.SelectItem
 import com.omarea.common.ui.DialogItemChooser
 import com.omarea.krscript.R
 import com.omarea.krscript.model.ActionParamInfo
+import android.content.res.Configuration
 
 class ParamsMultipleSelect(private val actionParamInfo: ActionParamInfo, private val context: FragmentActivity) {
     private var options: ArrayList<SelectItem>? = null
     private var status = booleanArrayOf()
     private var labels: Array<String?> = arrayOf()
     private var values: Array<String?> = arrayOf()
+    private val uiMode = context.resources.configuration.uiMode
+    // Kiểm tra chế độ tối sử dụng UI_MODE_NIGHT_YES
+    private var darkMode: Boolean = (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
 
     fun render(): View {
         options = actionParamInfo.optionsFromShell
@@ -72,7 +76,7 @@ class ParamsMultipleSelect(private val actionParamInfo: ActionParamInfo, private
                 })
             }
             // TODO:深色模式、浅色模式
-            DialogItemChooser(true, ArrayList(items), true, object : DialogItemChooser.Callback {
+            DialogItemChooser(darkMode, ArrayList(items), true, object : DialogItemChooser.Callback {
                 override fun onConfirm(selected: List<SelectItem>, result: BooleanArray) {
                     result.forEachIndexed { index, value ->
                         status[index] = value