mirror of
https://github.com/PabloMK7/citra
synced 2024-11-15 05:08:23 +00:00
Merge pull request #6439 from t895/theme-adjustments
citra_android: Theme adjustments
This commit is contained in:
commit
9414db4f65
5 changed files with 15 additions and 3 deletions
|
@ -4,7 +4,8 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorSurface">
|
||||||
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
android:id="@+id/coordinator_cheats"
|
android:id="@+id/coordinator_cheats"
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/coordinator_main"
|
android:id="@+id/coordinator_main"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorSurface">
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
android:id="@+id/appbar"
|
android:id="@+id/appbar"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<color name="citra_onErrorContainer">#FFDAD6</color>
|
<color name="citra_onErrorContainer">#FFDAD6</color>
|
||||||
<color name="citra_background">#1E1B16</color>
|
<color name="citra_background">#1E1B16</color>
|
||||||
<color name="citra_onBackground">#E9E1D9</color>
|
<color name="citra_onBackground">#E9E1D9</color>
|
||||||
<color name="citra_surface">#1E1B16</color>
|
<color name="citra_surface">#1C1C1B</color>
|
||||||
<color name="citra_onSurface">#E9E1D9</color>
|
<color name="citra_onSurface">#E9E1D9</color>
|
||||||
<color name="citra_surfaceVariant">#4D4639</color>
|
<color name="citra_surfaceVariant">#4D4639</color>
|
||||||
<color name="citra_onSurfaceVariant">#D0C5B4</color>
|
<color name="citra_onSurfaceVariant">#D0C5B4</color>
|
||||||
|
|
|
@ -28,4 +28,13 @@
|
||||||
<item name="labelBehavior">gone</item>
|
<item name="labelBehavior">gone</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="Widget.Citra.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
|
||||||
|
<item name="materialThemeOverlay">@style/ThemeOverlay.Citra.FloatingActionButton</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="ThemeOverlay.Citra.FloatingActionButton" parent="">
|
||||||
|
<item name="colorContainer">@color/citra_primary</item>
|
||||||
|
<item name="colorOnContainer">@color/citra_onPrimary</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
<item name="popupMenuStyle">@style/CitraShapedPopup</item>
|
<item name="popupMenuStyle">@style/CitraShapedPopup</item>
|
||||||
<item name="popupTheme">@style/CitraPopup</item>
|
<item name="popupTheme">@style/CitraPopup</item>
|
||||||
<item name="sliderStyle">@style/CitraSlider</item>
|
<item name="sliderStyle">@style/CitraSlider</item>
|
||||||
|
<item name="floatingActionButtonStyle">@style/Widget.Citra.FloatingActionButton</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in a new issue