Skip to content

Commit b6cd862

Browse files
theck13theck13
authored
Merge pull request #7863 from wordpress-mobile/feature/align_comment_actions_with_calypso
Align comment actions with calypso
2 parents abb3796 + d614027 commit b6cd862

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎WordPress/src/main/res/layout/comment_action_footer.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
android:layout_height="wrap_content"
1414
android:orientation="horizontal">
1515

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

3433
<ImageView
35-
android:id="@+id/btn_like_icon"
34+
android:id="@+id/btn_moderate_icon"
3635
android:layout_width="wrap_content"
3736
android:layout_height="wrap_content"
3837
android:contentDescription="@null"
@@ -42,17 +41,17 @@
4241
android:paddingRight="@dimen/margin_medium"
4342
android:paddingStart="@dimen/margin_medium"
4443
android:paddingTop="0dp"
45-
app:srcCompat="@drawable/ic_star_outline_grey_min_24dp"/>
44+
app:srcCompat="@drawable/ic_checkmark_grey_min_24dp"/>
4645

4746
<org.wordpress.android.util.widgets.AutoResizeTextView
48-
android:id="@+id/btn_like_text"
47+
android:id="@+id/btn_moderate_text"
4948
style="@style/CommentActionLabel"
50-
android:text="@string/reader_label_like"/>
49+
android:text="@string/mnu_comment_approve"/>
5150

5251
</LinearLayout>
5352

5453
<LinearLayout
55-
android:id="@+id/btn_moderate"
54+
android:id="@+id/btn_spam"
5655
android:layout_width="0dp"
5756
android:layout_height="wrap_content"
5857
android:layout_weight="1"
@@ -66,10 +65,11 @@
6665
android:paddingLeft="@dimen/margin_small"
6766
android:paddingRight="@dimen/margin_small"
6867
android:paddingStart="@dimen/margin_small"
69-
android:paddingTop="@dimen/margin_medium">
68+
android:paddingTop="@dimen/margin_medium"
69+
android:visibility="gone">
7070

7171
<ImageView
72-
android:id="@+id/btn_moderate_icon"
72+
android:id="@+id/btn_spam_icon"
7373
android:layout_width="wrap_content"
7474
android:layout_height="wrap_content"
7575
android:contentDescription="@null"
@@ -79,17 +79,17 @@
7979
android:paddingRight="@dimen/margin_medium"
8080
android:paddingStart="@dimen/margin_medium"
8181
android:paddingTop="0dp"
82-
app:srcCompat="@drawable/ic_checkmark_grey_min_24dp"/>
82+
app:srcCompat="@drawable/ic_spam_grey_min_24dp"/>
8383

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

8989
</LinearLayout>
9090

9191
<LinearLayout
92-
android:id="@+id/btn_edit"
92+
android:id="@+id/btn_trash"
9393
android:layout_width="0dp"
9494
android:layout_height="wrap_content"
9595
android:layout_weight="1"
@@ -107,7 +107,7 @@
107107
android:visibility="gone">
108108

109109
<ImageView
110-
android:id="@+id/btn_edit_icon"
110+
android:id="@+id/btn_trash_icon"
111111
android:layout_width="wrap_content"
112112
android:layout_height="wrap_content"
113113
android:contentDescription="@null"
@@ -117,17 +117,18 @@
117117
android:paddingRight="@dimen/margin_medium"
118118
android:paddingStart="@dimen/margin_medium"
119119
android:paddingTop="0dp"
120-
app:srcCompat="@drawable/ic_pencil_grey_min_24dp"/>
120+
app:srcCompat="@drawable/ic_trash_grey_min_24dp"/>
121121

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

127127
</LinearLayout>
128128

129+
<!-- like and moderate buttons don't use a compound drawable so the icon can be animated when tapped -->
129130
<LinearLayout
130-
android:id="@+id/btn_trash"
131+
android:id="@+id/btn_like"
131132
android:layout_width="0dp"
132133
android:layout_height="wrap_content"
133134
android:layout_weight="1"
@@ -141,11 +142,10 @@
141142
android:paddingLeft="@dimen/margin_small"
142143
android:paddingRight="@dimen/margin_small"
143144
android:paddingStart="@dimen/margin_small"
144-
android:paddingTop="@dimen/margin_medium"
145-
android:visibility="gone">
145+
android:paddingTop="@dimen/margin_medium">
146146

147147
<ImageView
148-
android:id="@+id/btn_trash_icon"
148+
android:id="@+id/btn_like_icon"
149149
android:layout_width="wrap_content"
150150
android:layout_height="wrap_content"
151151
android:contentDescription="@null"
@@ -155,17 +155,17 @@
155155
android:paddingRight="@dimen/margin_medium"
156156
android:paddingStart="@dimen/margin_medium"
157157
android:paddingTop="0dp"
158-
app:srcCompat="@drawable/ic_trash_grey_min_24dp"/>
158+
app:srcCompat="@drawable/ic_star_outline_grey_min_24dp"/>
159159

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

165165
</LinearLayout>
166166

167167
<LinearLayout
168-
android:id="@+id/btn_spam"
168+
android:id="@+id/btn_edit"
169169
android:layout_width="0dp"
170170
android:layout_height="wrap_content"
171171
android:layout_weight="1"
@@ -183,7 +183,7 @@
183183
android:visibility="gone">
184184

185185
<ImageView
186-
android:id="@+id/btn_spam_icon"
186+
android:id="@+id/btn_edit_icon"
187187
android:layout_width="wrap_content"
188188
android:layout_height="wrap_content"
189189
android:contentDescription="@null"
@@ -193,12 +193,12 @@
193193
android:paddingRight="@dimen/margin_medium"
194194
android:paddingStart="@dimen/margin_medium"
195195
android:paddingTop="0dp"
196-
app:srcCompat="@drawable/ic_spam_grey_min_24dp"/>
196+
app:srcCompat="@drawable/ic_pencil_grey_min_24dp"/>
197197

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

203203
</LinearLayout>
204204

0 commit comments

Comments
 (0)