Merge pull request #172 from YAPP-Github/develop

[Release] 1.1.4 배포

Author: Remaked-Swain

.github/workflows/release.yml

@@ -65,7 +65,24 @@ jobs:
           ASC_KEY_CONTENT: ${{ secrets.ASC_KEY_CONTENT }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
 
-      # 8. Discord 결과 알림 (성공/실패 여부 전송)
+      # 8. 배포 완료 후 서버로 최신 버전 정보 POST 요청
+      - name: Send Version Update to Server
+        if: success() # 배포가 성공적으로 끝났을 때만 실행
+        run: |
+          # Xcode 빌드 세팅에서 MARKETING_VERSION(앱 버전) 자동 추출
+          APP_VERSION=$(xcodebuild -showBuildSettings -project ./Neki-iOS.xcodeproj -scheme Neki-iOS | grep " MARKETING_VERSION " | sed 's/[ ]*MARKETING_VERSION = //')
+          
+          echo "추출된 최신 버전: $APP_VERSION"
+
+          # 추출된 버전을 JSON 바디에 담아서 서버로 POST 요청 (minVersion은 필요시 추후 수정)
+               curl -X POST "${{ secrets.APP_VERSION_API_ADDRESS }}" \
+               -H "Content-Type: application/json" \
+               -d "{
+                 \"minVersion\": \"1.0.0\",
+                 \"currentVersion\": \"$APP_VERSION\"
+               }"
+
+      # 9. Discord 결과 알림 (성공/실패 여부 전송)
       - name: Send Discord notification
         if: always() # 빌드 성공/실패 여부와 상관없이 무조건 실행
         run: |

Neki-iOS.xcodeproj/project.pbxproj

@@ -309,9 +309,11 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "Neki-iOS/Neki-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
-				DEVELOPMENT_TEAM = 586LZSS32L;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 0;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 586LZSS32L;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Neki-iOS/Info.plist";
@@ -334,6 +336,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OneTen.Neki-dev";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev_neki;
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -359,7 +362,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 586LZSS32L;
 				ENABLE_PREVIEWS = YES;
@@ -384,7 +387,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.OneTen.Neki-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.OneTen.Neki-iOS";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = neki_release;
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

Neki-iOS/APP/Sources/MainTab/MainTabCoordinator.swift

@@ -221,6 +221,13 @@ struct MainTabCoordinator {
                 state.selectedTab = .archive
                 return .send(.archive(.root(.addPhotoFromQRScanner(imageID: imageID))))
 
+            case .destination(.presented(.qrScan(.addPhotoFromGalleryButtonTapped))):
+                state.destination = nil
+                return .run { send in
+                    await send(.onTapGallery)
+                    await send(.setPhotosPickerPresented(true))
+                }
+                
             default:
                 return .none
             }

Neki-iOS/Core/Sources/Auth/Sources/Presentation/Sources/View/LoginView.swift

