keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor and clean up

Browse Source
pull/874/head
Ryan Zhao 2 years ago
parent 9efba621f7
commit 70606652e4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File

18
Session/Media Viewing & Editing/MessageInfoView.swift
Unescape Escape View File

@ -60,7 +60,7 @@ struct MessageInfoView: View {
.fixedSize(horizontal: true, vertical: true) .fixedSize(horizontal: true, vertical: true)
.padding(.top, Values.smallSpacing) .padding(.top, Values.smallSpacing)
.padding(.bottom, Values.verySmallSpacing) .padding(.bottom, Values.verySmallSpacing)
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
} }
if isMessageFailed { if isMessageFailed {
@ -86,7 +86,7 @@ struct MessageInfoView: View {
} }
.padding(.top, -Values.smallSpacing) .padding(.top, -Values.smallSpacing)
.padding(.bottom, Values.verySmallSpacing) .padding(.bottom, Values.verySmallSpacing)
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
} }
if let attachments = messageViewModel.attachments { if let attachments = messageViewModel.attachments {
@ -118,7 +118,7 @@ struct MessageInfoView: View {
) )
.aspectRatio(1, contentMode: .fit) .aspectRatio(1, contentMode: .fit)
.clipShape(RoundedRectangle(cornerRadius: 15)) .clipShape(RoundedRectangle(cornerRadius: 15))
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
} }
Button { Button {
@ -218,7 +218,7 @@ struct MessageInfoView: View {
.frame(maxHeight: .infinity) .frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.padding(.vertical, Values.verySmallSpacing) .padding(.vertical, Values.verySmallSpacing)
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
} }
// Message Info // Message Info
@ -281,7 +281,7 @@ struct MessageInfoView: View {
VStack( VStack(
alignment: .leading, alignment: .leading,
spacing: 4 spacing: Values.verySmallSpacing
) { ) {
if !messageViewModel.authorName.isEmpty { if !messageViewModel.authorName.isEmpty {
Text(messageViewModel.authorName) Text(messageViewModel.authorName)
@ -306,7 +306,7 @@ struct MessageInfoView: View {
.frame(maxHeight: .infinity) .frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.padding(.vertical, Values.verySmallSpacing) .padding(.vertical, Values.verySmallSpacing)
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
// Actions // Actions
if !actions.isEmpty { if !actions.isEmpty {
@ -361,7 +361,7 @@ struct MessageInfoView: View {
.frame(maxHeight: .infinity) .frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.padding(.vertical, Values.verySmallSpacing) .padding(.vertical, Values.verySmallSpacing)
.padding(.horizontal, 30) .padding(.horizontal, Values.largeSpacing)
} }
} }
} }
@ -374,6 +374,8 @@ struct InfoBlock<Content>: View where Content: View {
let title: String let title: String
let content: () -> Content let content: () -> Content
private let minWidth: CGFloat = 100
var body: some View { var body: some View {
VStack( VStack(
alignment: .leading, alignment: .leading,
@ -386,7 +388,7 @@ struct InfoBlock<Content>: View where Content: View {
self.content() self.content()
} }
.frame( .frame(
minWidth: 100, minWidth: minWidth,
alignment: .leading alignment: .leading
) )
} }

Write Preview
Loading…
Cancel
Save