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

Support for invite links (AND-90)

Browse Source
This commit is contained in:
Grishka
2024-01-03 23:51:35 +03:00
parent 5d7c37262e
commit 48f9aabaf7
19 changed files with 559 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
mastodon/src/main/res/layout/alert_invite_link.xml Normal file
View File

@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="24dp"
android:paddingTop="24dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="@style/m3_headline_small"
android:textColor="?colorM3OnSurface"
android:drawableTop="@drawable/ic_confirmation_number_24px"
android:drawableTint="?colorM3Secondary"
android:drawablePadding="16dp"
android:text="@string/enter_invite_link"/>
<TextView
android:id="@+id/subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="@string/need_invite_to_join_server"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="76dp"
android:layout_marginTop="16dp">
<EditText
android:id="@+id/edit"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@drawable/bg_m3_filled_text_field"
android:paddingHorizontal="16dp"
android:textColorHint="?colorM3OnSurfaceVariant"
android:textColor="?colorM3OnSurface"
android:gravity="start|bottom"
android:paddingBottom="8dp"
android:singleLine="true"
android:inputType="textUri"
android:textAppearance="@style/m3_body_large"
android:hint="example.social/invite/AbC123"/>
<TextView
android:id="@+id/label"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:layout_gravity="top"
android:paddingEnd="23dp"
android:textAppearance="@style/m3_body_small"
android:textColor="?colorM3OnSurfaceVariant"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/server_url"/>
<TextView
android:id="@+id/supporting_text"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_marginHorizontal="16dp"
android:layout_gravity="bottom"
android:textAppearance="@style/m3_body_small"
android:textColor="?colorM3OnSurfaceVariant"
android:singleLine="true"
android:ellipsize="end"
android:text=""/>
<ImageButton
android:id="@+id/clear"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="4dp"
android:layout_gravity="end|top"
android:src="@drawable/ic_m3_cancel"
android:background="?android:actionBarItemBackground"
android:contentDescription="@string/clear"/>
</FrameLayout>
</LinearLayout>

14
mastodon/src/main/res/layout/fragment_onboarding_common.xml
View File

@@ -125,25 +125,15 @@
android:orientation="vertical"
android:background="@drawable/bg_onboarding_panel">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:textAppearance="@style/m3_body_small"
android:textColor="?colorM3OnSurfaceVariant"
android:text="@string/signup_random_server_explain"/>
<Button
android:id="@+id/btn_random_instance"
android:id="@+id/btn_use_invite"
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/pick_server_for_me"/>
android:text="@string/use_invite_link"/>
<Button
android:id="@+id/btn_next"

6
mastodon/src/main/res/layout/progress_bar.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ProgressBar>