Skip to content

Commit 0ba196b

Browse files
authored
Merge pull request #201 from YAPP-Github/develop
release 2.0.0
2 parents e65f18c + c3e2814 commit 0ba196b

File tree

188 files changed

+4228
-1673
lines changed

Some content is hidden

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

188 files changed

+4228
-1673
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.9</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/MainTab.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import DSKit
1111

1212
public enum MainTab: String, CaseIterable {
1313
case pokit = "포킷"
14-
case remind = "리마인드"
14+
case recommend = "링크추천"
1515

1616
var title: String { return self.rawValue }
1717

1818
var icon: PokitImage {
1919
switch self {
2020
case .pokit: return .icon(.folderFill)
21-
case .remind: return .icon(.remind)
21+
case .recommend: return .icon(.remind)
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)