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

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml
This commit is contained in:
LucasGGamerM
2023-04-14 14:27:42 -03:00
parent 3df62d2516 15fcb0e25d
commit 665a0176b9
63 changed files with 1181 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@
android:gravity="center"
android:includeFontPadding="false"
android:paddingHorizontal="5dp"
android:paddingVertical="1dp"
android:paddingVertical="2dp"
android:background="@drawable/bg_image_alt_overlay"
android:text="@string/sk_alt_button"/>

16
mastodon/src/main/res/layout/display_item_header.xml
View File

@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="13dp"
android:paddingEnd="4dp"
android:paddingStart="16dp">
@@ -11,6 +10,7 @@
android:id="@+id/more"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:background="?android:actionBarItemBackground"
@@ -23,6 +23,7 @@
android:id="@+id/delete_notification"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/more"
android:visibility="gone"
android:background="?android:actionBarItemBackground"
@@ -36,6 +37,7 @@
android:id="@+id/visibility"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/delete_notification"
android:background="?android:actionBarItemBackground"
android:scaleType="center"
@@ -46,6 +48,7 @@
android:id="@+id/collapse_btn"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/visibility"
android:background="?android:actionBarItemBackground"
android:visibility="gone"
@@ -70,6 +73,7 @@
android:id="@+id/unread_indicator"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/collapse_btn"
android:visibility="gone"
android:tint="?android:colorAccent"
@@ -83,18 +87,16 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp"
android:layout_marginTop="3dp" />
android:layout_marginTop="16dp" />
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:id="@+id/name_wrap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="3dp"
android:paddingTop="3sp"
android:layout_toStartOf="@id/unread_indicator"
android:layout_toEndOf="@id/avatar"
android:minHeight="24sp">
android:layout_above="@+id/username_wrap">
<TextView
android:id="@+id/name"
@@ -121,13 +123,15 @@
</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:id="@id/username_wrap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/name_wrap"
android:layout_marginEnd="8dp"
android:layout_toStartOf="@id/unread_indicator"
android:layout_toEndOf="@id/avatar"
android:layout_alignBottom="@id/avatar"
android:layoutDirection="locale"
android:paddingBottom="3sp"
android:orientation="horizontal">
<TextView

12
mastodon/src/main/res/layout/fragment_compose.xml
View File

@@ -73,7 +73,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
@@ -81,6 +80,7 @@
android:id="@+id/self_avatar"
android:layout_width="46sp"
android:layout_height="46sp"
android:layout_marginTop="16dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" />
@@ -90,8 +90,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/self_avatar"
android:paddingTop="3sp"
android:minHeight="24sp"
android:layout_above="@+id/self_username"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
@@ -103,7 +102,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8sp"
android:layout_toEndOf="@id/self_name"
android:paddingTop="3sp"
android:layout_above="@id/self_username"
android:ellipsize="end"
android:fontFamily="sans-serif"
android:singleLine="true"
@@ -112,14 +111,15 @@
tools:text="@string/sk_local_only" />
<TextView
android:id="@+id/self_username"
android:id="@id/self_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/self_name"
android:layout_toEndOf="@id/self_avatar"
android:layout_alignBottom="@id/self_avatar"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_small"
android:paddingBottom="3sp"
tools:text="\@Gargron" />
</RelativeLayout>

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

