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

Notifications M3 redesign (+ read marker support)

Browse Source
This commit is contained in:
Grishka
2023-05-27 13:31:01 +03:00
parent 92335d8678
commit 5c480b37b3
44 changed files with 1075 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,10 @@
<attr name="colorM3PrimaryInverse" format="color"/>
<attr name="colorSensitiveOverlay" format="color"/>
<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" />
<attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/>

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

@@ -16,11 +16,11 @@
<string name="in_reply_to">In reply to %s</string>
<string name="notifications">Notifications</string>
<string name="user_followed_you">followed you</string>
<string name="user_sent_follow_request">sent you a follow request</string>
<string name="user_favorited">favorited your post</string>
<string name="notification_boosted">boosted your post</string>
<string name="poll_ended">poll ended</string>
<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="time_seconds">%ds</string>
<string name="time_minutes">%dm</string>
@@ -139,7 +139,7 @@
<string name="hashtags">Hashtags</string>
<string name="news">News</string>
<string name="for_you">For you</string>
<string name="all_notifications">All</string>
<string name="all_notifications">Everything</string>
<string name="mentions">Mentions</string>
<plurals name="x_people_talking">
<item quantity="one">%d person is talking</item>
@@ -502,4 +502,5 @@
<string name="report_sent_already_blocked">You’ve already blocked this user, so there’s nothing else you need to do while we review your report.</string>
<string name="report_personal_already_blocked">You’ve already blocked this user, so there’s nothing else you need to do.\n\nThanks for helping keep Mastodon a safe place for everyone!</string>
<string name="blocked_user">Blocked %s</string>
<string name="mark_all_notifications_read">Mark all as read</string>
</resources>

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

@@ -68,6 +68,10 @@
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_dark_primary</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="colorWindowBackground">?colorM3Background</item>
<item name="android:statusBarColor">?colorM3Background</item>
@@ -146,6 +150,10 @@
<item name="colorM3OnErrorContainer">#F9DEDC</item>
<item name="colorM3PrimaryInverse">@color/m3_sys_light_primary</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="colorWindowBackground">?colorM3Background</item>
<item name="android:statusBarColor">?colorM3Background</item>
@@ -357,6 +365,30 @@
<item name="android:textColor">?colorM3OnSurface</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButtonContainer" parent="">
<item name="android:divider">@drawable/divider_vertical_outline</item>
<item name="android:showDividers">middle</item>
<item name="android:foreground">@drawable/fg_segmented_button_container</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButton" parent="">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:background">@drawable/bg_segmented_button</item>
</style>
<style name="Widget.Mastodon.M3.SegmentedButtonText" parent="">
<item name="android:textAppearance">@style/m3_label_large</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:gravity">center_vertical</item>
<item name="android:drawablePadding">8dp</item>
<item name="android:textColor">@color/text_segmented_button</item>
<item name="android:duplicateParentState">true</item>
</style>
<style name="Theme.Mastodon.Toolbar.ProgressBar">
<item name="android:disabledAlpha">0</item>
</style>