Skip to content

Commit 3655eb3

Browse files
KevinBoulongneKevinBoulongne
committed
refactor(ItemMessage): Center buttons vertically
1 parent ad4a19d commit 3655eb3

File tree

1 file changed

+109
-110
lines changed

1 file changed

+109
-110
lines changed

‎app/src/main/res/layout/item_message.xml

+109-110
Original file line numberDiff line numberDiff line change
@@ -30,117 +30,124 @@
3030
app:layout_constraintStart_toStartOf="parent"
3131
app:layout_constraintTop_toTopOf="parent">
3232

33-
<androidx.constraintlayout.widget.ConstraintLayout
34-
android:id="@+id/messageHeaderLayout"
33+
<LinearLayout
3534
android:layout_width="match_parent"
3635
android:layout_height="wrap_content"
3736
android:layout_marginHorizontal="@dimen/marginStandardMedium"
38-
android:layout_marginTop="@dimen/marginStandardMedium"
39-
android:layout_marginBottom="@dimen/alternativeMargin"
40-
app:layout_constraintTop_toTopOf="parent">
41-
42-
<com.infomaniak.mail.views.AvatarView
43-
android:id="@+id/userAvatar"
44-
android:layout_width="@dimen/userAvatarSizeLarge"
45-
android:layout_height="@dimen/userAvatarSizeLarge"
46-
android:layout_marginBottom="@dimen/marginStandardVerySmall"
47-
app:layout_constraintBottom_toBottomOf="parent"
48-
app:layout_constraintStart_toStartOf="parent"
49-
app:layout_constraintTop_toTopOf="parent"
50-
tools:src="@tools:sample/avatars" />
51-
52-
<TextView
53-
android:id="@+id/expeditorName"
54-
style="@style/BodyMedium"
55-
android:layout_width="wrap_content"
56-
android:layout_height="wrap_content"
57-
android:layout_marginStart="@dimen/marginStandardMedium"
58-
android:ellipsize="end"
59-
android:lines="1"
60-
app:layout_constrainedWidth="true"
61-
app:layout_constraintEnd_toStartOf="@id/shortMessageDate"
62-
app:layout_constraintHorizontal_bias="0"
63-
app:layout_constraintHorizontal_chainStyle="packed"
64-
app:layout_constraintStart_toEndOf="@id/userAvatar"
65-
app:layout_constraintTop_toTopOf="parent"
66-
tools:text="@tools:sample/full_names" />
67-
68-
<TextView
69-
android:id="@+id/subjectTextView"
70-
style="@style/BodySmall.Secondary"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content"
73-
android:ellipsize="end"
74-
android:maxLines="1"
75-
android:visibility="gone"
76-
app:layout_constraintBottom_toTopOf="@id/recipientLayout"
77-
app:layout_constraintEnd_toStartOf="@id/deleteDraftButton"
78-
app:layout_constraintHorizontal_bias="0"
79-
app:layout_constraintStart_toStartOf="@id/expeditorName"
80-
app:layout_constraintTop_toBottomOf="@id/expeditorName"
81-
tools:text="Invitation à notre dernier évènement" />
82-
83-
<LinearLayout
84-
android:id="@+id/recipientLayout"
85-
android:layout_width="wrap_content"
37+
android:gravity="center_vertical"
38+
android:orientation="horizontal">
39+
40+
<androidx.constraintlayout.widget.ConstraintLayout
41+
android:id="@+id/messageHeaderLayout"
42+
android:layout_width="0dp"
8643
android:layout_height="wrap_content"
87-
android:layout_marginStart="@dimen/marginStandardSmall"
88-
android:gravity="center_vertical"
89-
android:paddingVertical="@dimen/marginStandardVerySmall"
90-
app:layout_constrainedWidth="true"
91-
app:layout_constraintBottom_toBottomOf="parent"
92-
app:layout_constraintEnd_toStartOf="@id/deleteDraftButton"
93-
app:layout_constraintHorizontal_bias="0"
94-
app:layout_constraintStart_toEndOf="@id/userAvatar"
95-
app:layout_constraintTop_toBottomOf="@id/subjectTextView"
96-
tools:ignore="UseCompoundDrawables">
44+
android:layout_marginTop="@dimen/marginStandardMedium"
45+
android:layout_marginBottom="@dimen/alternativeMargin"
46+
android:layout_weight="1">
47+
48+
<com.infomaniak.mail.views.AvatarView
49+
android:id="@+id/userAvatar"
50+
android:layout_width="@dimen/userAvatarSizeLarge"
51+
android:layout_height="@dimen/userAvatarSizeLarge"
52+
android:layout_marginBottom="@dimen/marginStandardVerySmall"
53+
app:layout_constraintBottom_toBottomOf="parent"
54+
app:layout_constraintStart_toStartOf="parent"
55+
app:layout_constraintTop_toTopOf="parent"
56+
tools:src="@tools:sample/avatars" />
9757

