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

Merge branch 'feature/follow-requests' into fork

Browse Source
This commit is contained in:
sk
2022-11-17 18:53:42 +01:00
parent 0c5cd2dc9e 521ba8766c
commit 7f0e2bf03d
12 changed files with 505 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<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">
<shape android:shape="oval">
<stroke android:color="?android:colorPrimary" android:width="2dp"/>
<solid android:color="@color/primary_600"/>
</shape>
</item>
</layer-list>

8
mastodon/src/main/res/menu/notifications.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/follow_requests"
android:icon="@drawable/ic_fluent_person_add_24_regular"
android:showAsAction="always"
android:title="@string/follow_requests" />
</menu>

3
mastodon/src/main/res/values-de-rDE/strings.xml
View File

@@ -406,11 +406,12 @@
<string name="no_update_available">Kein Update verfügbar</string>
<string name="list_timelines">Listen</string>
<string name="favorited_posts">Favorisierte Beiträge</string>
<string name="follow_requests">Folgeanfragen</string>
<string name="accept_follow_request">Folgeanfrage akzeptieren</string>
<string name="reject_follow_request">Folgeanfrage ablehnen</string>
<string name="lists_with_user">Listen mit %s</string>
<string name="privacy_policy_title">Mastodon und Ihre Privatsphäre</string>
<string name="privacy_policy_subtitle">Obwohl die Mastodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.</string>
<string name="i_agree">Ich stimme zu</string>
<string name="settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
<string name="settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
</resources>

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

@@ -416,6 +416,7 @@
<string name="i_agree">I Agree</string>
<string name="list_timelines">Lists</string>
<string name="favorited_posts">Favorited posts</string>
<string name="follow_requests">Follow requests</string>
<string name="accept_follow_request">Accept follow request</string>
<string name="reject_follow_request">Reject follow request</string>
<string name="lists_with_user">Lists with %s</string>