@@ -45,7 +45,7 @@ public struct LoginView: View {
         VStack(spacing: 10) {
             Image(.imgAppleLogin)
                 .resizable()
-                .frame(maxHeight: 52)
+                .scaledToFit()
                 .overlay {
                     SignInWithAppleButton(.continue) { _ in
 
@@ -60,7 +60,7 @@ public struct LoginView: View {
             } label: {
                 Image(.imgKakaoLogin)
                     .resizable()
-                    .frame(maxHeight: 52)
+                    .scaledToFit()
             }
             .onOpenURL { store.send(.handleKakaoOpenURL($0)) }
         }

Neki-iOS/Features/Map/Sources/Presentation/Sources/View/NaverMapView.swift

@@ -26,13 +26,14 @@ fileprivate enum Constants {
     static let zIndexSelected: Int = 100
 
     // Clustering Settings
-    static let clusterMaxZoom: Int = 15
-    static let clusterMinZoom: Int = 4
-    static let clusterScreenDistance: Double = 65.0
+    static let clusterMaxZoom: Int = 20
+    static let clusterMinZoom: Int = 12
+    static let clusterThresholdZoomIn: Double = 60.0
+    static let clusterThresholdZoomOut: Double = 70.0
     static let leafCaptionTextSize: CGFloat = 12.0
     static let clusterCaptionTextSize: CGFloat = 14.0
     static let captionColorHex: UInt = 0x202227
-    static let brandClusteringThreshold: Double = 11.0
+    static let brandClusteringThreshold: Double = 15.0
 }
 
 struct NaverMapRepresentable: UIViewRepresentable {
@@ -179,7 +180,7 @@ extension NaverMapRepresentable {
             builder.clusterMarkerUpdater = BoothClusterMarkerUpdater(mapView: mapView)
             builder.maxClusteringZoom = Constants.clusterMaxZoom
             builder.minClusteringZoom = Constants.clusterMinZoom
-            builder.maxScreenDistance = Constants.clusterScreenDistance
+            builder.thresholdStrategy = ClusterStrategy()
             builder.tagMergeStrategy = BoothTagMergeStrategy()
 
             let clusterer = builder.build()
@@ -296,6 +297,26 @@ extension NaverMapRepresentable {
         }
     }
 
+    final class ClusterStrategy: NMCDefaultDistanceStrategy, NMCThresholdStrategy {
+        func getThreshold(_ zoom: Int) -> Double {
+            guard zoom < 15 else { return Constants.clusterThresholdZoomIn }
+            return Constants.clusterThresholdZoomOut
+        }
+        
+        override func getDistance(_ zoom: Int, node1: NMCNode, node2: NMCNode) -> Double {
+            let defaultDistance = super.getDistance(zoom, node1: node1, node2: node2)
+            
+            if Double(zoom) < Constants.brandClusteringThreshold { return defaultDistance }
+            
+            guard let tag1 = node1.tag as? NSNumber,
+                  let tag2 = node2.tag as? NSNumber,
+                  tag1 == tag2
+            else { return Double.infinity }
+            
+            return defaultDistance
+        }
+    }
+    
     final class BoothClusteringKey: NSObject, NMCClusteringKey {
         let identifier: Int
         let brandID: Int
@@ -395,8 +416,8 @@ extension NaverMapRepresentable {
             marker.anchor = CGPoint(x: 0.5, y: 0.5)
             marker.zIndex = 50
 
-            marker.touchHandler = { [weak mapView, weak marker] _ in
-                guard let mapView, let marker else { return false }
+            marker.touchHandler = { [weak mapView] overlay in
+                guard let mapView, let marker = overlay as? NMFMarker else { return false }
                 let currentZoom = mapView.zoomLevel
                 let targetZoom = min(currentZoom + 2.5, Constants.maxZoomLevel)
                 let cameraUpdate = NMFCameraUpdate(scrollTo: marker.position, zoomTo: targetZoom)
@@ -420,11 +441,20 @@ extension NaverMapRepresentable {
 
     final class BoothTagMergeStrategy: NSObject, NMCTagMergeStrategy {
         func mergeTag(_ cluster: NMCCluster) -> NSObject? {
-            // TODO: [Feature] 브랜드별 클러스터링 도입 시 구현 필요
-            // 1. cluster.children 노드를 순회하며 각 마커가 가진 태그(예: 브랜드 식별자)를 수집
-            // 2. 모든 자식 노드의 태그가 동일하다면 해당 태그를 반환하면 부모 노드의 태그가 됨
-            // 3. 여러 브랜드가 섞여있다면 줌 레벨에 따라 브랜드별 클러스터링 마커가 아닌 대표 클러스터링 마커일 것이므로 분기처리 필요
-            return nil
+            var mergedBrandID: Int?
+            
+            for node in cluster.children {
+                guard let tag = node.tag as? NSNumber else { return nil }
+                let currentBrandID = tag.intValue
+                
+                if mergedBrandID == nil {
+                    mergedBrandID = currentBrandID
+                } else if mergedBrandID != currentBrandID {
+                    return nil
+                }
+            }
+            
+            return mergedBrandID.map { NSNumber(value: $0) }
         }
     }
 }

Neki-iOS/Features/Pose/Sources/Presentation/Sources/Feature/RandomPoseCarouselFeature.swift

@@ -13,6 +13,8 @@ import os
 struct RandomPoseCarouselFeature {
     enum SlideDirection { case previous, next, none }
 
+    private enum CancelID { case poseRequest }
+    
     @ObservableState
     struct State {
         @Shared(.appStorage("RandomPoseTutorial")) var isTutorialPresented: Bool = true
@@ -80,15 +82,19 @@ struct RandomPoseCarouselFeature {
 
             case .tapLeft:
                 state.slideDirection = .previous
+                state.isLoading = true
                 return .run { send in
                     await send(.poseResponse(Result { try await poseClient.startRandomPoseSuggestion(direction: .left) }))
                 }
+                .cancellable(id: CancelID.poseRequest, cancelInFlight: true)
 
             case .tapRight:
                 state.slideDirection = .next
+                state.isLoading = true
                 return .run { send in
                     await send(.poseResponse(Result { try await poseClient.startRandomPoseSuggestion(direction: .right) }))
                 }
+                .cancellable(id: CancelID.poseRequest, cancelInFlight: true)
 
                 // MARK: - Scrap Logic (Optimistic)
             case .onTapScrap:

Neki-iOS/Features/Pose/Sources/Presentation/Sources/View/RandomPoseCarouselView.swift

@@ -61,6 +61,7 @@ struct RandomPoseCarouselView: View {
 
             controlButtons
                 .frame(maxHeight: .infinity, alignment: .bottom)
+                .disabled(store.isLoading)
 
             if store.isTutorialPresented { tutorialOverlay }
         }

Neki-iOS/Features/QRCodeScanner/Sources/Data/Sources/Strategies/Implementations/PhotosignatureStrategy.swift

@@ -17,8 +17,14 @@ struct PhotoSignatureStrategy: QRCodeParsingStrategy {
         Logger.data.debug("포토시그니처 파싱 시도: \(url.absoluteString)")
 
         let urlString = url.absoluteString
-        let cleanString = urlString.hasSuffix("/") ? String(urlString.dropLast()) : urlString
-        let imageURLString = cleanString + "/a.jpg"
+        var imageURLString = String()
+        
+        if urlString.hasSuffix("index.html") {
+            imageURLString = urlString.replacingOccurrences(of: "index.html", with: "a.jpg")
+        } else {
+            let cleanString = urlString.hasSuffix("/") ? String(urlString.dropLast()) : urlString
+            imageURLString = cleanString + "/a.jpg"
+        }
 
         guard let imageURL = URL(string: imageURLString) else {
             Logger.domain.error("이미지 URL 생성 실패.")
@@ -35,6 +41,8 @@ struct PhotoSignatureStrategy: QRCodeParsingStrategy {
 
             return ParsedQRResult(brand: .photosignature, originalImage: data)
 
+        } catch let error as QRParseError {
+            throw error
         } catch {
             Logger.network.warning("이미지 없음(404 등). 만료 확인.")
             throw .imageDownloadFailed

Neki-iOS/Features/QRCodeScanner/Sources/Domain/Sources/Entities/CameraZoomFactor.swift

@@ -0,0 +1,13 @@
+//
+//  CameraZoomFactor.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 3/1/26.
+//
+
+import Foundation
+
+public enum CameraZoomFactor {
+    static let defaultMaxZoomFactor: CGFloat = 5.0 // 5배 줌
+    static let defaultMinZoomFactor: CGFloat = 1.0 // 1배 줌 (원본)
+}

Neki-iOS/Features/QRCodeScanner/Sources/Presentation/Sources/Features/QRCodeScanFeature.swift

@@ -25,14 +25,19 @@ struct QRCodeScanFeature {
         var isWebViewPresented: Bool = false
 
         var isCameraActive: Bool {
-            isLoading == false && isWebViewPresented == false && isManualDownloadNeededAlertPresented == false && isUnsupportedBrandAlertPresented == false
+            isLoading == false &&
+            isWebViewPresented == false &&
+            isManualDownloadNeededAlertPresented == false &&
+            isUnsupportedBrandAlertPresented == false &&
+            isExpiredAlertPresented == false
         }
     }
 
     enum Action: BindableAction {
         // View Actions
         case closeButtonTapped
         case lightButtonTapped
+        case openGalleryButtonTapped
         case openSuggestBrandPage
         case openWebViewButtonTapped
         case closeWebViewButtonTapped
@@ -82,6 +87,10 @@ struct QRCodeScanFeature {
                 state.webViewURL = nil
                 return .none
 
+            case .openGalleryButtonTapped:
+                state.isUnsupportedBrandAlertPresented = false
+                return .send(.addPhotoFromGalleryButtonTapped)
+                
             case .openSuggestBrandPage:
                 Logger.presentation.debug("브랜드 제안 페이지 이동 요청")
                 return .run { _ in
@@ -95,7 +104,7 @@ struct QRCodeScanFeature {
 
                 // MARK: - Scanning Flow
             case .codeScanned(let urlString):
-                guard state.isLoading == false else { return .none }
+                guard state.isLoading == false, state.isCameraActive else { return .none }
                 state.isLoading = true
                 Logger.presentation.debug("QR 스캔 감지: \(urlString)")
 
@@ -109,6 +118,7 @@ struct QRCodeScanFeature {
 
             case let .parseQRResult(.failure(error)):
                 state.isLoading = false
+                Logger.domain.info("QR 파싱 실패: \(error)")
                 return handleError(error, state: &state)
 
                 // MARK: - WebView Download Flow