Merge pull request #246 from Pepsi-Club/dev

[Release] v1.2.1
Pepsi-Club · Apr 22, 2024 · b37cb63 · b37cb63
2 parents ddcc480 + ff0514d
commit b37cb63
Show file tree

Hide file tree

Showing 84 changed files with 1,578 additions and 889 deletions.
diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build_test:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
 
@@ -21,11 +21,12 @@ jobs:
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "14.3"
+          xcode-version: "15.3"
 
-      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+      - name: Setup Swift Version
+        uses: swift-actions/setup-swift@v2
         with:
-            swift-version: "5.8.0"
+            swift-version: "5.10"
 
       - name: Get swift version
         run: swift --version
@@ -43,4 +44,4 @@ jobs:
         run: tuist fetch
 
       - name: Tuist Build Test
-        run: tuist build
+        run: tuist build App
diff --git a/.github/workflows/upload_testflight.yml b/.github/workflows/upload_testflight.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   upload_testflight:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v2
 
@@ -30,11 +30,12 @@ jobs:
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "14.3"
+          xcode-version: "15.3"
 
-      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+      - name: Setup Swift Version
+        uses: swift-actions/setup-swift@v2
         with:
-          swift-version: "5.8.0"
+            swift-version: "5.10"
 
       - name: Install Tuist
         run: curl -Ls https://install.tuist.io|bash

diff --git a/.gitmessage.txt b/.gitmessage.txt
@@ -13,4 +13,5 @@
 # * Refactor - 디자인 패턴, 아키텍쳐 등 리팩토링
 # * Test - 테스팅 코드 작성
 # * Build - 업데이트, 버전 올라갈 때
-# * Setting - UI, 기능 외의 설정 파일 추가 / 수정
+# * Setting - UI, 기능 외의 설정 파일 추가 / 수정
+# * UI - UI 관련 작업
diff --git a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Environment.swift b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Environment.swift
@@ -14,12 +14,14 @@ public extension String {
     static let organizationName = "Pepsi-Club"
     static let teamId = "T4W7695R5C"
     /// 앱스토어에 게시할 때마다 증가해줘야 하는 버전
-    static let marketingVersion: Self = "1.2.0"
+    static let marketingVersion: Self = "1.2.1"
     /// 개발자가 내부적으로 확인하기 위한 용도 (날짜를 사용하기도 함 - 2023.12.8.1 )
     static var buildVersion: Self {
         let date = Date()
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy.MM.dd.HH.mm"
+        formatter.locale = Locale(identifier: "ko_KR")
+        formatter.timeZone = TimeZone(identifier: "Asia/Seoul")
         return formatter.string(from: date)
     }
 }

diff --git a/Projects/App/NotificationExtension/NotificationService.swift b/Projects/App/NotificationExtension/NotificationService.swift
diff --git a/Projects/App/Resources/AppLogo.png b/Projects/App/Resources/AppLogo.png
diff --git a/Projects/App/Resources/Base.lproj/LaunchScreen.storyboard b/Projects/App/Resources/Base.lproj/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="22505" 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="32700.99.1234" 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="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,23 +17,27 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppLogo.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
-                                <rect key="frame" x="121" y="324" width="157" height="204"/>
+                                <rect key="frame" x="116.66666666666669" y="276" width="170" height="300"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="170" id="asc-3z-qNR"/>
+                                    <constraint firstAttribute="height" constant="300" id="zZi-DE-9nG"/>
+                                </constraints>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" red="0.20392156862745098" green="0.23137254901960785" blue="0.23137254901960785" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="SN6-pt-WKY" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" constant="3" id="55x-zs-Gts"/>
-                            <constraint firstItem="SN6-pt-WKY" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="atU-Sh-yUI"/>
+                            <constraint firstItem="SN6-pt-WKY" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="FsO-Z9-kQF"/>
+                            <constraint firstItem="SN6-pt-WKY" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" constant="5" id="cME-92-iZn"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
         </scene>
     </scenes>
     <resources>
