Merge branch 'master' into master-android

This commit is contained in:
Evgeny Poberezkin
2024-05-05 17:43:26 +01:00
14 changed files with 90 additions and 32 deletions
@@ -248,7 +248,10 @@ struct FramedItemView: View {
Group {
if let sender = qi.getSender(membership()) {
VStack(alignment: .leading, spacing: 2) {
Text(sender).font(.caption).foregroundColor(.secondary)
Text(sender)
.font(.caption)
.foregroundColor(.secondary)
.lineLimit(1)
ciQuotedMsgTextView(qi, lines: 2)
}
} else {
@@ -593,6 +593,7 @@ struct ChatView: View {
Text(memberNames(member, prevMember, memCount))
.font(.caption)
.foregroundStyle(.secondary)
.lineLimit(2)
.padding(.leading, memberImageSize + 14)
.padding(.top, 7)
}
+1 -1
View File
@@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId = "chat.simplex.app"
namespace = "chat.simplex.app"
minSdk = 28
minSdk = 26
//noinspection OldTargetApi
targetSdk = 33
// !!!
+1 -1
View File
@@ -113,7 +113,7 @@ android {
compileSdk = 34
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = 28
minSdk = 26
}
testOptions.targetSdk = 33
lint.targetSdk = 33
@@ -1003,7 +1003,8 @@ fun BoxWithConstraintsScope.ChatItemsList(
Text(
memberNames(member, prevMember, memCount),
Modifier.padding(start = MEMBER_IMAGE_SIZE + 10.dp),
style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary)
style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
maxLines = 2
)
}
Row(
@@ -76,7 +76,8 @@ fun FramedItemView(
) {
Text(
sender,
style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary)
style = TextStyle(fontSize = 13.5.sp, color = CurrentColors.value.colors.secondary),
maxLines = 1
)
ciQuotedMsgTextView(qi, lines = 2)
}