Skip to content

Align comment actions with calypso #7863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2018
Merged

Align comment actions with calypso #7863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Align comment actions with calypso
  • Loading branch information
@planarvoid
planarvoid committed Jun 5, 2018
commit d614027090351ec548be9296068d576ecfea698c
58 changes: 29 additions & 29 deletions WordPress/src/main/res/layout/comment_action_footer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal">

<!-- like and moderate buttons don't use a compound drawable so the icon can be animated when tapped -->
<LinearLayout
android:id="@+id/btn_like"
android:id="@+id/btn_moderate"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -32,7 +31,7 @@
android:paddingTop="@dimen/margin_medium">

<ImageView
android:id="@+id/btn_like_icon"
android:id="@+id/btn_moderate_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
Expand All @@ -42,17 +41,17 @@
android:paddingRight="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium"
android:paddingTop="0dp"
app:srcCompat="@drawable/ic_star_outline_grey_min_24dp"/>
app:srcCompat="@drawable/ic_checkmark_grey_min_24dp"/>

<org.wordpress.android.util.widgets.AutoResizeTextView
android:id="@+id/btn_like_text"
android:id="@+id/btn_moderate_text"
style="@style/CommentActionLabel"
android:text="@string/reader_label_like"/>
android:text="@string/mnu_comment_approve"/>

</LinearLayout>

<LinearLayout
android:id="@+id/btn_moderate"
android:id="@+id/btn_spam"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -66,10 +65,11 @@
android:paddingLeft="@dimen/margin_small"
android:paddingRight="@dimen/margin_small"
android:paddingStart="@dimen/margin_small"
android:paddingTop="@dimen/margin_medium">
android:paddingTop="@dimen/margin_medium"
android:visibility="gone">

<ImageView
android:id="@+id/btn_moderate_icon"
android:id="@+id/btn_spam_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
Expand All @@ -79,17 +79,17 @@
android:paddingRight="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium"
android:paddingTop="0dp"
app:srcCompat="@drawable/ic_checkmark_grey_min_24dp"/>
app:srcCompat="@drawable/ic_spam_grey_min_24dp"/>

<org.wordpress.android.util.widgets.AutoResizeTextView
android:id="@+id/btn_moderate_text"
android:id="@+id/btn_spam_text"
style="@style/CommentActionLabel"
android:text="@string/mnu_comment_approve"/>
android:text="@string/mnu_comment_spam"/>

</LinearLayout>

<LinearLayout
android:id="@+id/btn_edit"
android:id="@+id/btn_trash"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -107,7 +107,7 @@
android:visibility="gone">

<ImageView
android:id="@+id/btn_edit_icon"
android:id="@+id/btn_trash_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
Expand All @@ -117,17 +117,18 @@
android:paddingRight="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium"
android:paddingTop="0dp"
app:srcCompat="@drawable/ic_pencil_grey_min_24dp"/>
app:srcCompat="@drawable/ic_trash_grey_min_24dp"/>

<org.wordpress.android.util.widgets.AutoResizeTextView
android:id="@+id/btn_edit_text"
android:id="@+id/btn_trash_text"
style="@style/CommentActionLabel"
android:text="@string/edit"/>
android:text="@string/mnu_comment_trash"/>

</LinearLayout>

<!-- like and moderate buttons don't use a compound drawable so the icon can be animated when tapped -->
<LinearLayout
android:id="@+id/btn_trash"
android:id="@+id/btn_like"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -141,11 +142,10 @@
android:paddingLeft="@dimen/margin_small"
android:paddingRight="@dimen/margin_small"
android:paddingStart="@dimen/margin_small"
android:paddingTop="@dimen/margin_medium"
android:visibility="gone">
android:paddingTop="@dimen/margin_medium">

<ImageView
android:id="@+id/btn_trash_icon"
android:id="@+id/btn_like_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
Expand All @@ -155,17 +155,17 @@
android:paddingRight="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium"
android:paddingTop="0dp"
app:srcCompat="@drawable/ic_trash_grey_min_24dp"/>
app:srcCompat="@drawable/ic_star_outline_grey_min_24dp"/>

<org.wordpress.android.util.widgets.AutoResizeTextView
android:id="@+id/btn_trash_text"
android:id="@+id/btn_like_text"
style="@style/CommentActionLabel"
android:text="@string/mnu_comment_trash"/>
android:text="@string/reader_label_like"/>

</LinearLayout>

<LinearLayout
android:id="@+id/btn_spam"
android:id="@+id/btn_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand All @@ -183,7 +183,7 @@
android:visibility="gone">

<ImageView
android:id="@+id/btn_spam_icon"
android:id="@+id/btn_edit_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
Expand All @@ -193,12 +193,12 @@
android:paddingRight="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium"
android:paddingTop="0dp"
app:srcCompat="@drawable/ic_spam_grey_min_24dp"/>
app:srcCompat="@drawable/ic_pencil_grey_min_24dp"/>

<org.wordpress.android.util.widgets.AutoResizeTextView
android:id="@+id/btn_spam_text"
android:id="@+id/btn_edit_text"
style="@style/CommentActionLabel"
android:text="@string/mnu_comment_spam"/>
android:text="@string/edit"/>

</LinearLayout>

Expand Down