-        <image name="AppLogo.png" width="157" height="204"/>
+        <image name="AppLogo.png" width="823" height="1066"/>
     </resources>
 </document>
diff --git a/Projects/App/Resources/Model.xcdatamodeld/.xccurrentversion b/Projects/App/Resources/Model.xcdatamodeld/.xccurrentversion
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>_XCCurrentVersionName</key>
+	<string>Model_v2.xcdatamodel</string>
+</dict>
+</plist>
diff --git a/Projects/App/Resources/Model.xcdatamodeld/Model.xcdatamodel/contents b/Projects/App/Resources/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22522" systemVersion="23C71" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+    <entity name="FavoritesBusResponseMO" representedClassName="FavoritesBusResponseMO" syncable="YES">
+        <attribute name="adirection" optional="YES" attributeType="String"/>
+        <attribute name="busId" optional="YES" attributeType="String"/>
+        <attribute name="busName" optional="YES" attributeType="String"/>
+        <attribute name="busStopId" optional="YES" attributeType="String"/>
+        <attribute name="busStopName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" optional="YES" attributeType="String"/>
+    </entity>
     <entity name="FavoritesBusStopResponseMO" representedClassName="FavoritesBusStopResponseMO" syncable="YES">
         <attribute name="busIds" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String]"/>
         <attribute name="busStopId" optional="YES" attributeType="String"/>

diff --git a/Projects/App/Resources/Model.xcdatamodeld/Model_v2.xcdatamodel/contents b/Projects/App/Resources/Model.xcdatamodeld/Model_v2.xcdatamodel/contents
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+    <entity name="FavoritesBusResponseMO" representedClassName="FavoritesBusResponseMO" syncable="YES">
+        <attribute name="adirection" optional="YES" attributeType="String"/>
+        <attribute name="busId" optional="YES" attributeType="String"/>
+        <attribute name="busName" optional="YES" attributeType="String"/>
+        <attribute name="busStopId" optional="YES" attributeType="String"/>
+        <attribute name="busStopName" optional="YES" attributeType="String"/>
+        <attribute name="identifier" optional="YES" attributeType="String"/>
+    </entity>
+    <entity name="FavoritesBusStopResponseMO" representedClassName="FavoritesBusStopResponseMO" syncable="YES">
+        <attribute name="busIds" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[String]"/>
+        <attribute name="busStopId" optional="YES" attributeType="String"/>
+    </entity>
+    <entity name="RegularAlarmResponseMO" representedClassName="RegularAlarmResponseMO" syncable="YES">
+        <attribute name="adirection" optional="YES" attributeType="String" defaultValueString=""/>
+        <attribute name="busId" optional="YES" attributeType="String"/>
+        <attribute name="busName" optional="YES" attributeType="String"/>
+        <attribute name="busStopId" optional="YES" attributeType="String"/>
+        <attribute name="busStopName" optional="YES" attributeType="String"/>
+        <attribute name="requestId" optional="YES" attributeType="String"/>
+        <attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="weekday" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromData" customClassName="[Int]"/>
+    </entity>
+</model>
diff --git a/Projects/App/Sources/AppDelegate+Register.swift b/Projects/App/Sources/AppDelegate+Register.swift
@@ -21,7 +21,10 @@ extension AppDelegate {
         let locationService: LocationService = DefaultLocationService()
 
         let favoritesRepository: FavoritesRepository
-        = DefaultFavoritesRepository(coreDataService: coreDataService)
+        = DefaultFavoritesRepository(
+            coreDataService: coreDataService,
+            networkService: networkService
+        )
         let busStopArrivalInfoRepository: BusStopArrivalInfoRepository
         = DefaultBusStopArrivalInfoRepository(networkService: networkService)
         let stationListRepository: StationListRepository