Compare commits

..

No commits in common. "331ec94ede7b42fd102181c5f662db2258173e31" and "5e419e8b0f4b759784b0d0af3d40e13d070dacab" have entirely different histories.

View File

@ -210,35 +210,29 @@ struct PrivateChatView: View {
private var composer: some View { private var composer: some View {
VStack(spacing: 10) { VStack(spacing: 10) {
HStack(alignment: .bottom, spacing: 12) { HStack(alignment: .bottom, spacing: 12) {
Button(action: { }) { // переключатель на стикеры Button(action: { }) { // переключатель на стикеры
Image(systemName: "paperclip") Image(systemName: "paperclip")
.font(.system(size: 18, weight: .semibold)) .font(.system(size: 18, weight: .semibold))
.frame(width: 40, height: 40) .frame(width: 40, height: 40)
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
ZStack(alignment: .bottomTrailing) { HStack(alignment: .center, spacing: 8) {
TextField(inputTab.placeholder, text: $draftText, axis: .vertical) TextField(inputTab.placeholder, text: $draftText, axis: .vertical)
.lineLimit(1...4) .lineLimit(1...4)
.focused($isComposerFocused) .focused($isComposerFocused)
.submitLabel(.send) .submitLabel(.send)
.disabled(viewModel.isSending || currentUserId == nil) .disabled(viewModel.isSending || currentUserId == nil)
.onSubmit { sendCurrentMessage() } .onSubmit { sendCurrentMessage() }
.padding(.top, 10)
.padding(.leading, 12)
.padding(.trailing, 44)
.padding(.bottom, 10)
.frame(maxWidth: .infinity, minHeight: 40, alignment: .bottomLeading)
Button(action: { }) { // переключатель на стикеры Button(action: { }) { // переключатель на стикеры
Image(systemName: "face.smiling") Image(systemName: "face.smiling")
.font(.system(size: 18, weight: .semibold)) .font(.system(size: 18, weight: .semibold))
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
.padding(.trailing, 12)
.padding(.bottom, 10)
} }
.frame(minHeight: 40, alignment: .bottom) .padding(.vertical, 10)
.padding(.horizontal, 12)
.background(Color(.secondarySystemBackground)) .background(Color(.secondarySystemBackground))
.clipShape(RoundedRectangle(cornerRadius: 18, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: 18, style: .continuous))