Skip to content

Commit dbcbb18

Browse files
stealmhstealmh
committed
Merge branch 'develop' of https://github.com/YAPP-Github/Pokit-iOS into develop
2 parents 84b1637 + 2319629 commit dbcbb18

File tree

108 files changed

+1510
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1510
-394
lines changed

‎.github/workflows/appstore_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Xcode
1919
uses: maxim-lobanov/setup-xcode@v1
2020
with:
21-
xcode-version: latest-stable
21+
xcode-version: '16.1'
2222

2323
- uses: shimataro/ssh-key-action@v2
2424
with:

‎.github/workflows/build_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Xcode
2121
uses: maxim-lobanov/setup-xcode@v1
2222
with:
23-
xcode-version: latest-stable
23+
xcode-version: '16.1'
2424

2525
- uses: shimataro/ssh-key-action@v2
2626
with:

‎.github/workflows/testflight_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Xcode
2424
uses: maxim-lobanov/setup-xcode@v1
2525
with:
26-
xcode-version: latest-stable
26+
xcode-version: '16.1'
2727

2828
- uses: shimataro/ssh-key-action@v2
2929
with:

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ test:
1717
make clean
1818
make download
1919
tuist install
20-
tuist cache
21-
TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App
20+
TUIST_DEVELOPMENT_TEAM=$(DEVELOPMENT_TEAM) tuist generate App --verbose
2221

2322
clean:
2423
tuist clean

‎Projects/App/Project.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let shareExtensionTarget: Target = .target(
2626
resources: ["ShareExtension/Resources/**"],
2727
entitlements: .file(path: .relativeToRoot("Projects/App/ShareExtension/ShareExtension.entitlements")),
2828
dependencies: [
29-
.project(target: "FeatureLogin", path: .relativeToRoot("Projects/Feature")),
29+
.project(target: "FeatureIntro", path: .relativeToRoot("Projects/Feature")),
3030
.project(target: "FeatureContentSetting", path: .relativeToRoot("Projects/Feature")),
3131
.project(target: "FeatureCategorySetting", path: .relativeToRoot("Projects/Feature"))
3232
],

‎Projects/App/Resources/LaunchScreen.storyboard‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<device id="retina6_12" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23076"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -17,18 +17,20 @@
1717
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
1818
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1919
<subviews>
20-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" ambiguous="YES" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
20+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="logo_pokit" translatesAutoresizingMaskIntoConstraints="NO" id="N4N-la-jgc">
2121
<rect key="frame" x="79" y="313" width="235" height="72"/>
2222
<color key="tintColor" name="text/inverseWh"/>
2323
<constraints>
24-
<constraint firstAttribute="height" constant="72" id="9zI-nL-qB4"/>
24+
<constraint firstAttribute="height" constant="72" id="ZJY-IM-p0S"/>
25+
<constraint firstAttribute="width" constant="235" id="zXd-Y5-GFp"/>
2526
</constraints>
2627
</imageView>
2728
</subviews>
2829
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
2930
<color key="backgroundColor" name="orange/700"/>
3031
<constraints>
31-
<constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="kHx-5E-p7o"/>
32+
<constraint firstItem="N4N-la-jgc" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="254" id="5x5-8D-gix"/>
33+
<constraint firstItem="N4N-la-jgc" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="zAv-Q1-gIH"/>
3234
</constraints>
3335
</view>
3436
</viewController>
@@ -40,7 +42,7 @@
4042
<resources>
4143
<image name="logo_pokit" width="235" height="72"/>
4244
<namedColor name="orange/700">
43-
<color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
45+
<color red="0.99607843137254903" green="0.51764705882352946" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4446
</namedColor>
4547
<namedColor name="text/inverseWh">
4648
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>

‎Projects/App/Resources/Pokit-info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>APPL</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.0.8</string>
24+
<string>2.0.0</string>
2525
<key>CFBundleURLTypes</key>
2626
<array>
2727
<dict>

‎Projects/App/ShareExtension/Sources/ShareRootFeature.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import UIKit
99
import UniformTypeIdentifiers
1010

1111
import ComposableArchitecture
12-
import FeatureLogin
12+
import FeatureIntro
1313
import FeatureContentSetting
1414
import FeatureCategorySetting
1515
import CoreKit

‎Projects/App/ShareExtension/Sources/ShareRootView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import SwiftUI
99

1010
import ComposableArchitecture
11-
import FeatureLogin
11+
import FeatureIntro
1212
import FeatureContentSetting
1313
import FeatureCategorySetting
1414
import DSKit

‎Projects/App/Sources/MainTab/MainTabPath.swift‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ public extension MainTabFeature {
8383
let .path(.element(_, action: .카테고리상세(.delegate(.포킷수정(category))))):
8484
state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
8585
type: .수정,
86-
categoryId: category.id,
87-
categoryImage: category.categoryImage,
88-
categoryName: category.categoryName
86+
category: category
8987
)))
9088
return .none
9189

@@ -196,6 +194,10 @@ public extension MainTabFeature {
196194
let .path(.element(_, action: .포킷추가및수정(.delegate(.linkCopyDetected(url))))),
197195
let .path(.element(_, action: .링크목록(.delegate(.linkCopyDetected(url))))):
198196
return .run { send in await send(.inner(.linkCopySuccess(url)), animation: .pokitSpring) }
197+
/// 바텀메세지
198+
case let .pokit(.delegate(.linkPopup(text))):
199+
state.linkPopup = .text(title: text)
200+
return .none
199201
/// 링크목록 `안읽음`
200202
case .remind(.delegate(.링크목록_안읽음)):
201203
state.path.append(.링크목록(ContentListFeature.State(contentType: .unread)))
@@ -231,14 +233,24 @@ public extension MainTabFeature {
231233
return .none
232234

233235
case let .path(.element(_, action: .링크공유(.delegate(.공유받은_카테고리_추가(sharedCategory))))):
234-
state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
235-
type: .공유추가,
236-
categoryId: sharedCategory.categoryId,
236+
let category = BaseCategoryItem(
237+
id: sharedCategory.categoryId,
238+
userId: 0,
239+
categoryName: sharedCategory.categoryName,
237240
categoryImage: BaseCategoryImage(
238241
imageId: sharedCategory.categoryImageId,
239242
imageURL: sharedCategory.categoryImageUrl
240243
),
241-
categoryName: sharedCategory.categoryName
244+
contentCount: sharedCategory.contentCount,
245+
createdAt: "",
246+
openType: .공개,
247+
keywordType: .default,
248+
userCount: 0,
249+
isFavorite: false
250+
)
251+
state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
252+
type: .공유추가,
253+
category: category
242254
)))
243255
return .none
244256
case .path(.element(_, action: .알림함(.delegate(.alertBoxDismiss)))):

0 commit comments

Comments
 (0)