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/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-ar/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-ja-rJP/strings_sk.xml
#	metadata/ar/short_description.txt
This commit is contained in:
LucasGGamerM
2023-09-11 16:47:24 -03:00
parent da54c93af1 380e4ff77e
commit 1ba30a4d28
49 changed files with 1737 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/layout/discover_info_banner.xml
View File

@@ -5,7 +5,9 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:padding="16dp"
android:background="@drawable/rect_12dp"
android:backgroundTint="?colorM3SurfaceVariant">

89
mastodon/src/main/res/layout/display_item_gap.xml
View File

@@ -1,24 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="75dp"
android:background="@drawable/bg_timeline_gap">
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/bg_timeline_gap_border">
<TextView
android:id="@+id/text"
<FrameLayout
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"
android:textAppearance="@style/m3_body_large"
android:textColor="?android:textColorSecondary"
android:text="@string/load_missing_posts"/>
android:layout_marginBottom="4dp"
android:background="?android:selectableItemBackground">
<ProgressBar
android:id="@+id/progress"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:visibility="gone"/>
<ProgressBar
android:id="@+id/progress_top"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:id="@+id/text_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingHorizontal="16dp"
android:paddingTop="24dp"
android:paddingBottom="20dp"
android:drawablePadding="16dp"
android:drawableEnd="@drawable/ic_fluent_chevron_double_down_20_filled"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
android:text="@string/sk_load_missing_posts_below"/>
</FrameLayout>
<TextView
android:id="@+id/gap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="20dp"
android:gravity="center"
android:textStyle="italic"
android:textColor="?colorM3Primary"
android:textAppearance="@style/m3_label_large"
android:background="@drawable/bg_timeline_gap"/>
<FrameLayout
android:id="@+id/bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="?android:selectableItemBackground">
<ProgressBar
android:id="@+id/progress_bottom"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:visibility="gone"/>
<TextView
android:id="@+id/text_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingHorizontal="16dp"
android:paddingTop="20dp"
android:paddingBottom="24dp"
android:drawablePadding="16dp"
android:drawableEnd="@drawable/ic_fluent_chevron_double_up_20_filled"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
android:text="@string/sk_load_missing_posts_above"/>
</FrameLayout>
</LinearLayout>