瀏覽代碼

ui: Fi styling for all DialogFragments

Peter Cai 2 年之前
父節點
當前提交
a55fbd2767

+ 4 - 1
app-common/src/main/java/im/angry/openeuicc/ui/BaseMaterialDialogFragment.kt

@@ -6,12 +6,15 @@ import android.view.LayoutInflater
 import android.view.Window
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.fragment.app.DialogFragment
+import com.google.android.material.color.DynamicColors
 import im.angry.openeuicc.common.R
 
 abstract class BaseMaterialDialogFragment: DialogFragment() {
     override fun onGetLayoutInflater(savedInstanceState: Bundle?): LayoutInflater {
         val inflater = super.onGetLayoutInflater(savedInstanceState)
-        return inflater.cloneInContext(ContextThemeWrapper(requireContext(), R.style.Theme_OpenEUICC))
+        val wrappedContext = ContextThemeWrapper(requireContext(), R.style.Theme_OpenEUICC)
+        val dynamicWrappedContext = DynamicColors.wrapContextIfAvailable(wrappedContext)
+        return inflater.cloneInContext(dynamicWrappedContext)
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

+ 0 - 1
app/src/main/res/layout/fragment_slot_mapping.xml

@@ -8,7 +8,6 @@
         android:id="@+id/toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:theme="@style/Theme.OpenEUICC"
         android:elevation="4dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"