Skip to content

Commit f0eae52

Browse files
author
Florian Renaud
committed
Fix long text overlapping
1 parent fea3441 commit f0eae52

File tree

2 files changed

+73
-59
lines changed

2 files changed

+73
-59
lines changed

‎vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -40,59 +40,67 @@
4040
<TextView
4141
android:id="@+id/titleText"
4242
style="@style/Widget.Vector.TextView.Body.Medium"
43-
android:layout_width="wrap_content"
43+
android:layout_width="0dp"
4444
android:layout_height="wrap_content"
45+
android:layout_marginEnd="4dp"
4546
android:contentDescription="@string/avatar"
47+
android:ellipsize="end"
48+
android:maxLines="1"
49+
app:layout_constraintEnd_toStartOf="@id/liveIndicator"
4650
app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
4751
app:layout_constraintTop_toTopOf="parent"
4852
tools:text="@sample/rooms.json/data/name" />
4953

50-
<androidx.constraintlayout.helper.widget.Flow
51-
android:id="@+id/metadataFlow"
52-
android:layout_width="wrap_content"
54+
<LinearLayout
55+
android:id="@+id/metadataGroup"
56+
android:layout_width="0dp"
5357
android:layout_height="wrap_content"
5458
android:layout_marginTop="4dp"
59+
android:layout_marginEnd="4dp"
5560
android:orientation="vertical"
56-
app:constraint_referenced_ids="broadcasterNameMetadata,bufferingMetadata,voiceBroadcastMetadata,listenersCountMetadata"
57-
app:flow_horizontalAlign="start"
58-
app:flow_verticalGap="4dp"
61+
app:layout_constraintEnd_toStartOf="@id/liveIndicator"
5962
app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
60-
app:layout_constraintTop_toBottomOf="@id/titleText" />
61-
62-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
63-
android:id="@+id/broadcasterNameMetadata"
64-
android:layout_width="wrap_content"
65-
android:layout_height="wrap_content"
66-
app:metadataIcon="@drawable/ic_voice_broadcast_mic"
67-
tools:metadataValue="@sample/users.json/data/displayName" />
68-
69-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
70-
android:id="@+id/bufferingMetadata"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content" />
73-
74-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
75-
android:id="@+id/voiceBroadcastMetadata"
76-
android:layout_width="wrap_content"
77-
android:layout_height="wrap_content"
78-
app:metadataIcon="@drawable/ic_voice_broadcast"
79-
app:metadataValue="@string/attachment_type_voice_broadcast" />
80-
81-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
82-
android:id="@+id/listenersCountMetadata"
83-
android:layout_width="wrap_content"
84-
android:layout_height="wrap_content"
85-
app:metadataIcon="@drawable/ic_member_small"
86-
app:metadataValue="@string/no_value_placeholder"
87-
tools:metadataValue="5 listeners" />
63+
app:layout_constraintTop_toBottomOf="@id/titleText">
64+
65+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
66+
android:id="@+id/broadcasterNameMetadata"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_marginBottom="4dp"
70+
app:metadataIcon="@drawable/ic_voice_broadcast_mic"
71+
tools:metadataValue="@sample/users.json/data/displayName" />
72+
73+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastBufferingView
74+
android:id="@+id/bufferingMetadata"
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content"
77+
android:layout_marginBottom="4dp" />
78+
79+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
80+
android:id="@+id/voiceBroadcastMetadata"
81+
android:layout_width="wrap_content"
82+
android:layout_height="wrap_content"
83+
android:layout_marginBottom="4dp"
84+
app:metadataIcon="@drawable/ic_voice_broadcast"
85+
app:metadataValue="@string/attachment_type_voice_broadcast" />
86+
87+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
88+
android:id="@+id/listenersCountMetadata"
89+
android:layout_width="wrap_content"
90+
android:layout_height="wrap_content"
91+
android:layout_marginBottom="4dp"
92+
app:metadataIcon="@drawable/ic_member_small"
93+
app:metadataValue="@string/no_value_placeholder"
94+
tools:metadataValue="5 listeners" />
95+
</LinearLayout>
8896

