Merge pull request #115 from YAPP-Github/fix/#111-fcm

fix: fcm 분기처리 수정

Projects/App/Resources/Pokit-info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Projects/App/Sources/AppDelegate/AppDelegateFeature.swift

@@ -21,6 +21,7 @@ public struct AppDelegateFeature {
     @ObservableState
     public struct State {
         public var root = RootFeature.State()
+        @Shared(.inMemory("PushTapped")) var isPushTapped: Bool = false
 
         public init() {}
     }
@@ -58,12 +59,9 @@ public struct AppDelegateFeature {
                         group.addTask {
                             let setting = await self.userNotifications.getNotificationSettings()
                             switch setting.authorizationStatus {
-                            case .authorized:
+                            case .authorized, .notDetermined:
                                 guard try await self.userNotifications.requestAuthorization([.alert, .sound])
                                 else { return }
-                            case .notDetermined, .provisional:
-                                guard try await self.userNotifications.requestAuthorization(.provisional)
-                                else { return }
                             default: return
                             }
                             await self.registerForRemoteNotifications()
@@ -80,6 +78,7 @@ public struct AppDelegateFeature {
                 return .run { _ in completionHandler(.banner) }
 
             case let .userNotifications(.didReceiveResponse(_, completionHandler)):
+                state.isPushTapped = true
                 return .run { @MainActor _ in completionHandler() }
             case .userNotifications:
                 return .none

Projects/App/Sources/Intro/IntroFeature.swift

@@ -68,9 +68,6 @@ private extension IntroFeature {
 
         case .delegate(.loginNeeded):
             return .run { send in
-                /// 알람을 통해 앱을 들어왔으나 자동 로그인을 실패했다면 배너로 이동하지 못하게 flag 삭제
-                await userDefaults.removeBool(.fromBanner)
-                /// Todo: 원하는 애니메이션 넣어줘~
                 await send(._sceneChange(.login()), animation: .smooth)
             }
 

Projects/App/Sources/MainTab/MainTabFeature.swift

@@ -31,22 +31,24 @@ public struct MainTabFeature {
         var isLinkSheetPresented: Bool = false
         var isErrorSheetPresented: Bool = false
         var link: String?
-        
+
         var error: BaseError?
-        
+
         var path: StackState<MainTabPath.State> = .init()
         var pokit: PokitRootFeature.State
         var remind: RemindFeature.State = .init()
         @Presents var contentDetail: ContentDetailFeature.State?
         @Shared(.inMemory("SelectCategory")) var selectedPokit: BaseCategoryItem?
-
+        @Shared(.inMemory("PushTapped")) var isPushTapped: Bool = false
+
         public init() {
             self.pokit = .init()
         }
     }
     /// - Action
     public enum Action: FeatureAction, BindableAction, ViewAction {
         case binding(BindingAction<State>)
+        case pushAlertTapped(Bool)
         case view(View)
         case inner(InnerAction)
         case async(AsyncAction)
@@ -93,6 +95,12 @@ public struct MainTabFeature {
         switch action {
         case .binding:
             return .none
+        case let .pushAlertTapped(isTapped):
+            if isTapped {
+                return .send(.delegate(.알림함이동))
+            } else {
+                return .none
+            }
             /// - View
         case .view(let viewAction):
             return handleViewAction(viewAction, state: &state)
@@ -108,7 +116,7 @@ public struct MainTabFeature {
             /// - Delegate
         case .delegate(let delegateAction):
             return handleDelegateAction(delegateAction, state: &state)
-            
+
         case .path:
             return .none
         case .pokit:
@@ -123,7 +131,7 @@ public struct MainTabFeature {
     public var body: some ReducerOf<Self> {
         Scope(state: \.pokit, action: \.pokit) { PokitRootFeature() }
         Scope(state: \.remind, action: \.remind) { RemindFeature() }
-        
+
         BindingReducer()
         navigationReducer
         Reduce(self.core)
@@ -140,42 +148,45 @@ private extension MainTabFeature {
         case .addButtonTapped:
             state.isBottomSheetPresented.toggle()
             return .none
-            
+
         case .addSheetTypeSelected(let type):
             state.isBottomSheetPresented = false
             switch type {
             case .링크추가: return .send(.delegate(.링크추가하기))
             case .포킷추가: return .send(.delegate(.포킷추가하기))
             }
-            
+
         case .linkCopyButtonTapped:
             state.isLinkSheetPresented = false
             return .run { send in await send(.delegate(.링크추가하기)) }
 
         case .onAppear:
-            return .run { send in
-                let fromBanner = userDefaults.boolKey(.fromBanner)
-                if fromBanner {
-                    await userDefaults.removeBool(.fromBanner)
-                    await send(.delegate(.알림함이동))
-                }
-
-                for await _ in self.pasteBoard.changes() {
-                    let url = try await pasteBoard.probableWebURL()
-                    await send(.inner(.linkCopySuccess(url)), animation: .pokitSpring)
-                }
+            if state.isPushTapped {
+                return .send(.pushAlertTapped(true))
             }
+            return .merge(
+                .run { send in
+                    for await _ in self.pasteBoard.changes() {
+                        let url = try await pasteBoard.probableWebURL()
+                        await send(.inner(.linkCopySuccess(url)), animation: .pokitSpring)
+                    }
+                },
+                .publisher {
+                    state.$isPushTapped.publisher
+                        .map(Action.pushAlertTapped)
+                }
+            )
         case .onOpenURL(url: let url):
             guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
                 return .none
             }
-            
+
             let queryItems = components.queryItems ?? []
             guard let categoryIdString = queryItems.first(where: { $0.name == "categoryId" })?.value,
                   let categoryId = Int(categoryIdString) else {
                 return .none
             }
-            
+
             return .send(.async(.공유받은_카테고리_조회(categoryId: categoryId)))
         case .경고_확인버튼_클릭:
             state.error = nil
@@ -190,15 +201,15 @@ private extension MainTabFeature {
             state.isLinkSheetPresented = true
             state.link = url.absoluteString
             return .none
-            
+
         case let .경고_띄움(error):
             state.error = error
             return .run { send in await send(.inner(.errorSheetPresented(true))) }
-            
+
         case let .errorSheetPresented(isPresented):
             state.isErrorSheetPresented = isPresented
             return .none
-            
+
         default: return .none
         }
     }

Projects/App/Sources/MainTab/MainTabPath.swift

@@ -62,6 +62,7 @@ public extension MainTabFeature {
             case .pokit(.delegate(.alertButtonTapped)),
                  .remind(.delegate(.alertButtonTapped)),
                  .delegate(.알림함이동):
+                state.isPushTapped = false
                 state.path.append(.알림함(PokitAlertBoxFeature.State()))
                 return .none
 

Projects/CoreKit/Sources/Data/Client/UserDefaults/UserDefaultsKey.swift

@@ -10,8 +10,6 @@ import Foundation
 public enum UserDefaultsKey {
     public enum BoolKey: String {
         case autoSaveSearch
-        /// - 배너를 클릭해서 들어왔을 때
-        case fromBanner
     }
     public enum StringKey: String {
         /// `구글` or `애플`