Skip to content

Fix/content write font change #291

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

Closed
ksiomng wants to merge 2 commits into from
Closed

Fix/content write font change #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ff984
Feat: ν˜„μž¬ 높이λ₯Ό κ΅¬ν•˜κ³  ν™”λ©΄μ˜ μΌλΆ€λΆ„κΉŒμ§€λŠ” μž…λ ₯ν•  수 μžˆλŠ” ν•¨μˆ˜ 생성
ksiomng Jan 22, 2025
b6989e2
Feat: λ†’μ΄λ‘œ 계산해 3/2정도 μ°Όμ„λ•Œ κΉŒμ§€λŠ” 폰트 λ³€κ²½κ°€λŠ₯
ksiomng Jan 22, 2025
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
3 changes: 3 additions & 0 deletions Kabinett/Presentation/View/WriteLetter/Components/CustomTextEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ struct CustomTextEditor: UIViewRepresentable {
var maxWidth: CGFloat
var maxHeight: CGFloat
var font: UIFont
@Binding var currentHeight: CGFloat

class Coordinator: NSObject, UITextViewDelegate {
var parent: CustomTextEditor
Expand All @@ -24,6 +25,8 @@ struct CustomTextEditor: UIViewRepresentable {
func textViewDidChange(_ textView: UITextView) {
let size = textView.sizeThatFits(CGSize(width: parent.maxWidth, height: CGFloat.greatestFiniteMagnitude))

parent.currentHeight = size.height

if size.height > parent.maxHeight {
textView.text = parent.text
} else {
Expand Down
10 changes: 3 additions & 7 deletions Kabinett/Presentation/View/WriteLetter/Components/MiniTabBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@ struct MiniTabBarView: View {
.background(viewModel.isFontEdit ? Color.clear : Color(.primary300))
.clipShape(Capsule())
}
.disabled(viewModel.isFontEdit ? false : true)
.onChange(of: viewModel.texts) {
if viewModel.texts.contains(where: { !$0.isEmpty }) {
viewModel.isFontEdit = false
} else {
viewModel.isFontEdit = true
}
.disabled(!viewModel.isFontEdit)
.onChange(of: viewModel.currentHeight) {
viewModel.updateFontEditState()
}

Button {
Expand Down
3 changes: 2 additions & 1 deletion Kabinett/Presentation/View/WriteLetter/ContentWriteView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ struct ScrollableLetterView: View {
text: $viewModel.texts[i],
maxWidth: geo.size.width,
maxHeight: geo.size.height,
font: FontUtility.selectedUIFont(font: letterContent.fontString ?? "", size: FontUtility.fontSize(font: letterContent.fontString ?? ""))
font: FontUtility.selectedUIFont(font: letterContent.fontString ?? "", size: FontUtility.fontSize(font: letterContent.fontString ?? "")),
currentHeight: $viewModel.currentHeight
//lineSpacing: FontUtility.lineSpacing(font: letterContent.fontString ?? ""),
//kerning: FontUtility.kerning(font: letterContent.fontString ?? "")
)
Expand Down
6 changes: 6 additions & 0 deletions Kabinett/Presentation/ViewModel/WriteLetter/ContentWriteViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ class ContentWriteViewModel: ObservableObject {

@Published var showFontMenu: Bool = false
@Published var isFontEdit: Bool = true

@Published var currentHeight: CGFloat = 0.0

func updateFontEditState() {
isFontEdit = currentHeight < UIScreen.main.bounds.height * 0.3
}

func toggleFontView() {
showFontMenu.toggle()
Expand Down
Loading