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

add accept/decline buttons

Browse Source
This commit is contained in:
sk
2022-11-12 01:10:52 +01:00
parent ae50e618c0
commit 5fa81e6c8a
5 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mastodon/src/main/res/layout/item_discover_account.xml
View File

@@ -156,6 +156,35 @@
android:layout_height="1px"
android:layout_weight="1"/>
<FrameLayout
android:id="@+id/reject_btn_wrap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:clipToPadding="false"
android:paddingVertical="8dp"
android:visibility="gone">
<org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/reject_btn"
style="?secondaryButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_fluent_dismiss_24_filled"
android:singleLine="true"/>
<ProgressBar
android:id="@+id/reject_progress"
style="?android:progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:elevation="10dp"
android:indeterminate="true"
android:outlineProvider="none"
android:visibility="gone"/>
</FrameLayout>
<FrameLayout
android:id="@+id/action_btn_wrap"
android:layout_width="wrap_content"
@@ -169,6 +198,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
tools:text="@string/follow_back"/>
<ProgressBar
android:id="@+id/action_progress"

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

@@ -377,4 +377,6 @@
<!-- %s is file size -->
<string name="download_update">Download (%s)</string>
<string name="install_update">Installieren</string>
<string name="accept_follow_request">Folgeanfrage akzeptieren</string>
<string name="reject_follow_request">Folgeanfrage ablehnen</string>
</resources>

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

@@ -387,4 +387,6 @@
<string name="privacy_policy_title">Mastodon and your privacy</string>
<string name="privacy_policy_subtitle">Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.</string>
<string name="i_agree">I Agree</string>
<string name="accept_follow_request">Accept follow request</string>
<string name="reject_follow_request">Reject follow request</string>
</resources>