release 2.0.0

.github/workflows/appstore_release.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

.github/workflows/build_test.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

.github/workflows/testflight_release.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '16.1'
 
     - uses: shimataro/ssh-key-action@v2
       with:

Makefile

@@ -17,8 +17,7 @@ test:
 	make clean
 	make download
 	tuist install
-	tuist cache
-	TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App
+	TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App --verbose
 
 clean:
 	tuist clean

Projects/App/Project.swift

@@ -26,7 +26,7 @@ let shareExtensionTarget: Target = .target(
     resources: ["ShareExtension/Resources/**"],
     entitlements: .file(path: .relativeToRoot("Projects/App/ShareExtension/ShareExtension.entitlements")),
     dependencies: [
-        .project(target: "FeatureLogin", path: .relativeToRoot("Projects/Feature")),
+        .project(target: "FeatureIntro", path: .relativeToRoot("Projects/Feature")),
         .project(target: "FeatureContentSetting", path: .relativeToRoot("Projects/Feature")),
         .project(target: "FeatureCategorySetting", path: .relativeToRoot("Projects/Feature"))
     ],

Projects/App/Resources/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23086.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23076"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -17,18 +17,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" ambiguous="YES" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
                                 <rect key="frame" x="79" y="313" width="235" height="72"/>
                                 <color key="tintColor" name="text/inverseWh"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="72" id="9zI-nL-qB4"/>
+                                    <constraint firstAttribute="height" constant="72" id="ZJY-IM-p0S"/>
+                                    <constraint firstAttribute="width" constant="235" id="zXd-Y5-GFp"/>
                                 </constraints>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" name="orange/700"/>
                         <constraints>
-                            <constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="kHx-5E-p7o"/>
+                            <constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="5x5-8D-gix"/>
+                            <constraint firstItem="N4N-la-jgc" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="zAv-Q1-gIH"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -40,7 +42,7 @@
     <resources>
         <image name="logo_pokit" width="235" height="72"/>
         <namedColor name="orange/700">
-            <color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+            <color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="text/inverseWh">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>

Projects/App/Resources/Pokit-info.plist

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

Projects/App/ShareExtension/Sources/ShareRootFeature.swift

@@ -9,7 +9,7 @@ import UIKit
 import UniformTypeIdentifiers
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import FeatureContentSetting
 import FeatureCategorySetting
 import CoreKit

Projects/App/ShareExtension/Sources/ShareRootView.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 import ComposableArchitecture
-import FeatureLogin
+import FeatureIntro
 import FeatureContentSetting
 import FeatureCategorySetting
 import DSKit

Projects/App/Sources/MainTab/MainTab.swift

@@ -11,14 +11,14 @@ import DSKit
 
 public enum MainTab: String, CaseIterable {
     case pokit = "포킷"
-    case remind = "리마인드"
+    case recommend = "링크추천"
 
     var title: String { return self.rawValue }
 
     var icon: PokitImage {
         switch self {
         case .pokit:  return .icon(.folderFill)
-        case .remind: return .icon(.remind)
+        case .recommend: return .icon(.remind)
         }
     }
 }

Projects/App/Sources/MainTab/MainTabFeature.swift

@@ -8,7 +8,7 @@ import SwiftUI
 
 import ComposableArchitecture
 import FeaturePokit
-import FeatureRemind
+import FeatureRecommend
 import FeatureContentDetail
 import Domain
 import DSKit
@@ -37,7 +37,7 @@ public struct MainTabFeature {
 
         var path: StackState<MainTabPath.State> = .init()
         var pokit: PokitRootFeature.State
-        var remind: RemindFeature.State = .init()
+        var recommend: RecommendFeature.State = .init()
         @Presents var contentDetail: ContentDetailFeature.State?
         @Shared(.inMemory("SelectCategory")) var categoryId: Int?
         @Shared(.inMemory("PushTapped")) var isPushTapped: Bool = false
@@ -59,7 +59,7 @@ public struct MainTabFeature {
         /// Todo: scope로 이동
         case path(StackAction<MainTabPath.State, MainTabPath.Action>)
         case pokit(PokitRootFeature.Action)
-        case remind(RemindFeature.Action)
+        case recommend(RecommendFeature.Action)
         case contentDetail(PresentationAction<ContentDetailFeature.Action>)
 
         @CasePathable
@@ -70,6 +70,8 @@ public struct MainTabFeature {
             case onAppear
             case onOpenURL(url: URL)
             case 경고_확인버튼_클릭
+            case 검색_버튼_눌렀을때
+            case 알림_버튼_눌렀을때
         }
         public enum InnerAction: Equatable {
             case 링크추가및수정이동(contentId: Int)
@@ -129,7 +131,7 @@ public struct MainTabFeature {
             return .none
         case .pokit:
             return .none
-        case .remind:
+        case .recommend:
             return .none
         case .contentDetail:
             return .none
@@ -138,7 +140,9 @@ public struct MainTabFeature {
     /// - Reducer body
     public var body: some ReducerOf<Self> {
         Scope(state: \.pokit, action: \.pokit) { PokitRootFeature() }
-        Scope(state: \.remind, action: \.remind) { RemindFeature() }
+        Scope(state: \.recommend, action: \.recommend) {
+            RecommendFeature()
+        }
 
         BindingReducer()
         navigationReducer
@@ -198,6 +202,28 @@ private extension MainTabFeature {
         case .경고_확인버튼_클릭:
             state.error = nil
             return .run { send in await send(.inner(.errorSheetPresented(false))) }
+        case .검색_버튼_눌렀을때:
+            switch state.selectedTab {
+            case .pokit: return .none
+            case .recommend:
+                return RecommendFeature()
+                    .reduce(
+                        into: &state.recommend,
+                        action: .view(.검색_버튼_눌렀을때)
+                    )
+                    .map(Action.recommend)
+            }
+        case .알림_버튼_눌렀을때:
+            switch state.selectedTab {
+            case .pokit: return .none
+            case .recommend:
+                return RecommendFeature()
+                    .reduce(
+                        into: &state.recommend,
+                        action: .view(.알림_버튼_눌렀을때)
+                    )
+                    .map(Action.recommend)
+            }
         }
     }
     /// - Inner Effect
@@ -224,7 +250,7 @@ private extension MainTabFeature {
             state.linkPopup = type
             return .none
         case let .카테고리상세_이동(category):
-            if category.categoryName == "미분류" {
+            if category.categoryName == Constants.미분류 {
                 state.selectedTab = .pokit
                 state.path.removeAll()
                 return .send(.pokit(.delegate(.미분류_카테고리_활성화)))
@@ -270,7 +296,7 @@ private extension MainTabFeature {
             guard let category = state.categoryOfSavedContent else { return .none }
             state.categoryOfSavedContent = nil
             return .send(.inner(.카테고리상세_이동(category: category)))
-        case .error, .text, .warning, .none:
+        case .error, .text, .warning, .report, .none:
             return .none
         }
     }

Projects/App/Sources/MainTab/MainTabFeatureView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import ComposableArchitecture
 import DSKit
 import FeaturePokit
-import FeatureRemind
+import FeatureRecommend
 import FeatureSetting
 import FeatureCategorySetting
 import FeatureContentDetail
@@ -135,8 +135,8 @@ private extension MainTabView {
                     .pokitNavigationBar { pokitNavigationBar }
                     .toolbarBackground(.hidden, for: .tabBar)
 
-            case .remind:
-                RemindView(store: store.scope(state: \.remind, action: \.remind))
+            case .recommend:
+                RecommendView(store: store.scope(state: \.recommend, action: \.recommend))
                     .pokitNavigationBar { remindNavigationBar }
                     .toolbarBackground(.hidden, for: .tabBar)
             }
@@ -173,19 +173,19 @@ private extension MainTabView {
     var remindNavigationBar: some View {
         PokitHeader {
             PokitHeaderItems(placement: .leading) {
-                Text("Remind")
-                    .font(.system(size: 32, weight: .heavy))
-                    .foregroundStyle(.pokit(.text(.brand)))
+                Text("링크추천")
+                    .pokitFont(.title2)
+                    .foregroundStyle(.pokit(.text(.primary)))
             }
 
             PokitHeaderItems(placement: .trailing) {
                 PokitToolbarButton(
                     .icon(.search),
-                    action: { store.send(.remind(.view(.검색_버튼_눌렀을때))) }
+                    action: { send(.검색_버튼_눌렀을때) }
                 )
                 PokitToolbarButton(
                     .icon(.bell),
-                    action: { store.send(.remind(.view(.알림_버튼_눌렀을때))) }
+                    action: { send(.알림_버튼_눌렀을때) }
                 )
             }
         }
@@ -198,7 +198,7 @@ private extension MainTabView {
 
             Spacer()
 
-            bottomTabBarItem(.remind)
+            bottomTabBarItem(.recommend)
         }
         .padding(.horizontal, 48)
         .padding(.top, 12)
@@ -272,50 +272,53 @@ private extension MainTabView {
         var action: (TabAddSheetType) -> Void
 
         var body: some View {
-            HStack(spacing: 20) {
-                Spacer()
-
-                ForEach(TabAddSheetType.allCases, id: \.self) { type in
-                    Button(action: { action(type) }) {
-                        VStack(spacing: 4) {
-                            Spacer()
-
-                            type.icon
-                                .renderingMode(.template)
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 28, height: 28)
-                                .foregroundStyle(.pokit(.icon(.inverseWh)))
-
-                            Text(type.title)
-                                .pokitFont(.b3(.m))
-                                .foregroundStyle(.pokit(.text(.inverseWh)))
-
-                            Spacer()
-                        }
-                        .padding(.horizontal, 24)
-                        .background {
-                            RoundedRectangle(cornerRadius: 12, style: .continuous)
-                                .foregroundStyle(.pokit(.bg(.brand)))
+            GeometryReader { proxy in
+                let bottomSafeArea = proxy.safeAreaInsets.bottom
+                HStack(spacing: 20) {
+                    Spacer()
+
+                    ForEach(TabAddSheetType.allCases, id: \.self) { type in
+                        Button(action: { action(type) }) {
+                            VStack(spacing: 4) {
+                                Spacer()
+
+                                type.icon
+                                    .renderingMode(.template)
+                                    .resizable()
+                                    .aspectRatio(contentMode: .fit)
+                                    .frame(width: 28, height: 28)
+                                    .foregroundStyle(.pokit(.icon(.inverseWh)))
+
+                                Text(type.title)
+                                    .pokitFont(.b3(.m))
+                                    .foregroundStyle(.pokit(.text(.inverseWh)))
+
+                                Spacer()
+                            }
+                            .padding(.horizontal, 24)
+                            .background {
+                                RoundedRectangle(cornerRadius: 12, style: .continuous)
+                                    .foregroundStyle(.pokit(.bg(.brand)))
+                            }
+                            .frame(height: 96)
                         }
-                        .frame(height: 96)
                     }
+
+                    Spacer()
                 }
-
-                Spacer()
-            }
-            .padding(.top, 36)
-            .padding(.bottom, 48)
-            .pokitPresentationCornerRadius()
-            .pokitPresentationBackground()
-            .presentationDragIndicator(.visible)
-            .readHeight()
-            .onPreferenceChange(HeightPreferenceKey.self) { height in
-                if let height {
-                    self.height = height
+                .padding(.bottom, 48 - bottomSafeArea)
+                .padding(.top, 36)
+                .pokitPresentationCornerRadius()
+                .pokitPresentationBackground()
+                .presentationDragIndicator(.visible)
+                .readHeight()
+                .onPreferenceChange(HeightPreferenceKey.self) { height in
+                    if let height {
+                        self.height = height
+                    }
                 }
+                .presentationDetents([.height(self.height)])
             }
-            .presentationDetents([.height(self.height)])
         }
     }
 }