HapeLee 1 год назад
Родитель
Сommit
5a55aee755

+ 1 - 1
app/src/main/java/io/legato/kazusa/base/BaseDialogFragment.kt

@@ -69,7 +69,7 @@ abstract class BaseDialogFragment(
             view.findViewById<View>(R.id.vw_bg)?.setOnClickListener(null)
             view.setOnClickListener { dismiss() }
         } else if (!AppConfig.isEInkMode) {
-            view.setBackgroundColor(ThemeStore.backgroundColor())
+            //view.setBackgroundColor(ThemeStore.backgroundColor())
         }
         onFragmentCreated(view, savedInstanceState)
         observeLiveBus()

+ 3 - 2
app/src/main/java/io/legato/kazusa/ui/about/CrashLogsDialog.kt

@@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legato.kazusa.R
+import io.legato.kazusa.base.BaseBottomSheetDialogFragment
 import io.legato.kazusa.base.BaseDialogFragment
 import io.legato.kazusa.base.BaseViewModel
 import io.legato.kazusa.base.adapter.ItemViewHolder
@@ -34,7 +35,7 @@ import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
 import kotlinx.coroutines.isActive
 import java.io.FileFilter
 
-class CrashLogsDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
+class CrashLogsDialog : BaseBottomSheetDialogFragment(R.layout.dialog_recycler_view),
     Toolbar.OnMenuItemClickListener {
 
     private val binding by viewBinding(DialogRecyclerViewBinding::bind)
@@ -43,7 +44,7 @@ class CrashLogsDialog : BaseDialogFragment(R.layout.dialog_recycler_view),
 
     override fun onStart() {
         super.onStart()
-        setLayout(0.9f, ViewGroup.LayoutParams.WRAP_CONTENT)
+
     }
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

+ 0 - 98
app/src/main/res/values-night/themes.xml

@@ -9,102 +9,4 @@
         <item name="alertDialogTheme">@style/AppTheme.AlertDialog</item>
     </style>
 
-    <style name="GR.Base.Theme" parent="Base.AppTheme">
-        <item name="colorPrimary">@color/md_theme_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_error</item>
-        <item name="colorOnError">@color/md_theme_onError</item>
-        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
-        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_background</item>
-        <item name="colorOnBackground">@color/md_theme_onBackground</item>
-        <item name="colorSurface">@color/md_theme_surface</item>
-        <item name="colorOnSurface">@color/md_theme_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_outline</item>
-        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
-        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
-        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
-        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
-        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
-        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
-        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
-        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
-        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
-        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
-        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
-        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
-        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
-        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
-        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
-    </style>
-
-    <style name="Theme.Base.WH" parent="Base.AppTheme">
-        <item name="colorPrimary">@color/wh_theme_primary</item>
-        <item name="colorOnPrimary">@color/wh_theme_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/wh_theme_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/wh_theme_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/wh_theme_secondary</item>
-        <item name="colorOnSecondary">@color/wh_theme_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/wh_theme_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/wh_theme_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/wh_theme_tertiary</item>
-        <item name="colorOnTertiary">@color/wh_theme_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/wh_theme_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/wh_theme_onTertiaryContainer</item>
-        <item name="colorError">@color/wh_theme_error</item>
-        <item name="colorOnError">@color/wh_theme_onError</item>
-        <item name="colorErrorContainer">@color/wh_theme_errorContainer</item>
-        <item name="colorOnErrorContainer">@color/wh_theme_onErrorContainer</item>
-        <item name="android:colorBackground">@color/wh_theme_background</item>
-        <item name="colorOnBackground">@color/wh_theme_onBackground</item>
-        <item name="colorSurface">@color/wh_theme_surface</item>
-        <item name="colorOnSurface">@color/wh_theme_onSurface</item>
-        <item name="colorSurfaceVariant">@color/wh_theme_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/wh_theme_onSurfaceVariant</item>
-        <item name="colorOutline">@color/wh_theme_outline</item>
-        <item name="colorOutlineVariant">@color/wh_theme_outlineVariant</item>
-        <item name="colorSurfaceInverse">@color/wh_theme_inverseSurface</item>
-        <item name="colorOnSurfaceInverse">@color/wh_theme_inverseOnSurface</item>
-        <item name="colorPrimaryInverse">@color/wh_theme_inversePrimary</item>
-        <item name="colorPrimaryFixed">@color/wh_theme_primaryFixed</item>
-        <item name="colorOnPrimaryFixed">@color/wh_theme_onPrimaryFixed</item>
-        <item name="colorPrimaryFixedDim">@color/wh_theme_primaryFixedDim</item>
-        <item name="colorOnPrimaryFixedVariant">@color/wh_theme_onPrimaryFixedVariant</item>
-        <item name="colorSecondaryFixed">@color/wh_theme_secondaryFixed</item>
-        <item name="colorOnSecondaryFixed">@color/wh_theme_onSecondaryFixed</item>
-        <item name="colorSecondaryFixedDim">@color/wh_theme_secondaryFixedDim</item>
-        <item name="colorOnSecondaryFixedVariant">@color/wh_theme_onSecondaryFixedVariant</item>
-        <item name="colorTertiaryFixed">@color/wh_theme_tertiaryFixed</item>
-        <item name="colorOnTertiaryFixed">@color/wh_theme_onTertiaryFixed</item>
-        <item name="colorTertiaryFixedDim">@color/wh_theme_tertiaryFixedDim</item>
-        <item name="colorOnTertiaryFixedVariant">@color/wh_theme_onTertiaryFixedVariant</item>
-        <item name="colorSurfaceDim">@color/wh_theme_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/wh_theme_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/wh_theme_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/wh_theme_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/wh_theme_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/wh_theme_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/wh_theme_surfaceContainerHighest</item>
-    </style>
-
 </resources>