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

chore(merging-upstream): bunch of conflicts to solve

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mastodon/src/main/res/layout/item_profile_about.xml
View File

@@ -1,50 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingStart="16dp"
android:paddingTop="6dp"
android:paddingEnd="24dp"
android:paddingBottom="6dp">
<ImageView
android:id="@+id/verified_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:tint="?colorM3Primary"
android:contentDescription="@string/verified_link"
android:src="@drawable/ic_verified_24px"/>
android:paddingHorizontal="16dp">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_below="@id/value"
android:layout_toStartOf="@id/verified_icon"
android:textAppearance="@style/m3_body_medium"
android:minHeight="20dp"
android:textSize="14sp"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurfaceVariant"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="@style/m3_label_medium"
android:textAllCaps="true"
android:textSize="12sp"
android:paddingTop="6dp"
android:paddingBottom="2dp"
android:layout_marginEnd="4dp"
tools:text="Field title"/>
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/value"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/verified_icon"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:textSize="16sp"
android:minHeight="24dp"
android:gravity="center_vertical"
android:textIsSelectable="true"
android:paddingTop="6dp"
android:paddingBottom="2dp"
tools:text="Field value"/>
</RelativeLayout>
</LinearLayout>