8997
<androidx.constraintlayout.widget.Barrier
9098
android:id="@+id/headerBottomBarrier"
9199
android:layout_width="wrap_content"
92100
android:layout_height="wrap_content"
93101
app:barrierDirection="bottom"
94102
app:barrierMargin="10dp"
95-
app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
103+
app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataGroup" />
96104

97105
<androidx.constraintlayout.helper.widget.Flow
98106
android:id="@+id/controllerButtonsFlow"

‎vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,47 +38,53 @@
3838
<TextView
3939
android:id="@+id/titleText"
4040
style="@style/Widget.Vector.TextView.Body.Medium"
41-
android:layout_width="wrap_content"
41+
android:layout_width="0dp"
4242
android:layout_height="wrap_content"
43+
android:layout_marginEnd="4dp"
4344
android:contentDescription="@string/avatar"
45+
android:ellipsize="end"
46+
android:maxLines="1"
47+
app:layout_constraintEnd_toStartOf="@id/liveIndicator"
4448
app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
4549
app:layout_constraintTop_toTopOf="parent"
46-
tools:text="@sample/users.json/data/displayName" />
50+
tools:text="@sample/rooms.json/data/name" />
4751

48-
<androidx.constraintlayout.helper.widget.Flow
49-
android:id="@+id/metadataFlow"
50-
android:layout_width="wrap_content"
52+
<LinearLayout
53+
android:id="@+id/metadataGroup"
54+
android:layout_width="0dp"
5155
android:layout_height="wrap_content"
5256
android:layout_marginTop="4dp"
57+
android:layout_marginEnd="4dp"
5358
android:orientation="vertical"
54-
app:constraint_referenced_ids="listenersCountMetadata,remainingTimeMetadata"
55-
app:flow_horizontalAlign="start"
56-
app:flow_verticalGap="4dp"
59+
app:layout_constraintEnd_toStartOf="@id/liveIndicator"
5760
app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
58-
app:layout_constraintTop_toBottomOf="@id/titleText" />
61+
app:layout_constraintTop_toBottomOf="@id/titleText">
5962

60-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
61-
android:id="@+id/listenersCountMetadata"
62-
android:layout_width="wrap_content"
63-
android:layout_height="wrap_content"
64-
app:metadataIcon="@drawable/ic_member_small"
65-
app:metadataValue="@string/no_value_placeholder"
66-
tools:metadataValue="5 listening" />
63+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
64+
android:id="@+id/listenersCountMetadata"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:layout_marginBottom="4dp"
68+
app:metadataIcon="@drawable/ic_member_small"
69+
app:metadataValue="@string/no_value_placeholder"
70+
tools:metadataValue="5 listening" />
6771

68-
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
69-
android:id="@+id/remainingTimeMetadata"
70-
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
app:metadataIcon="@drawable/ic_timer"
73-
tools:metadataValue="3h 2m 50s left" />
72+
<im.vector.app.features.voicebroadcast.views.VoiceBroadcastMetadataView
73+
android:id="@+id/remainingTimeMetadata"
74+
android:layout_width="wrap_content"
75+
android:layout_height="wrap_content"
76+
android:layout_marginBottom="4dp"
77+
app:metadataIcon="@drawable/ic_timer"
78+
tools:metadataValue="3h 2m 50s left" />
79+
</LinearLayout>
7480

7581
<androidx.constraintlayout.widget.Barrier
7682
android:id="@+id/headerBottomBarrier"
7783
android:layout_width="wrap_content"
7884
android:layout_height="wrap_content"
7985
app:barrierDirection="bottom"
8086
app:barrierMargin="12dp"
81-
app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataFlow" />
87+
app:constraint_referenced_ids="roomAvatarImageView,titleText,metadataGroup" />
8288

8389
<androidx.constraintlayout.helper.widget.Flow
8490
android:id="@+id/controllerButtonsFlow"

0 commit comments

Comments
 (0)