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

Fixes

Browse Source
This commit is contained in:
Grishka
2022-03-31 20:54:49 +03:00
parent c60bc253e5
commit 10655e4c98
20 changed files with 171 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mastodon/src/main/res/layout/button_bar_two.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:windowBackground"
android:outlineProvider="bounds"
android:elevation="3dp"
tools:showIn="@layout/fragment_report_posts">
<Button
android:id="@+id/btn_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:minWidth="145dp"
style="?secondaryLargeButtonStyle"
android:text="@string/skip"/>
<Space
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<Button
android:id="@+id/btn_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:minWidth="145dp"
style="?primaryLargeButtonStyle"
android:text="@string/next" />
</LinearLayout>

2
mastodon/src/main/res/layout/fragment_report_comment.xml
View File

@@ -30,6 +30,6 @@
</ScrollView>
<include layout="@layout/button_bar_one"/>
<include layout="@layout/button_bar_two"/>
</LinearLayout>

2
mastodon/src/main/res/layout/fragment_report_posts.xml
View File

@@ -32,6 +32,6 @@
</FrameLayout>
<include layout="@layout/button_bar_one"/>
<include layout="@layout/button_bar_two"/>
</me.grishka.appkit.views.FragmentRootLinearLayout>

9
mastodon/src/main/res/layout/item_list_header.xml
View File

@@ -9,6 +9,15 @@
android:paddingTop="32dp"
android:paddingBottom="8dp">
<TextView
android:id="@+id/step_counter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
tools:text="@string/step_x_of_n"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"