TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1235 from bemusementpark/fix-colorControlHighlight

Browse Source 
Fix back button background in light themes
This commit is contained in:
Morgan Pretty 2023-06-05 14:44:51 +10:00 committed by GitHub
commit 6b006b9d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/values/themes.xml
View File

@ -303,7 +303,6 @@
<item name="dividerHorizontal">?dividerVertical</item>
<item name="message_received_background_color">#F2F2F2</item>
<item name="colorAccent">@color/classic_accent</item>
<item name="colorControlHighlight">?android:colorControlHighlight</item>
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
</style>
@ -312,7 +311,6 @@
<item name="dividerHorizontal">?dividerVertical</item>
<item name="message_received_background_color">#F2F2F2</item>
<item name="colorAccent">@color/ocean_accent</item>
<item name="colorControlHighlight">?android:colorControlHighlight</item>
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
</style>
@ -338,6 +336,7 @@
<item name="colorSettingsBackground">@color/classic_dark_1</item>
<item name="colorDividerBackground">@color/classic_dark_3</item>
<item name="android:colorControlHighlight">@color/classic_dark_3</item>
<item name="colorControlHighlight">@color/classic_dark_3</item>
<item name="actionBarPopupTheme">@style/Dark.Popup</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
@ -410,6 +409,7 @@
<item name="colorSettingsBackground">@color/classic_light_5</item>
<item name="colorDividerBackground">@color/classic_light_3</item>
<item name="android:colorControlHighlight">@color/classic_light_3</item>
<item name="colorControlHighlight">@color/classic_light_3</item>
<item name="bottomSheetDialogTheme">@style/Classic.Light.BottomSheet</item>
<item name="android:actionMenuTextColor">?android:textColorPrimary</item>
<item name="popupTheme">?actionBarPopupTheme</item>
@ -496,6 +496,7 @@
<item name="colorSettingsBackground">@color/ocean_dark_1</item>
<item name="colorDividerBackground">@color/ocean_dark_4</item>
<item name="android:colorControlHighlight">@color/ocean_dark_4</item>
<item name="colorControlHighlight">@color/ocean_dark_4</item>
<item name="bottomSheetDialogTheme">@style/Ocean.Dark.BottomSheet</item>
<item name="popupTheme">?actionBarPopupTheme</item>
<item name="actionMenuTextColor">?android:textColorPrimary</item>
@ -576,6 +577,7 @@
<item name="colorSettingsBackground">@color/ocean_light_6</item>
<item name="colorDividerBackground">@color/ocean_light_3</item>
<item name="android:colorControlHighlight">@color/ocean_light_4</item>
<item name="colorControlHighlight">@color/ocean_light_4</item>
<item name="bottomSheetDialogTheme">@style/Ocean.Light.BottomSheet</item>
<item name="actionBarPopupTheme">@style/Light.Popup</item>
<item name="popupTheme">?actionBarPopupTheme</item>