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

Pull user row into a separate view holder & update its design

Browse Source
This commit is contained in:
Grishka
2023-05-11 03:45:23 +03:00
parent cfabe47e10
commit e253d8f4f3
11 changed files with 378 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mastodon/src/main/res/drawable/ic_check_small_16px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="@android:color/white"
android:pathData="M6.333,11.729 L3,8.396 4.062,7.333 6.333,9.604 11.938,4 13,5.062Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_help_16px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M10,15Q10.417,15 10.708,14.708Q11,14.417 11,14Q11,13.583 10.708,13.292Q10.417,13 10,13Q9.583,13 9.292,13.292Q9,13.583 9,14Q9,14.417 9.292,14.708Q9.583,15 10,15ZM9.25,11.812H10.771Q10.771,11.042 10.906,10.719Q11.042,10.396 11.562,9.896Q12.292,9.188 12.573,8.688Q12.854,8.188 12.854,7.583Q12.854,6.438 12.073,5.719Q11.292,5 10.083,5Q9.021,5 8.24,5.562Q7.458,6.125 7.146,7.083L8.5,7.646Q8.688,7.062 9.094,6.74Q9.5,6.417 10.042,6.417Q10.625,6.417 11,6.75Q11.375,7.083 11.375,7.625Q11.375,8.104 11.052,8.479Q10.729,8.854 10.333,9.208Q9.604,9.875 9.427,10.302Q9.25,10.729 9.25,11.812ZM10,18Q8.354,18 6.896,17.375Q5.438,16.75 4.344,15.656Q3.25,14.562 2.625,13.104Q2,11.646 2,10Q2,8.333 2.625,6.885Q3.25,5.438 4.344,4.344Q5.438,3.25 6.896,2.625Q8.354,2 10,2Q11.667,2 13.115,2.625Q14.562,3.25 15.656,4.344Q16.75,5.438 17.375,6.885Q18,8.333 18,10Q18,11.646 17.375,13.104Q16.75,14.562 15.656,15.656Q14.562,16.75 13.115,17.375Q11.667,18 10,18ZM10,16.5Q12.708,16.5 14.604,14.604Q16.5,12.708 16.5,10Q16.5,7.292 14.604,5.396Q12.708,3.5 10,3.5Q7.292,3.5 5.396,5.396Q3.5,7.292 3.5,10Q3.5,12.708 5.396,14.604Q7.292,16.5 10,16.5ZM10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Q10,10 10,10Z"/>
</vector>

4
mastodon/src/main/res/drawable/image_placeholder.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorM3SurfaceVariant"/>
</shape>

61
mastodon/src/main/res/layout/item_account_list.xml
View File

@@ -2,55 +2,82 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="62dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_height="72dp"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:clipToPadding="false">
<ImageView
android:id="@+id/avatar"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_marginEnd="10dp"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginEnd="8dp"
android:importantForAccessibility="no"
tools:src="#0f0"/>
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="36dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_alignParentTop="true"
android:layout_marginStart="8dp"
style="@style/Widget.Mastodon.M3.Button.Filled"
tools:text="Follow"/>
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_toEndOf="@id/avatar"
android:layout_toStartOf="@id/button"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:textAppearance="@style/m3_title_medium"
android:textAppearance="@style/m3_title_small"
android:textColor="?colorM3OnSurface"
tools:text="User"/>
<TextView
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_below="@id/name"
android:layout_toEndOf="@id/avatar"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/name"
android:layout_toStartOf="@id/button"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:textAppearance="@style/m3_title_small"
android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3Secondary"
tools:text="\@user@server"/>
<TextView
android:id="@+id/followers_count"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_toEndOf="@id/avatar"
android:layout_below="@id/name"
android:layout_toStartOf="@id/button"
android:gravity="center_vertical"
android:textAppearance="@style/m3_body_medium"
android:textColor="?colorM3Secondary"
tools:text="123 followers"/>
<TextView
android:id="@+id/verified_link"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_toEndOf="@id/avatar"
android:layout_below="@id/followers_count"
android:layout_toStartOf="@id/button"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="@style/m3_body_medium"
android:includeFontPadding="false"
android:gravity="center_vertical"
android:drawablePadding="2dp"
tools:text="example.com/example"/>
<View
android:id="@+id/menu_anchor"
android:layout_width="1px"

1
mastodon/src/main/res/values/strings.xml
View File

@@ -480,4 +480,5 @@
<string name="what_is_alt_text">What is alt text?</string>
<string name="alt_text_help">Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.\n\nYou can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.\n\n<ul><li>Capture important elements</li>\n<li>Summarize text in images</li>\n<li>Use regular sentence structure</li>\n<li>Avoid redundant information</li>\n<li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li></ul></string>
<string name="edit_post">Edit post</string>
<string name="no_verified_link">No verified link</string>
</resources>