N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6439 from t895/theme-adjustments

Browse source 
citra_android: Theme adjustments
This commit is contained in:
bunnei 2023-04-20 17:02:46 -07:00 committed by GitHub
commit 9414db4f65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/app/src/main/res/layout/activity_cheats.xml
View file

@ -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"

3
src/android/app/src/main/res/layout/activity_main.xml
View file

@ -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"

2
src/android/app/src/main/res/values-night/citra_colors.xml
View file

@ -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>

9
src/android/app/src/main/res/values/styles.xml
View file

@ -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>

1
src/android/app/src/main/res/values/themes.xml
View file

@ -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>