TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 10:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding text color tertiary to the sheet's theme

Browse Source
This commit is contained in:
ThomasSession 2024-09-02 15:10:17 +10:00 committed by fanchao
parent ed3cd4be24
commit 8b10527125
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/reactions_pill.xml
View File

@ -27,7 +27,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="11sp" android:textSize="11sp"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:textColor="?android:textColorTertiary" android:textColor="?android:textColorPrimary"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
tools:text="23" tools:text="23"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />

2
app/src/main/res/layout/reactions_pill_large.xml
View File

@ -27,7 +27,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:textColor="?android:textColorTertiary" android:textColor="?android:textColorPrimary"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
tools:text="23" tools:text="23"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />

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

@ -248,29 +248,33 @@
<item name="colorPrimary">@color/classic_dark_0</item> <item name="colorPrimary">@color/classic_dark_0</item>
<item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item> <item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
<item name="dialog_border">@color/transparent_black_15</item> <item name="dialog_border">@color/transparent_black_15</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/classic_dark_6</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item> <item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/classic_dark_5</item>
</style> </style>
<style name="Classic.Light.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog"> <style name="Classic.Light.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog">
<item name="colorPrimary">@color/classic_light_5</item> <item name="colorPrimary">@color/classic_light_5</item>
<item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item> <item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
<item name="dialog_border">@color/transparent_black_15</item> <item name="dialog_border">@color/transparent_black_15</item>
<item name="android:textColorPrimary">@color/black</item> <item name="android:textColorPrimary">@color/classic_light_0</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item> <item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/classic_light_1</item>
</style> </style>
<style name="Ocean.Dark.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog"> <style name="Ocean.Dark.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog">
<item name="colorPrimary">@color/ocean_dark_3</item> <item name="colorPrimary">@color/ocean_dark_3</item>
<item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item> <item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
<item name="dialog_border">@color/transparent_black_15</item> <item name="dialog_border">@color/transparent_black_15</item>
<item name="android:textColorPrimary">@color/white</item> <item name="android:textColorPrimary">@color/ocean_dark_7</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item> <item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/ocean_dark_5</item>
</style> </style>
<style name="Ocean.Light.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog"> <style name="Ocean.Light.BottomSheet" parent="Theme.MaterialComponents.BottomSheetDialog">
<item name="colorPrimary">@color/ocean_light_6</item> <item name="colorPrimary">@color/ocean_light_6</item>
<item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item> <item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
<item name="dialog_border">@color/transparent_black_15</item> <item name="dialog_border">@color/transparent_black_15</item>
<item name="android:textColorPrimary">@color/black</item> <item name="android:textColorPrimary">@color/ocean_light_1</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item> <item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/ocean_light_2</item>
</style> </style>
<style name="Dark.Popup" parent="@style/ThemeOverlay.AppCompat.Dark"> <style name="Dark.Popup" parent="@style/ThemeOverlay.AppCompat.Dark">