owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'proper_implementation_of_the_color_picker'

Browse Source 
Just fixing stuff here and there
This commit is contained in:
LucasGGamerM
2022-12-05 17:47:03 -03:00
parent db4c1bfe47 10779717cf
commit cf99bf5152
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml
View File

@@ -4,7 +4,7 @@
<item android:width="14dp" android:height="14dp" android:gravity="top|right"> <item android:width="14dp" android:height="14dp" android:gravity="top|right">
<shape android:shape="oval"> <shape android:shape="oval">
<stroke android:color="?android:colorPrimary" android:width="2dp"/> <stroke android:color="?android:colorPrimary" android:width="2dp"/>
<solid android:color="@color/primary_600"/> <solid android:color="?android:colorAccent"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

14
mastodon/src/main/res/values/styles.xml
View File

@@ -130,7 +130,7 @@
<item name="colorButtonText">@color/custom_gray_800</item> <item name="colorButtonText">@color/custom_gray_800</item>
<item name="colorBackgroundLight">@color/custom_gray_700</item> <item name="colorBackgroundLight">@color/custom_gray_700</item>
<item name="colorBackgroundLightest">@color/custom_gray_900</item> <item name="colorBackgroundLightest">@color/custom_gray_900</item>
<item name="colorBackgroundPopup">?colorBackgroundLightest</item> <item name="colorBackgroundPopup">@color/custom_gray_900</item>
<item name="colorDarkIcon">@color/gray_25</item> <item name="colorDarkIcon">@color/gray_25</item>
<item name="colorWindowBackground">@color/custom_gray_800</item> <item name="colorWindowBackground">@color/custom_gray_800</item>
<item name="android:statusBarColor">@color/custom_gray_800</item> <item name="android:statusBarColor">@color/custom_gray_800</item>
@@ -568,14 +568,14 @@
</style> </style>
<style name="Theme.Mastodon.Toolbar.Profile"> <style name="Theme.Mastodon.Toolbar.Profile">
<item name="android:textColorPrimary">@color/gray_50</item> <item name="android:textColorPrimary">?android:colorPrimary</item>
<item name="android:textColorSecondary">@color/gray_50</item> <item name="android:textColorSecondary">?android:colorPrimary</item>
<item name="android:drawableTint">@color/gray_50</item> <item name="android:drawableTint">?android:colorPrimary</item>
<item name="android:popupTheme">@style/Theme.Mastodon.AutoLightDark</item> <item name="android:popupTheme">?android:actionBarTheme</item>
<item name="android:titleTextAppearance">@style/m3_title_medium</item> <item name="android:titleTextAppearance">@style/m3_title_medium</item>
<item name="android:titleTextColor">@color/gray_50</item> <item name="android:titleTextColor">?android:colorPrimary</item>
<item name="android:subtitleTextAppearance">@style/m3_body_medium</item> <item name="android:subtitleTextAppearance">@style/m3_body_medium</item>
<item name="android:subtitleTextColor">@color/gray_50</item> <item name="android:subtitleTextColor">?android:colorPrimary</item>
</style> </style>
<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button"> <style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">