9858
<TextView
99-
android:id="@+id/recipient"
100-
style="@style/BodySmall.Secondary"
59+
android:id="@+id/expeditorName"
60+
style="@style/BodyMedium"
10161
android:layout_width="wrap_content"
10262
android:layout_height="wrap_content"
103-
android:layout_marginStart="@dimen/marginStandardSmall"
104-
android:layout_weight="1"
63+
android:layout_marginStart="@dimen/marginStandardMedium"
64+
android:ellipsize="end"
65+
android:lines="1"
66+
app:layout_constrainedWidth="true"
67+
app:layout_constraintEnd_toStartOf="@id/shortMessageDate"
68+
app:layout_constraintHorizontal_bias="0"
69+
app:layout_constraintHorizontal_chainStyle="packed"
70+
app:layout_constraintStart_toEndOf="@id/userAvatar"
71+
app:layout_constraintTop_toTopOf="parent"
72+
tools:text="@tools:sample/full_names" />
73+
74+
<TextView
75+
android:id="@+id/subjectTextView"
76+
style="@style/BodySmall.Secondary"
77+
android:layout_width="0dp"
78+
android:layout_height="wrap_content"
10579
android:ellipsize="end"
10680
android:maxLines="1"
107-
tools:ignore="InefficientWeight"
108-
tools:text="Myriam Rais, George Li, +3" />
109-
110-
<ImageView
111-
android:id="@+id/recipientChevron"
112-
android:layout_width="@dimen/chevronSize"
113-
android:layout_height="@dimen/chevronSize"
114-
android:layout_marginHorizontal="@dimen/marginStandardSmall"
115-
android:contentDescription="@string/contentDescriptionButtonExpandRecipients"
116-
android:src="@drawable/ic_chevron_down"
81+
android:visibility="gone"
82+
app:layout_constraintBottom_toTopOf="@id/recipientLayout"
83+
app:layout_constraintEnd_toEndOf="parent"
11784
app:layout_constraintHorizontal_bias="0"
118-
app:tint="@color/iconColor" />
119-
</LinearLayout>
85+
app:layout_constraintStart_toStartOf="@id/expeditorName"
86+
app:layout_constraintTop_toBottomOf="@id/expeditorName"
87+
tools:text="Invitation à notre dernier évènement" />
12088

