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

fix badged toolbar icons with new appkit version

This commit is contained in:
sk 2023-06-05 18:07:22 +02:00
parent 3d24b2de10
commit ac4458e106
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonToolbarFragment.java
View File

@ -30,4 +30,9 @@ public abstract class MastodonToolbarFragment extends ToolbarFragment{
toolbar.setNavigationContentDescription(R.string.back); toolbar.setNavigationContentDescription(R.string.back);
} }
} }
@Override
protected boolean wantsToolbarMenuIconsTinted() {
return false; // else, badged icons don't work :(
}
} }

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

@ -3,7 +3,7 @@
<item android:drawable="@drawable/ic_fluent_megaphone_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/> <item android:drawable="@drawable/ic_fluent_megaphone_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
<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="?appkitToolbarBackground" android:width="2dp"/>
<solid android:color="?android:colorAccent"/> <solid android:color="?android:colorAccent"/>
</shape> </shape>
</item> </item>

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

@ -3,7 +3,7 @@
<item android:drawable="@drawable/ic_fluent_person_add_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/> <item android:drawable="@drawable/ic_fluent_person_add_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
<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="?appkitToolbarBackground" android:width="2dp"/>
<solid android:color="?android:colorAccent"/> <solid android:color="?android:colorAccent"/>
</shape> </shape>
</item> </item>

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

@ -3,7 +3,7 @@
<item android:drawable="@drawable/ic_fluent_settings_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/> <item android:drawable="@drawable/ic_fluent_settings_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
<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="?appkitToolbarBackground" android:width="2dp"/>
<solid android:color="?android:colorAccent"/> <solid android:color="?android:colorAccent"/>
</shape> </shape>
</item> </item>