Skip to content

Commit e942709

Browse files
authored
fix: UI issues for newly created group [WPB-15380] (#3884)
1 parent 7707889 commit e942709

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContainerItem.kt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,17 @@
1717
*/
1818
package com.wire.android.ui.home.conversations.messages.item
1919

20-
import androidx.compose.foundation.background
2120
import androidx.compose.foundation.layout.Row
22-
import androidx.compose.foundation.layout.fillMaxWidth
23-
import androidx.compose.foundation.layout.height
24-
import androidx.compose.foundation.layout.padding
25-
import androidx.compose.material3.MaterialTheme
26-
import androidx.compose.material3.Text
2721
import androidx.compose.runtime.Composable
28-
import androidx.compose.ui.Alignment
2922
import androidx.compose.ui.Modifier
3023
import androidx.compose.ui.graphics.Color
3124
import com.wire.android.media.audiomessage.AudioSpeed
3225
import com.wire.android.media.audiomessage.AudioState
3326
import com.wire.android.ui.common.colorsScheme
34-
import com.wire.android.ui.common.dimensions
3527
import com.wire.android.ui.home.conversations.SelfDeletionTimerHelper
3628
import com.wire.android.ui.home.conversations.info.ConversationDetailsData
3729
import com.wire.android.ui.home.conversations.model.UIMessage
38-
import com.wire.android.ui.home.conversations.model.UIMessageContent
3930
import com.wire.android.ui.home.conversations.rememberSelfDeletionTimer
40-
import com.wire.android.ui.theme.wireTypography
4131
import com.wire.kalium.logic.data.asset.AssetTransferStatus
4232

4333
@Suppress("ComplexMethod")
@@ -109,20 +99,4 @@ fun MessageContainerItem(
10999
)
110100
}
111101
}
112-
if (message.messageContent is UIMessageContent.SystemMessage.ConversationMessageCreated) {
113-
Row(
114-
Modifier
115-
.background(colorsScheme().background)
116-
.height(dimensions().spacing24x)
117-
.fillMaxWidth()
118-
) {
119-
Text(
120-
modifier = Modifier
121-
.padding(start = dimensions().spacing56x)
122-
.align(Alignment.CenterVertically),
123-
style = MaterialTheme.wireTypography.title03,
124-
text = (message.messageContent as UIMessageContent.SystemMessage.ConversationMessageCreated).date
125-
)
126-
}
127-
}
128102
}

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fun SystemMessageItem(
7575
fullAvatarOuterPadding = dimensions().avatarClickablePadding,
7676
leading = {
7777
SystemMessageItemLeading(
78-
modifier = Modifier.padding(end = dimensions().avatarClickablePadding),
78+
modifier = Modifier.padding(end = dimensions().spacing16x),
7979
messageContent = message.messageContent
8080
)
8181
},

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@
749749
</plurals>
750750
<string name="label_system_message_user_not_available">This user is no longer available</string>
751751
<string name="label_system_message_unsupported_protocol">The conversation is using an encryption protocol that is
752-
not supported by this device. Some devices from the involve users might need updating.
752+
not supported by this device. Some devices from the involved users might need updating.
753753
</string>
754754
<string name="label_system_message_new_conversation_receipt_mode">Read receipts are %1$s</string>
755755
<string name="label_system_message_read_receipt_changed_by_self">%1$s turned read receipts %2$s for everyone</string>

0 commit comments

Comments
 (0)