121-
<com.google.android.material.button.MaterialButton
122-
android:id="@+id/recipientOverlayedButton"
123-
style="@style/TextButton"
124-
android:layout_width="0dp"
125-
android:layout_height="0dp"
126-
app:cornerRadius="@dimen/smallCornerRadius"
127-
app:layout_constraintBottom_toBottomOf="@id/recipientLayout"
128-
app:layout_constraintEnd_toEndOf="@id/recipientLayout"
129-
app:layout_constraintStart_toStartOf="@id/recipientLayout"
130-
app:layout_constraintTop_toTopOf="@id/recipientLayout" />
131-
132-
<TextView
133-
android:id="@+id/shortMessageDate"
134-
style="@style/Label.Secondary"
135-
android:layout_width="wrap_content"
136-
android:layout_height="wrap_content"
137-
android:layout_marginStart="@dimen/marginStandardSmall"
138-
android:layout_marginEnd="@dimen/marginStandardSmall"
139-
app:layout_constraintBottom_toBottomOf="@id/expeditorName"
140-
app:layout_constraintEnd_toStartOf="@id/deleteDraftButton"
141-
app:layout_constraintStart_toEndOf="@id/expeditorName"
142-
app:layout_constraintTop_toTopOf="@+id/expeditorName"
143-
tools:text="9 déc 2021 à 11:00" />
89+
<LinearLayout
90+
android:id="@+id/recipientLayout"
91+
android:layout_width="wrap_content"
92+
android:layout_height="wrap_content"
93+
android:layout_marginStart="@dimen/marginStandardSmall"
94+
android:gravity="center_vertical"
95+
android:paddingVertical="@dimen/marginStandardVerySmall"
96+
app:layout_constrainedWidth="true"
97+
app:layout_constraintBottom_toBottomOf="parent"
98+
app:layout_constraintEnd_toEndOf="parent"
99+
app:layout_constraintHorizontal_bias="0"
100+
app:layout_constraintStart_toEndOf="@id/userAvatar"
101+
app:layout_constraintTop_toBottomOf="@id/subjectTextView"
102+
tools:ignore="UseCompoundDrawables">
103+
104+
<TextView
105+
android:id="@+id/recipient"
106+
style="@style/BodySmall.Secondary"
107+
android:layout_width="wrap_content"
108+
android:layout_height="wrap_content"
109+
android:layout_marginStart="@dimen/marginStandardSmall"
110+
android:layout_weight="1"
111+
android:ellipsize="end"
112+
android:maxLines="1"
113+
tools:ignore="InefficientWeight"
114+
tools:text="Myriam Rais, George Li, +3" />
115+
116+
<ImageView
117+
android:id="@+id/recipientChevron"
118+
android:layout_width="@dimen/chevronSize"
119+
android:layout_height="@dimen/chevronSize"
120+
android:layout_marginHorizontal="@dimen/marginStandardSmall"
121+
android:contentDescription="@string/contentDescriptionButtonExpandRecipients"
122+
android:src="@drawable/ic_chevron_down"
123+
app:layout_constraintHorizontal_bias="0"
124+
app:tint="@color/iconColor" />
125+
</LinearLayout>
126+
127+
<com.google.android.material.button.MaterialButton
128+
android:id="@+id/recipientOverlayedButton"
129+
style="@style/TextButton"
130+
android:layout_width="0dp"
131+
android:layout_height="0dp"
132+
app:cornerRadius="@dimen/smallCornerRadius"
133+
app:layout_constraintBottom_toBottomOf="@id/recipientLayout"
134+
app:layout_constraintEnd_toEndOf="@id/recipientLayout"
135+
app:layout_constraintStart_toStartOf="@id/recipientLayout"
136+
app:layout_constraintTop_toTopOf="@id/recipientLayout" />
137+
138+
<TextView
139+
android:id="@+id/shortMessageDate"
140+
style="@style/Label.Secondary"
141+
android:layout_width="wrap_content"
142+
android:layout_height="wrap_content"
143+
android:layout_marginStart="@dimen/marginStandardSmall"
144+
android:layout_marginEnd="@dimen/marginStandardSmall"
145+
app:layout_constraintBottom_toBottomOf="@id/expeditorName"
146+
app:layout_constraintEnd_toEndOf="parent"
147+
app:layout_constraintStart_toEndOf="@id/expeditorName"
148+
app:layout_constraintTop_toTopOf="@+id/expeditorName"
149+
tools:text="9 déc 2021 à 11:00" />
150+
</androidx.constraintlayout.widget.ConstraintLayout>
144151

145152
<com.google.android.material.button.MaterialButton
146153
android:id="@+id/deleteDraftButton"
@@ -149,28 +156,20 @@
149156
android:visibility="gone"
150157
app:icon="@drawable/ic_bin"
151158
app:iconTint="@color/redDestructiveAction"
152-
app:layout_constraintEnd_toStartOf="@id/replyButton"
153-
app:layout_constraintTop_toTopOf="parent"
154159
tools:visibility="visible" />
155160

156161
<com.google.android.material.button.MaterialButton
157162
android:id="@+id/replyButton"
158163
style="@style/IconButton"
159164
android:contentDescription="@string/actionReply"
160-
app:icon="@drawable/ic_email_action_reply"
161-
app:layout_constraintEnd_toStartOf="@id/menuButton"
162-
app:layout_constraintTop_toTopOf="parent" />
165+
app:icon="@drawable/ic_email_action_reply" />
163166

164167
<com.google.android.material.button.MaterialButton
165168
android:id="@+id/menuButton"
166169
style="@style/IconButton"
167170
android:contentDescription="@string/contentDescriptionOpenMailActions"
168-
app:icon="@drawable/ic_param_dots"
169-
app:layout_constraintEnd_toEndOf="parent"
170-
app:layout_constraintTop_toTopOf="parent" />
171-
172-
</androidx.constraintlayout.widget.ConstraintLayout>
173-
171+
app:icon="@drawable/ic_param_dots" />
172+
</LinearLayout>
174173
</com.google.android.material.card.MaterialCardView>
175174

176175
<androidx.constraintlayout.widget.ConstraintLayout

0 commit comments

Comments
 (0)