messenger/ios_app_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: messenger:93c865f5ca2d9942080d7f617bb705dbb7811cdc
Branches Tags
messenger:main
messenger:test-view-open-chat
..
compare: messenger:96856740560c9d9766f5afaeb743ce86c969efaf
Branches Tags
messenger:main
messenger:test-view-open-chat

No commits in common. "93c865f5ca2d9942080d7f617bb705dbb7811cdc" and "96856740560c9d9766f5afaeb743ce86c969efaf" have entirely different histories.
93c865f5ca ... 9685674056

1 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

17
yobble/Views/Chat/PrivateChatView.swift
View File

@ -209,7 +209,7 @@ struct PrivateChatView: View {
private var composer: some View { private var composer: some View {
VStack(spacing: 10) { VStack(spacing: 10) {
HStack(alignment: .bottom, spacing: 4) { HStack(alignment: .bottom, spacing: 3) {
Button(action: { }) { // переключатель на стикеры Button(action: { }) { // переключатель на стикеры
Image(systemName: "paperclip") Image(systemName: "paperclip")
.font(.system(size: 18, weight: .semibold)) .font(.system(size: 18, weight: .semibold))
@ -241,9 +241,6 @@ struct PrivateChatView: View {
.frame(minHeight: 40, alignment: .bottom) .frame(minHeight: 40, alignment: .bottom)
.background(Color(.secondarySystemBackground)) .background(Color(.secondarySystemBackground))
.clipShape(RoundedRectangle(cornerRadius: 18, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: 18, style: .continuous))
.alignmentGuide(.bottom) { dimension in
dimension[VerticalAlignment.bottom] - 2
}
if !isSendAvailable { if !isSendAvailable {
Button(action: { isVideoPreferred.toggle() }) { Button(action: { isVideoPreferred.toggle() }) {
@ -258,7 +255,7 @@ struct PrivateChatView: View {
} }
} }
} }
.padding(.horizontal, 6) .padding(.horizontal, 10)
.padding(.top, 10) .padding(.top, 10)
.padding(.bottom, 8) .padding(.bottom, 8)
.background(.ultraThinMaterial) .background(.ultraThinMaterial)
@ -274,11 +271,11 @@ struct PrivateChatView: View {
private var sendButton: some View { private var sendButton: some View {
Button(action: sendCurrentMessage) { Button(action: sendCurrentMessage) {
Image(systemName: "paperplane.fill") Image(systemName: viewModel.isSending ? "hourglass" : "paperplane.fill")
.font(.system(size: 16, weight: .semibold)) .font(.system(size: 18, weight: .semibold))
.foregroundColor(Color.white.opacity(isSendDisabled ? 0.6 : 1)) .foregroundColor(.white)
.frame(width: 36, height: 36) .frame(width: 40, height: 40)
.background(isSendDisabled ? Color.accentColor.opacity(0.4) : Color.accentColor) .background(Color.accentColor)
.clipShape(Circle()) .clipShape(Circle())
} }
.disabled(isSendDisabled) .disabled(isSendDisabled)