diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift index f8723fdba8..e2b51cd16e 100644 --- a/apps/ios/Shared/Views/Chat/ChatView.swift +++ b/apps/ios/Shared/Views/Chat/ChatView.swift @@ -46,6 +46,7 @@ struct ChatView: View { var body: some View { if #available(iOS 16.0, *) { viewBody + .toolbarBackground(.visible, for: .navigationBar) .scrollDismissesKeyboard(.immediately) .keyboardPadding() } else { @@ -697,19 +698,19 @@ struct ChatView: View { chatItemWithMenu(ci, range, maxWidth) } } - .padding(.top, 5) + .padding(.bottom, 5) .padding(.trailing) .padding(.leading, 12) } else { chatItemWithMenu(ci, range, maxWidth) - .padding(.top, 5) + .padding(.bottom, 5) .padding(.trailing) .padding(.leading, memberImageSize + 8 + 12) } } else { chatItemWithMenu(ci, range, maxWidth) .padding(.horizontal) - .padding(.top, 5) + .padding(.bottom, 5) } } diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift index c1b709fea5..5161820390 100644 --- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift +++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift @@ -284,6 +284,7 @@ struct ComposeView: View { var body: some View { VStack(spacing: 0) { + Divider() if chat.chatInfo.contact?.nextSendGrpInv ?? false { ContextInvitingContactMemberView() } @@ -359,7 +360,6 @@ struct ComposeView: View { : theme.colors.primary ) .padding(.trailing, 12) - .background(theme.colors.background) .disabled(!chat.userCanSend) if chat.userIsObserver { @@ -377,6 +377,7 @@ struct ComposeView: View { } } } + .background(Color(uiColor: .tertiarySystemGroupedBackground).opacity(0.7)) .onChange(of: composeState.message) { msg in if composeState.linkPreviewAllowed { if msg.count > 0 { diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift index a52cc7f71a..a720c3aaaf 100644 --- a/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift +++ b/apps/ios/Shared/Views/Chat/ComposeMessage/SendMessageView.swift @@ -44,6 +44,7 @@ struct SendMessageView: View { var body: some View { ZStack { + let composeShape = RoundedRectangle(cornerSize: CGSize(width: 20, height: 20)) HStack(alignment: .bottom) { ZStack(alignment: .leading) { if case .voicePreview = composeState.preview { @@ -84,10 +85,9 @@ struct SendMessageView: View { } } .padding(.vertical, 1) - .overlay( - RoundedRectangle(cornerSize: CGSize(width: 20, height: 20)) - .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true) - ) + .background(theme.colors.background) + .clipShape(composeShape) + .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)) } .onChange(of: composeState.message, perform: { text in updateFont(text) }) .onChange(of: composeState.inProgress) { inProgress in