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

Notification requests (AND-154)

Browse Source
This commit is contained in:
Grishka
2024-03-20 23:18:04 +03:00
parent f888091e22
commit 441567f9d2
34 changed files with 1053 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="app_name" translatable="false">Mastodon</string>
<string name="log_in">Log in</string>
@@ -728,4 +728,23 @@
<string name="mute_conversation">Mute conversation</string>
<string name="unmute_conversation">Unmute conversation</string>
<string name="visibility_unlisted">Quiet public</string>
<string name="filtered_notifications">Filtered notifications</string>
<string name="filter_notifications">Filter out notifications from...</string>
<string name="notification_filter_following">People you don’t follow</string>
<string name="notification_filter_following_explanation">Until you manually approve them</string>
<string name="notification_filter_followers">People not following you</string>
<string name="notification_filter_followers_explanation">Including people who have been following you fewer than 3 days</string>
<string name="notification_filter_new_accounts">New accounts</string>
<string name="notification_filter_new_accounts_explanation">Created within the past 30 days</string>
<string name="notification_filter_mentions">Unsolicited private mentions</string>
<string name="notification_filter_mentions_explanation">Filtered unless it’s in reply to your own mention or if you follow the sender</string>
<string name="allow_notifications">Allow notifications</string>
<string name="mute_notifications">Mute notifications</string>
<plurals name="x_people_you_may_know">
<item quantity="one">%,d person you may know</item>
<item quantity="other">%,d people you may know</item>
</plurals>
<string name="notifications_from_user">Notifications from %s</string>
<string name="notifications_muted">Notifications from %s will be muted.</string>
<string name="notifications_allowed">%s will now appear in your notification list.</string>
</resources>

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

@@ -215,6 +215,8 @@
<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<!-- it's unfortunate that https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/com/android/internal/widget/DialogTitle.java exists -->
<item name="android:textAppearanceMedium">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
@@ -229,6 +231,7 @@
<style name="Theme.Mastodon.Dialog.Alert.Dark" parent="android:Theme.Material.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<item name="android:textAppearanceMedium">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>
<item name="android:windowBackground">@drawable/bg_alert</item>
<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
@@ -314,6 +317,7 @@
<style name="Widget.Mastodon.M3.Button.Outlined">
<item name="android:background">@drawable/bg_button_m3_outlined</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:tint">@color/action_bar_icons</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
</style>