Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk
2023-01-25 10:44:10 +01:00
9 changed files with 59 additions and 123 deletions

View File

@@ -14,7 +14,17 @@
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<Button
android:id="@+id/btn_back"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
style="@style/Widget.Mastodon.M3.Button.Text"
android:text="@string/server_rules_disagree"/>
<Button
android:id="@+id/btn_next"