Skip to content

Commit 9825e02

Browse files
sowjanyakchsowjanyakch
committed
remove extra spacing + format
Signed-off-by: sowjanyakch <[email protected]>
1 parent 0da81b5 commit 9825e02

File tree

3 files changed

+27
-23
lines changed

3 files changed

+27
-23
lines changed

‎app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class MessageActionsDialog(
113113
) &&
114114
!isOlderThanTwentyFourHours
115115

116-
private val messageHasCaptions = messageHasFileAttachment && message.message!= "{file}" && !message.isDeleted
116+
private val messageHasCaptions = messageHasFileAttachment && message.message != "{file}" && !message.isDeleted
117117

118118
private var messageIsEditable = hasSpreedFeatureCapability(
119119
spreedCapabilities,

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
app:layout_alignSelf="flex_start"
173173
app:layout_flexGrow="1"
174174
app:layout_wrapBefore="true"
175-
tools:ignore="TextContrastCheck"
176175
tools:text="A simple message" />
177176

178177
<androidx.emoji2.widget.EmojiTextView
@@ -181,7 +180,6 @@
181180
android:layout_width="match_parent"
182181
android:layout_height="wrap_content"
183182
android:layout_gravity="bottom|center"
184-
android:layout_marginBottom="4dp"
185183
android:textColor="@color/high_emphasis_text"
186184
android:textIsSelectable="false"
187185
android:textSize="@dimen/chat_text_size"
@@ -194,34 +192,36 @@
194192
android:id="@id/messageTime"
195193
android:layout_width="wrap_content"
196194
android:layout_height="wrap_content"
197-
android:paddingHorizontal="@dimen/standard_half_padding"
198-
android:layout_alignParentEnd="true"
195+
android:layout_below="@id/messageCaption"
199196
android:layout_marginStart="8dp"
200-
android:layout_marginEnd="2dp"
201197
android:alpha="0.6"
202-
android:gravity="end"
203198
android:textColor="@color/no_emphasis_text"
199+
android:textIsSelectable="false"
200+
android:gravity="end"
204201
app:layout_alignSelf="flex_end"
205-
tools:ignore="TextContrastCheck"
202+
app:layout_flexGrow="1"
203+
app:layout_wrapBefore="false"
206204
tools:text="12:38" />
207205

206+
208207
<TextView
209208
android:id="@+id/messageEditIndicator"
210209
android:layout_width="wrap_content"
211210
android:layout_height="wrap_content"
211+
android:layout_below="@id/messageCaption"
212212
android:layout_marginStart="8dp"
213-
android:layout_marginEnd="2dp"
213+
android:layout_marginEnd="8dp"
214214
android:alpha="0.6"
215215
android:textColor="@color/no_emphasis_text"
216216
android:textIsSelectable="false"
217-
android:text="@string/hint_edited_message"
218-
android:textSize="12sp"
219217
app:layout_alignSelf="flex_end"
220-
tools:ignore="TextContrastCheck" />
218+
android:text = "@string/hint_edited_message"
219+
android:textSize="12sp">
220+
</TextView>
221221

222222
<include
223223
android:id="@+id/reactions"
224224
layout="@layout/reactions_inside_message" />
225-
</com.google.android.flexbox.FlexboxLayout>
226225

227-
</RelativeLayout>
226+
</com.google.android.flexbox.FlexboxLayout>
227+
</RelativeLayout>

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
android:layout_width="match_parent"
156156
android:layout_height="wrap_content"
157157
android:layout_gravity="bottom|center"
158-
android:layout_marginBottom="4dp"
159158
android:textColor="@color/high_emphasis_text"
160159
android:textIsSelectable="false"
161160
android:textSize="@dimen/chat_text_size"
@@ -168,34 +167,39 @@
168167
android:id="@id/messageTime"
169168
android:layout_width="wrap_content"
170169
android:layout_height="wrap_content"
171-
android:paddingHorizontal="@dimen/standard_half_padding"
172-
android:layout_alignParentEnd="true"
170+
android:layout_below="@id/messageCaption"
173171
android:layout_marginStart="8dp"
174-
android:layout_marginEnd="2dp"
175172
android:alpha="0.6"
176173
android:gravity="end"
177174
android:textColor="@color/no_emphasis_text"
175+
android:textIsSelectable="false"
178176
app:layout_alignSelf="flex_end"
179-
tools:text="12:34" />
177+
app:layout_flexGrow="1"
178+
app:layout_wrapBefore="false"
179+
tools:text="10:35" />
180180

181181
<TextView
182182
android:id="@+id/messageEditIndicator"
183183
android:layout_width="wrap_content"
184184
android:layout_height="wrap_content"
185+
android:layout_below="@id/messageCaption"
185186
android:layout_marginStart="8dp"
186-
android:layout_marginEnd="2dp"
187187
android:alpha="0.6"
188188
android:textColor="@color/no_emphasis_text"
189189
android:textIsSelectable="false"
190-
android:text="@string/hint_edited_message"
191-
android:textSize="12sp"
192-
app:layout_alignSelf="flex_end" />
190+
app:layout_alignSelf="flex_end"
191+
android:text = "@string/hint_edited_message"
192+
android:textSize="12sp">
193+
194+
</TextView>
193195

194196
<ImageView
195197
android:id="@+id/checkMark"
196198
android:layout_width="25dp"
197199
android:layout_height="@dimen/message_bubble_checkmark_height"
200+
android:layout_below="@id/messageTime"
198201
android:layout_marginStart="8dp"
202+
android:layout_marginEnd="8dp"
199203
android:contentDescription="@null"
200204
app:layout_alignSelf="flex_end"
201205
app:tint="@color/high_emphasis_text"

0 commit comments

Comments
 (0)