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

Merge branch 'master' into m3_redesign

Browse Source 
# Conflicts:
#	mastodon/build.gradle
This commit is contained in:
Grishka
2023-04-12 19:41:39 +03:00
parent dc25e16c00 0a17ceb984
commit 9e116bec97
63 changed files with 1421 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:clipToPadding="false"
android:theme="@style/Theme.Mastodon.Dark">
android:theme="@style/Theme.Mastodon.Dark.SplashFragment">
<View
android:id="@+id/blue_fill"
@@ -120,7 +120,9 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:textColor="#FFF"
style="@style/Widget.Mastodon.M3.Button.Outlined"
android:background="@drawable/bg_button_m3_outlined_white"
android:text="@string/pick_server"/>
@@ -137,7 +139,7 @@
android:layout_height="1dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:background="?colorM3Secondary"/>
android:background="#B2FFFFFF"/>
<TextView
android:layout_width="wrap_content"
@@ -146,7 +148,7 @@
android:layout_marginRight="8dp"
android:textAllCaps="true"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:textColor="#B2FFFFFF"
android:layout_gravity="center_vertical"
android:text="@string/signup_or_login"/>
@@ -155,7 +157,7 @@
android:layout_height="1dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:background="?colorM3Secondary"/>
android:background="#B2FFFFFF"/>
</LinearLayout>
@@ -172,7 +174,9 @@
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:textColor="#FFF"
style="@style/Widget.Mastodon.M3.Button.Text"
android:background="@drawable/bg_button_m3_text_white"
android:text="@string/learn_more"/>
<Button
@@ -181,7 +185,9 @@
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1"
android:textColor="#FFF"
style="@style/Widget.Mastodon.M3.Button.Text"
android:background="@drawable/bg_button_m3_text_white"
android:text="@string/log_in"/>
</LinearLayout>