Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: fix toolbar theme

Browse Source
This commit is contained in:
BreadFish64 2020-05-05 12:57:21 -05:00 committed by xperia64
parent b0a367d7ae
commit 5155c09e1b
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/res/layout/activity_main.xml
View File

@ -14,15 +14,13 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_main"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?colorPrimary"
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight" />
android:background="?colorPrimary"/>
</com.google.android.material.appbar.AppBarLayout>

14
src/android/app/src/main/res/values/styles.xml
View File

@ -16,21 +16,17 @@
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorControlHighlight">?attr/colorAccent</item>
<item name="toolbarStyle">@style/CustomToolBarStyle</item>
</style>
<!-- Same as above, but use default action bar, and mandate margins. -->
<style name="CitraSettingsBase" parent="Theme.AppCompat.DayNight.DarkActionBar">
<style name="CitraSettingsBase" parent="Theme.AppCompat.DayNight">
<item name="colorPrimary">@color/citra_orange</item>
<item name="colorPrimaryDark">@color/citra_orange_dark</item>
<item name="colorAccent">@color/citra_accent</item>
<item name="toolbarStyle">@style/CustomToolBarStyle</item>
</style>
<!-- Inherit from the Base Citra Dialog Theme -->
<style name="CitraEmulationBase" parent="Theme.AppCompat.DayNight.DarkActionBar">
<style name="CitraEmulationBase" parent="Theme.AppCompat.DayNight">
<item name="colorPrimary">@color/citra_orange</item>
<item name="colorPrimaryDark">@color/citra_orange_dark</item>
<item name="colorAccent">@color/citra_accent</item>
@ -42,8 +38,6 @@
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="toolbarStyle">@style/CustomToolBarStyle</item>
</style>
<!-- Inherit from a base file picker theme that handles day/night -->
@ -69,8 +63,4 @@
<item name="colorAccent">@color/citra_accent</item>
</style>
<style name="CustomToolBarStyle" parent="@style/Widget.AppCompat.Toolbar">
<item name="titleTextColor">@color/header_text</item>
</style>
</resources>