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

Grouped notifications

Browse Source
This commit is contained in:
Grishka
2024-09-20 11:38:52 +03:00
parent 80323f8236
commit 26f7a75628
23 changed files with 758 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values/attrs.xml
View File

@@ -33,8 +33,6 @@
<attr name="colorWhite" format="color"/>
<attr name="colorFavorite" format="color" />
<attr name="colorBoost" format="color" />
<attr name="colorFollow" format="color" />
<attr name="colorPoll" format="color" />
<declare-styleable name="MaxWidthFrameLayout">
<attr name="android:maxWidth" format="dimension"/>

50
mastodon/src/main/res/values/colors.xml
View File

@@ -54,5 +54,55 @@
<color name="m3_sys_dark_outline">#938F99</color>
<color name="m3_sys_dark_outline_variant">#49454F</color>
<!-- extended colors -->
<color name="ext_favorite_light">#E89A00</color>
<color name="ext_favorite_light_high_contrast">#7B5800</color>
<color name="ext_favorite_light_medium_contrast">#CC9200</color>
<color name="ext_favorite_dark">#FFB014</color>
<color name="ext_on_favorite_light">#FFFFFF</color>
<color name="ext_on_favorite_light_high_contrast">#FFFFFF</color>
<color name="ext_on_favorite_light_medium_contrast">#FFFFFF</color>
<color name="ext_on_favorite_dark">#412D00</color>
<color name="ext_favorite_container_light">#FFC758</color>
<color name="ext_favorite_container_light_high_contrast">#FFC758</color>
<color name="ext_favorite_container_light_medium_contrast">#FFC758</color>
<color name="ext_favorite_container_dark">#F9B928</color>
<color name="ext_on_favorite_container_light">#503800</color>
<color name="ext_on_favorite_container_light_high_contrast">#503800</color>
<color name="ext_on_favorite_container_light_medium_contrast">#503800</color>
<color name="ext_on_favorite_container_dark">#463100</color>
<color name="ext_boost_light">#006C4E</color>
<color name="ext_boost_light_high_contrast">#006C4E</color>
<color name="ext_boost_light_medium_contrast">#006C4E</color>
<color name="ext_boost_dark">#48DEAB</color>
<color name="ext_on_boost_light">#FFFFFF</color>
<color name="ext_on_boost_light_high_contrast">#FFFFFF</color>
<color name="ext_on_boost_light_medium_contrast">#FFFFFF</color>
<color name="ext_on_boost_dark">#003827</color>
<color name="ext_boost_container_light">#25C896</color>
<color name="ext_boost_container_light_high_contrast">#25C896</color>
<color name="ext_boost_container_light_medium_contrast">#25C896</color>
<color name="ext_boost_container_dark">#00B384</color>
<color name="ext_on_boost_container_light">#002C1E</color>
<color name="ext_on_boost_container_light_high_contrast">#002C1E</color>
<color name="ext_on_boost_container_light_medium_contrast">#002C1E</color>
<color name="ext_on_boost_container_dark">#00130B</color>
<color name="ext_bookmark_light">#A2003E</color>
<color name="ext_bookmark_light_high_contrast">#A2003E</color>
<color name="ext_bookmark_light_medium_contrast">#A2003E</color>
<color name="ext_bookmark_dark">#FFB2BD</color>
<color name="ext_on_bookmark_light">#FFFFFF</color>
<color name="ext_on_bookmark_light_high_contrast">#FFFFFF</color>
<color name="ext_on_bookmark_light_medium_contrast">#FFFFFF</color>
<color name="ext_on_bookmark_dark">#670024</color>
<color name="ext_bookmark_container_light">#DF235E</color>
<color name="ext_bookmark_container_light_high_contrast">#DF235E</color>
<color name="ext_bookmark_container_light_medium_contrast">#DF235E</color>
<color name="ext_bookmark_container_dark">#D31656</color>
<color name="ext_on_bookmark_container_light">#FFFFFF</color>
<color name="ext_on_bookmark_container_light_high_contrast">#FFFFFF</color>
<color name="ext_on_bookmark_container_light_medium_contrast">#FFFFFF</color>
<color name="ext_on_bookmark_container_dark">#FFFFFF</color>
<item name="overlay_ripple_alpha" format="float" type="dimen">0.12</item>
</resources>

18
mastodon/src/main/res/values/strings.xml
View File

@@ -16,9 +16,8 @@
<string name="user_followed_you">%s followed you</string>
<string name="user_sent_follow_request">%s sent you a follow request</string>
<string name="user_favorited">%s favorited your post</string>
<string name="notification_boosted">%s boosted your post</string>
<string name="poll_ended">See the results of a poll you voted in</string>
<string name="user_favorited">%s favorited:</string>
<string name="notification_boosted">%s boosted:</string>
<string name="share_toot_title">Share</string>
<string name="settings">Settings</string>
@@ -784,4 +783,17 @@
<item quantity="one">%d attachment</item>
<item quantity="other">%d attachments</item>
</plurals>
<plurals name="user_and_x_more_favorited">
<item quantity="one">%1$s and %2$,d other favorited:</item>
<item quantity="other">%1$s and %2$,d others favorited:</item>
</plurals>
<plurals name="user_and_x_more_boosted">
<item quantity="one">%1$s and %2$,d other boosted:</item>
<item quantity="other">%1$s and %2$,d others boosted:</item>
</plurals>
<plurals name="poll_ended_x_voters">
<item quantity="one">%1$s ran a poll that you and %2$,d other voted in</item>
<item quantity="other">%1$s ran a poll that you and %2$,d others voted in</item>
</plurals>
<string name="own_poll_ended">Your poll has ended</string>
</resources>

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

@@ -56,10 +56,8 @@
<item name="colorM3SurfaceInverse">@color/m3_sys_dark_surface</item>
<item name="colorM3OnSurfaceInverse">@color/m3_sys_dark_on_surface</item>
<item name="colorWhite">#FFF</item>
<item name="colorFavorite">#8b5000</item>
<item name="colorBoost">#ab332a</item>
<item name="colorFollow">#4746e3</item>
<item name="colorPoll">#006d42</item>
<item name="colorFavorite">@color/ext_favorite_light</item>
<item name="colorBoost">@color/ext_boost_light</item>
<item name="android:statusBarColor">?colorM3Background</item>
<item name="android:navigationBarColor">@color/navigation_bar_bg_light</item>
@@ -126,10 +124,8 @@
<item name="colorM3SurfaceInverse">@color/m3_sys_light_surface</item>
<item name="colorM3OnSurfaceInverse">@color/m3_sys_light_on_surface</item>
<item name="colorWhite">#000</item>
<item name="colorFavorite">#ffb871</item>
<item name="colorBoost">#ffb4aa</item>
<item name="colorFollow">#c1c1ff</item>
<item name="colorPoll">#77daa1</item>
<item name="colorFavorite">@color/ext_favorite_dark</item>
<item name="colorBoost">@color/ext_boost_dark</item>
<item name="android:statusBarColor">?colorM3Background</item>
<item name="android:navigationBarColor">?colorM3Background</item>