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

Merge branch 'main' into feature/mark-media-as-sensitive

Browse Source
This commit is contained in:
sk
2022-11-16 22:38:20 +01:00
parent 40d478aaec a336f6be89
commit 0c854a893b
71 changed files with 1830 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mastodon/src/main/res/layout/button_bar_activation.xml Normal file
View File

@@ -0,0 +1,39 @@
<?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="?colorBackgroundLight"
android:clipToPadding="false"
android:elevation="3dp"
android:orientation="horizontal"
android:outlineProvider="bounds"
android:gravity="center_vertical"
tools:showIn="@layout/fragment_onboarding_activation">
<Button
android:id="@+id/btn_back"
style="?secondaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/resend" />
<Button
android:id="@+id/btn_next"
style="?primaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="16dp"
android:layout_weight="1"
android:text="@string/open_email_app" />
</LinearLayout>

37
mastodon/src/main/res/layout/fragment_onboarding_activation.xml
View File

@@ -51,41 +51,6 @@
</ScrollView>
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorBackgroundLight"
android:outlineProvider="bounds"
android:orientation="horizontal"
android:clipToPadding="false"
android:elevation="3dp">
<Button
android:id="@+id/btn_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="?secondaryLargeButtonStyle"
android:text="@string/resend"/>
<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_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="?primaryLargeButtonStyle"
android:text="@string/open_email_app" />
</LinearLayout>
<include layout="@layout/button_bar_activation" />
</me.grishka.appkit.views.FragmentRootLinearLayout>

6
mastodon/src/main/res/layout/item_instance_category.xml
View File

@@ -4,8 +4,8 @@
android:orientation="vertical"
android:layout_width="120dp"
android:layout_height="72dp"
android:paddingTop="13dp"
android:paddingBottom="13dp">
android:paddingTop="12dp"
android:paddingBottom="12dp">
<ImageView
android:id="@+id/emoji"
@@ -17,7 +17,7 @@
<TextView
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:textAllCaps="true"
android:textColor="?android:textColorPrimary"