@@ -5,7 +5,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:clipToPadding="false">
android:clipToPadding="false"
android:theme="@style/Theme.Mastodon.Dark.SplashFragment">
<View
android:id="@+id/blue_fill"
@@ -26,7 +27,8 @@
android:id="@+id/art_clouds"
android:layout_width="414dp"
android:layout_height="541dp"
android:layout_marginTop="91dp"
android:layout_marginTop="37dp"
android:layout_marginLeft="-27dp"
android:layout_gravity="top|left"
android:alpha="0.3"
android:importantForAccessibility="no"
@@ -36,8 +38,8 @@
android:id="@+id/art_plane_elephant"
android:layout_width="245.64dp"
android:layout_height="72.65dp"
android:layout_marginLeft="-101.55dp"
android:layout_marginTop="238.12dp"
android:layout_marginLeft="-50.775dp"
android:layout_marginTop="184.12dp"
android:layout_gravity="left|top"
android:alpha="0.3"
android:importantForAccessibility="no"
@@ -48,8 +50,8 @@
android:layout_width="150.84dp"
android:layout_height="176.44dp"
android:layout_gravity="top|left"
android:layout_marginLeft="322dp"
android:layout_marginTop="310dp"
android:layout_marginLeft="278dp"
android:layout_marginTop="244dp"
android:importantForAccessibility="no"
android:src="@drawable/splash_art_layer1"/>
@@ -58,7 +60,8 @@
android:layout_width="197.2dp"
android:layout_height="153.61dp"
android:layout_gravity="top|left"
android:layout_marginTop="294dp"
android:layout_marginTop="252dp"
android:layout_marginLeft="-44dp"
android:importantForAccessibility="no"
android:src="@drawable/splash_art_layer2"/>
@@ -67,7 +70,8 @@
android:layout_width="400dp"
android:layout_height="346dp"
android:layout_gravity="top|left"
android:layout_marginTop="294dp"
android:layout_marginTop="240dp"
android:layout_marginLeft="-20dp"
android:importantForAccessibility="no"
android:src="@drawable/splash_art_layer3"/>
@@ -86,61 +90,108 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:orientation="vertical">
<ImageView
android:layout_width="300dp"
android:layout_height="78dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="32dp"
android:importantForAccessibility="no"
android:src="@drawable/splash_logo"/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0dp"
<Space
android:layout_width="1px"
android:layout_height="0px"
android:layout_weight="1"/>
<LinearLayout
android:id="@+id/pager_dots"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="16dp"
android:orientation="horizontal">
<View
android:layout_width="8dp"
android:layout_height="8dp"/>
<!-- android:background="@drawable/white_circle"/>-->
<View
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:alpha="0.3"/>
<!-- android:background="@drawable/white_circle"-->
<View
android:layout_width="8dp"
android:layout_height="8dp"
android:alpha="0.3"/>
<!-- android:background="@drawable/white_circle"-->
</LinearLayout>
<Button
android:id="@+id/btn_log_in"
android:id="@+id/btn_join_default_server"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
style="@style/Widget.Mastodon.M3.Button.Text"
android:textColor="#fff"
android:text="@string/already_have_account"/>
style="@style/Widget.Mastodon.M3.Button.Filled"
tools:text="@string/join_default_server"/>
<Button
android:id="@+id/btn_get_started"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
style="@style/Widget.Mastodon.M3.Button.Filled"
android:text="@string/get_started"/>
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"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:background="#B2FFFFFF"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:textAllCaps="true"
android:textAppearance="@style/m3_label_large"
android:textColor="#B2FFFFFF"
android:layout_gravity="center_vertical"
android:text="@string/signup_or_login"/>
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:background="#B2FFFFFF"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp">
<Button
android:id="@+id/btn_learn_more"
android:layout_width="0dp"
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
android:id="@+id/btn_log_in"
android:layout_width="0dp"
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>
</LinearLayout>
</org.joinmastodon.android.ui.views.SizeListenerFrameLayout>

50
mastodon/src/main/res/layout/intro_bottom_sheet.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_bottom_sheet"
android:padding="16dp">
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_bottom_sheet_handle"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_headline_medium"
android:textColor="?colorM3OnSurface"
android:text="@string/welcome_to_mastodon"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:text="@string/welcome_paragraph1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:textAppearance="@style/m3_headline_medium"
android:textColor="?colorM3OnSurface"
android:text="@string/what_are_servers"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:text="@string/welcome_paragraph2"/>
</LinearLayout>
</ScrollView>

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

@@ -26,7 +26,7 @@
android:gravity="center"
android:includeFontPadding="false"
android:paddingHorizontal="5dp"
android:paddingVertical="1dp"
android:paddingVertical="2dp"
android:text="@string/sk_alt_button"/>
<ImageButton