Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleanup, simplify AccountActivityLayout

This commit is contained in:
Conny Duck 2017-08-05 10:29:04 +02:00
parent 848189d670
commit 2f66de9797
3 changed files with 30 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable/ic_hourglass_24dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,2v6h0.01L6,8.01 10,12l-4,4 0.01,0.01L6,16.01L6,22h12v-5.99h-0.01L18,16l-4,-4 4,-3.99 -0.01,-0.01L18,8L18,2L6,2zM16,16.5L16,20L8,20v-3.5l4,-4 4,4zM12,11.5l-4,-4L8,4h8v3.5l-4,4z"/>
</vector>

12
app/src/main/res/drawable/ic_person_minus_24px.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/toolbar_icon_dark"
android:pathData="M14.4,12c2.7,0.4,5-1.9,4.6-4.6c-0.3-1.7-1.6-3.1-3.3-3.3c-2.7-0.4-5,1.9-4.6,4.6C11.3,10.3,12.7,11.7,14.4,12z
M6,12h3v-2H6H4H1v2h3H6z M15,14c-2.7,0-8,1.3-8,4v2h16v-2C23,15.3,17.7,14,15,14z" />
</vector>

69
app/src/main/res/layout/activity_account.xml
View File

@ -84,52 +84,43 @@
android:layout_below="@id/follow_btn" android:layout_below="@id/follow_btn"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:text="Follows you" android:text="@string/follows_you"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary" />
<LinearLayout <TextView
android:id="@+id/account_display_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/account_avatar" android:layout_below="@id/account_avatar"
android:orientation="vertical"> android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="18sp"
android:textStyle="normal|bold" />
<TextView <TextView
android:id="@+id/account_display_name" android:id="@+id/account_username"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_below="@id/account_display_name"
android:maxLines="1" android:ellipsize="end"
android:textColor="?android:textColorPrimary" android:maxLines="1"
android:textSize="18sp" android:textColor="?android:textColorSecondary" />
android:textStyle="normal|bold" />
<RelativeLayout <ImageView
android:layout_width="match_parent" android:id="@+id/account_locked"
android:layout_height="wrap_content"> android:layout_width="16sp"
android:layout_height="16sp"
<TextView android:layout_alignBaseline="@+id/account_username"
android:id="@+id/account_username" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_marginLeft="4dp"
android:layout_height="wrap_content" android:layout_marginStart="4dp"
android:ellipsize="end" android:layout_toEndOf="@id/account_username"
android:maxLines="1" android:layout_toRightOf="@id/account_username"
android:textColor="?android:textColorSecondary" /> android:contentDescription="@string/description_account_locked"
android:tint="?android:textColorSecondary"
<ImageView android:visibility="gone"
android:id="@+id/account_locked" app:srcCompat="@drawable/reblog_disabled_light" />
android:layout_width="16sp"
android:layout_height="16sp"
android:layout_centerVertical="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/account_username"
android:layout_toRightOf="@id/account_username"
android:contentDescription="@string/description_account_locked"
android:tint="?android:textColorSecondary"
android:visibility="gone"
app:srcCompat="@drawable/reblog_disabled_light" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>