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

Merge branch 'button-improvements' of https://github.com/connyduck/Tusky into connyduck-button-improvements

This commit is contained in:
Vavassor 2017-08-08 23:55:32 -04:00
parent ac0cab516e 17876008cf
commit b7dcd31470
4 changed files with 116 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/src/main/res/layout/item_blocked_user.xml
View File

@ -1,65 +1,69 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp" android:layout_height="72dp"
android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp">
android:gravity="center_vertical">
<com.pkmmte.view.CircularImageView <com.pkmmte.view.CircularImageView
android:id="@+id/blocked_user_avatar"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:id="@+id/blocked_user_avatar"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginRight="24dp" android:layout_marginRight="24dp"
android:layout_centerVertical="true"
android:contentDescription="@string/action_view_profile" /> android:contentDescription="@string/action_view_profile" />
<ImageButton <ImageButton
app:srcCompat="@drawable/ic_clear_24dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:id="@+id/blocked_user_unblock" android:id="@+id/blocked_user_unblock"
android:layout_gravity="center_vertical"
style="?attr/image_button_style" style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:contentDescription="@string/action_unblock" /> android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_unblock"
android:padding="4dp"
app:srcCompat="@drawable/ic_clear_24dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_toStartOf="@id/blocked_user_unblock"
android:layout_toLeftOf="@id/blocked_user_unblock"
android:layout_toEndOf="@id/blocked_user_avatar" android:layout_toEndOf="@id/blocked_user_avatar"
android:layout_toRightOf="@id/blocked_user_avatar"> android:layout_toLeftOf="@id/blocked_user_unblock"
android:layout_toRightOf="@id/blocked_user_avatar"
android:layout_toStartOf="@id/blocked_user_unblock"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/blocked_user_display_name" android:id="@+id/blocked_user_display_name"
android:text="Display name"
android:maxLines="1"
android:ellipsize="end"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="\@username"
android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textSize="14sp" android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:textStyle="normal|bold"
tools:text="Display name" />
<TextView
android:id="@+id/blocked_user_username" android:id="@+id/blocked_user_username"
android:textColor="?android:textColorSecondary" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
tools:text="\@username" />
</LinearLayout> </LinearLayout>

85
app/src/main/res/layout/item_follow_request.xml
View File

@ -1,80 +1,85 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp" android:layout_height="72dp"
xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp">
android:gravity="center_vertical">
<com.pkmmte.view.CircularImageView <com.pkmmte.view.CircularImageView
android:id="@+id/follow_request_avatar"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:id="@+id/follow_request_avatar"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
android:contentDescription="@string/action_view_profile" /> android:contentDescription="@string/action_view_profile" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_toRightOf="@id/follow_request_avatar"
android:layout_toEndOf="@id/follow_request_avatar" android:layout_toEndOf="@id/follow_request_avatar"
android:layout_toLeftOf="@+id/follow_request_accept" android:layout_toLeftOf="@+id/follow_request_accept"
android:layout_toStartOf="@id/follow_request_accept"> android:layout_toRightOf="@id/follow_request_avatar"
android:layout_toStartOf="@id/follow_request_accept"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/follow_request_display_name" android:id="@+id/follow_request_display_name"
android:text="Display name"
android:maxLines="1"
android:ellipsize="end"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="\@username"
android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textSize="14sp" android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:textStyle="normal|bold"
tools:text="Display name" />
<TextView
android:id="@+id/follow_request_username" android:id="@+id/follow_request_username"
android:textColor="?android:textColorSecondary" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
tools:text="\@username" />
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="24dp"
android:layout_height="24dp"
style="?attr/image_button_style"
android:id="@+id/follow_request_accept" android:id="@+id/follow_request_accept"
app:srcCompat="@drawable/ic_check_24dp" style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_toLeftOf="@+id/follow_request_reject" android:layout_toLeftOf="@+id/follow_request_reject"
android:layout_toStartOf="@id/follow_request_reject" android:layout_toStartOf="@id/follow_request_reject"
android:layout_marginLeft="16dp" android:background="?attr/selectableItemBackgroundBorderless"
android:layout_marginStart="16dp" android:contentDescription="@string/action_accept"
android:layout_centerVertical="true" android:padding="4dp"
android:contentDescription="@string/action_accept" /> app:srcCompat="@drawable/ic_check_24dp" />
<ImageButton <ImageButton
android:layout_width="24dp"
android:layout_height="24dp"
style="?attr/image_button_style"
android:id="@id/follow_request_reject" android:id="@id/follow_request_reject"
app:srcCompat="@drawable/ic_reject_24dp" style="?attr/image_button_style"
android:layout_alignParentRight="true" android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginLeft="16dp" android:layout_alignParentRight="true"
android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:contentDescription="@string/action_reject" /> android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_reject"
android:padding="4dp"
app:srcCompat="@drawable/ic_reject_24dp" />
</RelativeLayout> </RelativeLayout>

61
app/src/main/res/layout/item_muted_user.xml
View File

@ -1,67 +1,70 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp" android:layout_height="72dp"
android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp">
android:gravity="center_vertical">
<com.pkmmte.view.CircularImageView <com.pkmmte.view.CircularImageView
android:id="@+id/muted_user_avatar"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:id="@+id/muted_user_avatar"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginRight="24dp" android:layout_marginRight="24dp"
android:layout_centerVertical="true"
android:contentDescription="@string/action_view_profile" /> android:contentDescription="@string/action_view_profile" />
<ImageButton <ImageButton
app:srcCompat="@drawable/ic_unmute_24dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:id="@+id/muted_user_unmute" android:id="@+id/muted_user_unmute"
android:layout_gravity="center_vertical"
style="?attr/image_button_style" style="?attr/image_button_style"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:contentDescription="@string/action_unmute" /> android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_unmute"
android:padding="4dp"
app:srcCompat="@drawable/ic_unmute_24dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_toEndOf="@id/muted_user_avatar" android:layout_toEndOf="@id/muted_user_avatar"
android:layout_toLeftOf="@id/muted_user_unmute"
android:layout_toRightOf="@id/muted_user_avatar" android:layout_toRightOf="@id/muted_user_avatar"
android:layout_toStartOf="@id/muted_user_unmute" android:layout_toStartOf="@id/muted_user_unmute"
android:layout_toLeftOf="@id/muted_user_unmute"> android:gravity="center_vertical"
android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/muted_user_display_name" android:id="@+id/muted_user_display_name"
android:text="Display name"
android:maxLines="1"
android:ellipsize="end"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:textStyle="normal|bold" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="\@username"
android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textSize="14sp" android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:textStyle="normal|bold"
tools:text="Display name" />
<TextView
android:id="@+id/muted_user_username" android:id="@+id/muted_user_username"
android:textColor="?android:textColorSecondary" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
tools:text="\@username" />
</LinearLayout> </LinearLayout>

9
app/src/main/res/layout/item_saved_toot.xml
View File

@ -15,12 +15,13 @@
<ImageButton <ImageButton
android:id="@+id/suppr" android:id="@+id/suppr"
style="?attr/image_button_style" style="?attr/image_button_style"
android:layout_width="24dp" android:layout_width="32dp"
android:layout_height="24dp" android:layout_height="32dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="16dp" android:layout_margin="12dp"
android:layout_margin="16dp" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_delete" android:contentDescription="@string/action_delete"
android:padding="4dp"
app:srcCompat="@drawable/ic_clear_24dp" /> app:srcCompat="@drawable/ic_clear_24dp" />
</LinearLayout> </LinearLayout>