The block list is now its own functional piece, instead of just being a copy of the following/follows lists on account profiles.

This commit is contained in:
Vavassor 2017-02-21 21:12:49 -05:00
commit c4114b6be2
9 changed files with 399 additions and 121 deletions

View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.android.volley.toolbox.NetworkImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:scaleType="fitCenter"
android:id="@+id/blocked_user_avatar"
android:padding="@dimen/status_avatar_padding"
android:layout_alignParentLeft="true" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="64dp"
android:orientation="vertical"
android:layout_toRightOf="@id/blocked_user_avatar">
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/blocked_user_display_name"
android:text="Display Name" />
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/blocked_user_username"
android:text="\@username\@example.com" />
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/blocked_user_unblock"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="@string/action_unblock" />
</RelativeLayout>

View file

@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/footer_retry_message"
android:padding="@dimen/footer_text_padding"/>
android:padding="@dimen/footer_text_padding" />
<Button
android:layout_width="wrap_content"
@ -40,6 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/footer_end_of_timeline_text"
android:padding="@dimen/footer_text_padding"
android:visibility="gone" />
</LinearLayout>

View file

@ -53,20 +53,20 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textStyle="normal|bold" />
android:textStyle="normal|bold"
android:paddingRight="@dimen/status_display_name_right_padding" />
<TextView
android:id="@+id/status_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/status_username_left_margin"
android:textColor="?attr/status_text_color_secondary" />
android:textColor="?attr/status_text_color_secondary"
android:paddingRight="@dimen/status_username_right_padding" />
<TextView
android:id="@+id/status_since_created"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/status_since_created_left_margin"
android:textColor="?attr/status_text_color_secondary" />
</com.keylesspalace.tusky.FlowLayout>