Skip to content

풀스크린맵뷰 애니메이션 제거와 어드민페이지 수정화면 정상화 #148

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
zzangzzangguy merged 3 commits into from
May 13, 2025
Merged

풀스크린맵뷰 애니메이션 제거와 어드민페이지 수정화면 정상화 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9001467
fix/#139: 어드민페이지 수정화면 이슈 해결
zzangzzangguy May 12, 2025
227389d
fix/#139: 특정위치에서 화면이동되지않고 바로 해당위치에 포커스되도록 수정
zzangzzangguy May 12, 2025
cc4e502
style/#139: Apply SwiftLint autocorrect
github-actions[bot] May 13, 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
28 changes: 9 additions & 19 deletions Poppool/PresentationLayer/Presentation/Presentation/Scene/Admin/AdminViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,26 +176,17 @@ final class AdminViewController: BaseViewController, View {
adminUseCase.fetchStoreDetail(id: store.id)
.observe(on: MainScheduler.instance)
.subscribe(
onNext: { [weak self] storeDetail in
onNext: { [weak self] _ in
guard let self = self else { return }
let updateParams = UpdateStoreParams(
id: storeDetail.id,
name: storeDetail.name,
categoryId: storeDetail.categoryId,
desc: storeDetail.description,
address: storeDetail.address,
startDate: storeDetail.startDate,
endDate: storeDetail.endDate,
mainImageUrl: storeDetail.mainImageUrl,
imageUrlList: storeDetail.images.map { $0.imageUrl },
imagesToDelete: [],
latitude: storeDetail.latitude,
longitude: storeDetail.longitude,
markerTitle: storeDetail.markerTitle,
markerSnippet: storeDetail.markerSnippet,
startDateBeforeEndDate: true
let registerVC = PopUpStoreRegisterViewController(
nickname: self.nickname,
editingStore: store
)
let registerVC = PopUpStoreRegisterViewController(nickname: self.nickname)

registerVC.completionHandler = { [weak self] in
Copy link
Member

@dongglehada dongglehada May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Completion 사용의 이유가 있을까요? rx로 동기 비동기를 처리하고 있는 상황인 것 같아서 호기심에 여쭤봅니다!

self?.reactor?.action.onNext(.reloadData)
}

self.navigationController?.pushViewController(registerVC, animated: true)
},
onError: { [weak self] error in
Expand All @@ -206,7 +197,6 @@ final class AdminViewController: BaseViewController, View {
}

private func deleteStore(_ store: AdminStore) {
// 먼저 스토어 상세 정보를 가져와 모든 이미지 URL을 확인
adminUseCase.fetchStoreDetail(id: store.id)
.observe(on: MainScheduler.instance)
.subscribe(
Expand Down
8 changes: 4 additions & 4 deletions ...resentation/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ class FullScreenMapViewController: MapViewController {
let position = NMGLatLng(lat: store.latitude, lng: store.longitude)

let cameraUpdate = NMFCameraUpdate(scrollTo: position, zoomTo: 15.0)
cameraUpdate.animation = .easeIn
cameraUpdate.animationDuration = 0.3
mainView.mapView.cancelTransitions()
cameraUpdate.animation = .none
mainView.mapView.moveCamera(cameraUpdate)

if let existingMarker = initialMarker {
Expand Down Expand Up @@ -210,8 +210,8 @@ class FullScreenMapViewController: MapViewController {
mainView.setStoreCardHidden(false, animated: true)

let cameraUpdate = NMFCameraUpdate(scrollTo: marker.position, zoomTo: 15.0)
cameraUpdate.animation = .easeIn
cameraUpdate.animationDuration = 0.3
mainView.mapView.cancelTransitions()
cameraUpdate.animation = .none
mainView.mapView.moveCamera(cameraUpdate)

DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
Expand Down