Skip to content
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

[Update] 강제 업데이트 및 레이아웃 개선 #249

Merged
merged 2 commits into from
Jan 16, 2025
Merged

[Update] 강제 업데이트 및 레이아웃 개선 #249

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
ff17c84
Merge pull request #247 from Team-Smeme/develop
cchanmi Dec 24, 2024
ffcad9d
[RELEASE] 3.1.0 / 2024121201 update
cchanmi Dec 24, 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
2 changes: 1 addition & 1 deletion Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,7 @@
CODE_SIGN_ENTITLEMENTS = "Smeem-iOS/Smeem-iOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Distribution: YuJi Lee (K8LLWYQWXD)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2024122400;
CURRENT_PROJECT_VERSION = 2024122401;
DEVELOPMENT_TEAM = K8LLWYQWXD;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Smeem-iOS/Info.plist";
Expand Down
34 changes: 23 additions & 11 deletions Smeem-iOS/Smeem-iOS/Presentation/DetailDiary/DetailDiaryCoachedView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ struct DetailDiaryCoachedView: View {
// MARK: - Body

var body: some View {
ZStack {
Color.white.ignoresSafeArea()
VStack(spacing: 0) {
SwiftUINavigationView(navigationViewModel: navigationViewModel,
selectedIndex: $selectedIndex,
Expand Down Expand Up @@ -98,13 +96,36 @@ struct DetailDiaryCoachedView: View {
dateText: response.createdAt,
authorText: response.username
)
.gesture(
DragGesture()
.onEnded { value in
if value.translation.width > 50 {
dismiss()
}
}
)
} else {
if isLoading {
SmemeEmptyView()
SmemeLoadingView()
}
}

GeometryReader { geomerty in
Rectangle()
.frame(height: geomerty.size.height)
.foregroundStyle(Color(UIColor.white))
.opacity(0.1)
.gesture(
DragGesture()
.onEnded { value in
if value.translation.width > 50 {
dismiss()
}
}
)}
.frame(width: screenWidth)

// "코칭 ON"일 때만 표시
if selectedIndex == 1 {
Spacer()
Expand Down Expand Up @@ -149,15 +170,6 @@ struct DetailDiaryCoachedView: View {
onError = false
}
}
}
.gesture(
DragGesture()
.onEnded { value in
if value.translation.width > 50 {
dismiss()
}
}
)
}
}
}
Expand Down
Loading