Skip to content

Fix/letter padding view #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ksiomng merged 4 commits into from
Dec 18, 2024
Merged

Fix/letter padding view #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89be9ba
Fix: νŽΈμ§€λ³΄κ΄€ν•¨μ— μžˆλŠ” νŽΈμ§€ λ·° λΆ€λΆ„μ΄λž‘ νŒ¨λ”© μ‚¬μ΄μ¦ˆ 톡일
ksiomng Dec 11, 2024
6f235d2
Fix: λ³΄μ—¬μ§€λŠ” νŽΈμ§€ λ·° 크기 λ³€κ²½
uunwon Dec 11, 2024
a3037f7
Fix: νŽΈμ§€ μ‚¬μ΄μ¦ˆ μ‘°μ •ν•˜λ©΄μ„œ κΈ€μžμˆ˜ λ„˜μΉ˜λŠ” 문제λ₯Ό κΈ€μžμˆ˜ μ€„μ—¬μ„œ ν•΄κ²°
ksiomng Dec 11, 2024
1552399
Fix: 폰트λ₯Ό UIFont 둜 λ³€κ²½
uunwon Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions Kabinett/Presentation/View/LetterBox/Components/ContentRectangleView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ struct ContentRectangleView: View {
var currentPageIndex: Int
var totalPages: Int

let screenWidth = UIScreen.main.bounds.width
let screenHeight = UIScreen.main.bounds.height

var body: some View {
GeometryReader { geometry in
ZStack {
Expand All @@ -30,47 +33,45 @@ struct ContentRectangleView: View {
.resizable()) :
AnyView(Color.white)
)
.aspectRatio(9/13, contentMode: .fit)
.frame(width: geometry.size.width * 0.88)
.shadow(color: .primary300, radius: 5, x: 3, y: 3)

VStack {
Text(toUserName)
.font(FontUtility.selectedFont(font: fontString, size: 14))
.foregroundStyle(.contentPrimary)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.top, geometry.size.height * 0.2)
.padding(.leading, 10)
.padding(.top, screenHeight * 0.05)
.opacity(currentPageIndex == 0 ? 1 : 0)

Text(letterContent.forceCharWrapping)
.font(FontUtility.selectedFont(font: fontString, size: FontUtility.fontSize(font: fontString)))
.lineSpacing(FontUtility.lineSpacing(font: fontString))
.kerning(FontUtility.kerning(font: fontString))
.foregroundStyle(.contentPrimary)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.top, 3)
.padding(.leading, 10)
.padding(.top, screenHeight * 0.01)
.font(Font(FontUtility.selectedUIFont(font: fontString, size: FontUtility.fontSize(font: fontString))))

Spacer()

Text(formattedDate(date: date))
.font(FontUtility.selectedFont(font: fontString, size: 14))
.foregroundStyle(.contentPrimary)
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(.bottom, 0.1)
.padding(.bottom, screenHeight * 0.00001)
.opacity(currentPageIndex == max(totalPages - 1, 0) ? 1 : 0)

Text(fromUserName)
.font(FontUtility.selectedFont(font: fontString, size: 14))
.foregroundStyle(.contentPrimary)
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(.bottom, geometry.size.height * 0.2)
.padding(.bottom, screenHeight * 0.05)
.opacity(currentPageIndex == max(totalPages - 1, 0) ? 1 : 0)
}
.padding(.horizontal, geometry.size.width * 0.06)
.frame(width: geometry.size.width * 0.88, height: geometry.size.height)

.padding(.horizontal, screenWidth * 0.08)
}
.aspectRatio(9/13, contentMode: .fit)
.frame(width: screenWidth * 0.88)
.padding(.bottom, 30)
.position(x: geometry.size.width / 2, y: geometry.size.height / 2)
}
Expand Down
38 changes: 19 additions & 19 deletions Kabinett/Presentation/View/WriteLetter/ContentWriteView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ struct ContentWriteView: View {
.clipShape(Capsule())
.shadow(color: Color(.primary300), radius: 5, x: 3, y: 3)
.padding(.top, -10)

}
}
.toolbar {
Expand Down Expand Up @@ -118,6 +117,9 @@ struct ContentWriteView: View {

// MARK: - ScrollableLetterView
struct ScrollableLetterView: View {
let screenWidth = UIScreen.main.bounds.width
let screenHeight = UIScreen.main.bounds.height

@Binding var letterContent: LetterWriteModel
@ObservedObject var viewModel: ContentWriteViewModel
@Binding var currentIndex: Int
Expand All @@ -137,20 +139,18 @@ struct ScrollableLetterView: View {
}
.resizable()
.shadow(color: Color(.primary300), radius: 5, x: 3, y: 3)
.padding(.top, 10)

VStack {
HStack {
Text(i == 0 ? letterContent.toUserName : "")
.frame(maxWidth: .infinity, alignment: .leading)
.onTapGesture {
UIApplication.shared.endEditing()
}
Spacer()
}
.padding(.top, 45)
.padding(.leading, 2)
.padding(.bottom, 3)
Text(i == 0 ? letterContent.toUserName : "")
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.top, screenHeight * 0.05)
.padding(.bottom, screenHeight * 0.01)
.onAppear {
print(screenHeight)
}
.onTapGesture {
UIApplication.shared.endEditing()
}

GeometryReader { geo in
CustomTextEditor(
Expand All @@ -170,16 +170,16 @@ struct ScrollableLetterView: View {
}

Text(i == (viewModel.texts.count-1) ? (letterContent.date).formattedString() : "")
.padding(.trailing, 2)
.padding(.bottom, screenHeight * 0.00001)
.frame(maxWidth: .infinity, alignment: .trailing)

Text(i == (viewModel.texts.count-1) ? letterContent.fromUserName : "")
.padding(.bottom, 30)
.padding(.trailing, 2)
.padding(.bottom, screenHeight * 0.05)
.frame(maxWidth: .infinity, alignment: .trailing)
}
.padding(.horizontal, UIScreen.main.bounds.width * 0.1)
.padding(.horizontal, UIScreen.main.bounds.width * 0.08)
}
.padding(.top, 10)
.aspectRatio(9/13, contentMode: .fit)
.frame(width: UIScreen.main.bounds.width * 0.88)
.id(i)
Expand All @@ -193,7 +193,7 @@ struct ScrollableLetterView: View {
.scrollTargetLayout()
}
.scrollTargetBehavior(.viewAligned)
.font(FontUtility.selectedFont(font: letterContent.fontString ?? "", size: 15))
.font(FontUtility.selectedFont(font: letterContent.fontString ?? "", size: 14))
.onChange(of: viewModel.texts.count) {
withAnimation {
scrollViewProxy.scrollTo((currentIndex+1), anchor: .center)
Expand Down Expand Up @@ -234,7 +234,7 @@ struct CustomTextEditor: UIViewRepresentable {
var lineSpacing: CGFloat
var kerning: CGFloat

let maxCharacterLimit: Int = 427
let maxCharacterLimit: Int = 397

class Coordinator: NSObject, UITextViewDelegate {
var parent: CustomTextEditor
Expand Down
Loading