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

[Feature] 마커 클릭시 bottom의 cardview 애니메이션 추가 #332

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[Feature] 마커 클릭시 bottom의 cardview 애니메이션 추가 #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Projects/Coffice/Sources/App/Main/Search/CafeMapCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ struct CafeMapCore: Reducer {
struct State: Equatable {
// MARK: CardViewUI
var maxScreenWidth: CGFloat = .zero
var fixedImageSize: CGFloat { (maxScreenWidth - 56) / 3 }
var fixedCardTitleSize: CGFloat { maxScreenWidth - 48 }
var fixedImageSize: CGFloat { max(maxScreenWidth - 56, 0) / 3 }
var fixedCardTitleSize: CGFloat { max(maxScreenWidth - 48, 0) }
var isFirstOnAppear: Bool = true
@BindingState var shouldShowToast = false
var toastType: ToastType = .toastByBookmark
Expand Down
11 changes: 6 additions & 5 deletions Projects/Coffice/Sources/App/Main/Search/CafeMapView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ struct CafeMapView: View {
Spacer()
bottomFloatingButtonView
.padding(.trailing, 24)
if viewStore.naverMapState.selectedCafe != nil {
CafeCardView(store: store)
.frame(width: geometry.size.width)
.onTapGesture { viewStore.send(.cardViewTapped) }
}
CafeCardView(store: store)
.frame(width: geometry.size.width)
.opacity(viewStore.naverMapState.selectedCafe == nil ? 0 : 1)
.offset(y: viewStore.naverMapState.selectedCafe == nil ? 300 : 0)
.animation(.easeInOut(duration: 0.2), value: viewStore.naverMapState.selectedCafe)
.onTapGesture { viewStore.send(.cardViewTapped) }
}
.frame(
width: geometry.size.width,
Expand Down