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/MediaGridStatusDisplayItem.java
This commit is contained in:
LucasGGamerM
2023-05-16 18:26:23 -03:00
parent c3b5bb409b a9ab9cb249
commit d403f4ef01
26 changed files with 839 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mastodon/src/main/res/layout/item_discover_account.xml
View File

@@ -56,9 +56,9 @@
<TextView
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_alignLeft="@id/name"
android:layout_alignRight="@id/name"
android:layout_height="wrap_content"
android:layout_alignStart="@id/name"
android:layout_alignEnd="@id/name"
android:layout_below="@id/name"
android:singleLine="true"
android:ellipsize="end"
@@ -87,15 +87,18 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingBottom="16dp"
android:layout_marginStart="16dp">
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:layout_gravity="bottom"
android:paddingTop="4dp"
android:gravity="center_vertical"
android:minHeight="44dp">
<LinearLayout
android:id="@+id/posts_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -122,7 +125,7 @@
android:id="@+id/following_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -149,7 +152,7 @@
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView