[Release] v1.2.3 (#310)

* [Feat] 2x2 4x2 Widget Base작업 (#244) * [add] 2x2 ArrivalInfoView * [Chore] #238 Extension + NanumFont for Convenience * [Feat] ArrivalInfoSmallView UI작업 * [Add] BusStopOptionProvider 주석 제거 * [UI] Widget Background ColorChange * [Add] AppIntent 수정 * [add] ArrivalInfoIntent 코드 수정 * [Feat] ArrivalInfoMediumView * [Feat] ArrivalRemaining 값 추가, ArrivalState에 따른 Color 변경 추가 * [Chore] Code Convention * [UI] Font Size 수정 * Update ArrivalInfoIntent.swift * [Setting] Tuist Widget 타겟 추가 * [chore] Delete @parameter * [Delete] file - --------- Co-authored-by: Geonseob Kim <109283556+gnksbm@users.noreply.github.com> * [Fix] SearchView 주변정류장 업데이트 시점 변경 * [Docs] 사진 업데이트, 문구 살짝 수정 * Feat/#263 UI변경작업 (#269) * [add] pictures + * [UI] SplashView 변경 * [UI] Image Upload + Change Icon Size * [Setting] Lottie * [Setting] Lottie Project file + Lottie extension code * [Setting] Change Setting + Update Lottie * [UI] EmptyFavoriteView 변경 작업 * [UI] Change BusStopInformationView + SearchView * [UI] BusStopInformationView Update * [Chore] setting * [UI] 정규 알람뷰 수정 * [UI] 색감 통일 * [UI] SearchBar 색 변경 * [Add] Lottie 이미지 renderingEngine을 mainThread로 지정 * [chore] 안쓰는 파일 delete * [Perf] 함수 수정으로 코드 반복 줄임 * [UI] searchView 글자크기수정 * [Chore] BusStopView의 refreshBtn Color 수정 및 textField 제약조건 미세 수정 * [Design] Search된 TableView Background Color 수정 --------- Co-authored-by: MUKER-WON <muker.dev@gmail.com> * [UI] BusStopView및 nearMapView수정 * [UI] Color change * [UI] UI 변경 * [UI] progressColor, refreshColor Change * [UI] Icon 변경 * [add] Update LeafMarker * [UI] 배경 변경 전 최종 * [UI] 정말 많은 것을 변경했습니다 - 스플래쉬 뷰, 아이콘 변경 * [Feat] 다크모드 추가 * [UI] 정기 알람뷰 * [Feat] 다크모드 보완 * [UI] RegularAlarmView weekdaButton 색 수정 * [UI] 소소한 UI 수정 * Revert "UI수정 UI수정작업 " (#274) * Revert "Revert "UI수정 UI수정작업 " (#274)" (#278) This reverts commit e57079e. * UI/#279 네비게이션 위치 통일 * [Bug] 잔상 버그 수정 (#282) * Bug/#283 NearMapView 위치정보권한 없을 때 나오는 infomationView 수정 (#284) * [Chore] 레거시 코드 삭제 * [Fix] 에러처리 수정 * [Fix] error 분기 처리 * [Fix] 레거시 코드 삭제 * [Fix] 레거시 코드 삭제 * [Fix] 레거시 코드 삭제 * Fix/#287 NearMapView에 InformainView 세브론UI 설정 (#288) * [Design] NearMapView InformationView 세브론UI 추가 * [Chore] 의미없는 코드 * Fix/#285 설정 Icon 떴다 안떴다 하는 버그 및 UI수정 (#289) * [Fix] SettingView 아이콘 가끔 떴다 안떴다 하는 문제 해결 * [chore] 다크모드 UI 수정 및 legacy코드 제거 * [chore] legacy code 삭제 * [UI] Color add * [UI] Tabbar Color Change * [Fix] distance에 '알수없음'이 들어오는 로직 수정 (#293) * UI/#291 Cell에 text 흘러넘치는 UI오류 (#295) * [UI] #291 긴 text가 label 범위를 벗어나는 UI 수정 * [Fix] #291 NearMapInformationView text scale factor 활성화 코드 수정 * UI/#294 가독성을 위해 컬러 변경 (#296) * [UI] 색상변경 * [fix] 위치허용 '알수없음' 뜨는 버그 해결 * [chore] code - * [Fix] EmptyFavoriteView 삭제된 글귀 업데이트 * [UI] 글자 가독성 추가 * [chore] for convention * [Fix] #297 즐겨찾기 위치 수정 (#298) * ReleaseFix/#300 v1.2.2 배포를 위한 Setting 수정 (#301) * [Fix] 1.2.2 버전 오류 수정 * [Setting] testflight 수정 * [Fix] Tuist 수정 * [Fix] Fastlane 파일 수정 * [Docs] README 업데이트 * [Docs] 버전 및 다크모드 업데이트 * Setting/#303 구글 애널리틱스 환경 세팅 (#304) * [Setting] #303 파이어베이스 환경 세팅 * [Setting] project.stencil 파일 변경 /템플릿 변경 및 DependcyPlugin추가) * [setting] #303 project.swift파일에 scheme 추가 * [Setting] stencil 제거 및 Scheme파일 수정 * [Setting]#303 잘못삭제한 코드 제거 및 스킴추가 * [Setting] Debug모드 활성화를 위한 코드 추가 * [chore] #303 불필요한 코드 제거 * [Setting] #303 FirebaseAnalytics package추가 후에 변경 필요할지도 * [chore] #303 legacy 코드 제거 * [fix] #305 Appdelegate 수정 (#306) * Feat/#302 FirebaseAnalytics 작업 (#307) * [Setting] .networkService 추가 * [Setting] .networkService 제거 및 Data/Project.swift에 .package추가 * [chore] +package 재추가 * [chore] 내 너무 힘들다 레전드로 마음이 힘듦 * [Setting] 릴리즈 모드 디버그 모드 구분 * [Fix] 애널릭티스 의존 변경 * [setting] #302 Makefile 및 Appdelegate+Firebase.swift수정 * [Add] #302 app모듈 Scheme 추가 * [chore] Data.swift package삭제 * [UI] 색 통일성 * [UI] 소소한 UI 수정 * [perf] #302 make파일 피드백 반영 및 download 리스트에서 googleinfo2 제거 * [Perf] #302 피드백 반영 * [chore] 코드 컨벤션 및 레거시 코드 삭제 * [Fix] #302 파일 네임 수정 * [setting] 버전 변경 1.2.2 -> 1.2.3 --------- Co-authored-by: MUKER-WON <muker.dev@gmail.com> --------- Co-authored-by: Geonseob Kim <109283556+gnksbm@users.noreply.github.com> Co-authored-by: Geonseob Kim <gnksbm@gmail.com> Co-authored-by: Kang Muk <muker.dev@gmail.com> Co-authored-by: Jisoo Ham <133845468+isakatty@users.noreply.github.com>
Pepsi-Club · May 17, 2024 · 1302d58 · 1302d58
1 parent 9431a2a
commit 1302d58
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -47,3 +47,6 @@ download-env:
 
 download-googleinfo:
 	$(call download_file, Projects/App/Resources, $(token),GoogleService-Info.plist)
+	$(call download_file, Projects/App/Resources, $(token),GoogleService-Info-debugging.plist)
+
+
diff --git a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Environment.swift b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Environment.swift
@@ -14,7 +14,7 @@ public extension String {
     static let organizationName = "Pepsi-Club"
     static let teamId = "T4W7695R5C"
     /// 앱스토어에 게시할 때마다 증가해줘야 하는 버전
-    static let marketingVersion: Self = "1.2.2"
+    static let marketingVersion: Self = "1.2.3"
     /// 개발자가 내부적으로 확인하기 위한 용도 (날짜를 사용하기도 함 - 2023.12.8.1 )
     static var buildVersion: Self {
         let date = Date()

diff --git a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Scheme.swift b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Scheme.swift
@@ -21,7 +21,15 @@ public extension Scheme {
                     codeCoverageTargets: ["\(name)"]
                 )
             ),
-            runAction: .runAction(configuration: .debug),
+            runAction: .runAction(
+                configuration: .debug,
+                arguments: .init(launchArguments: [
+                    .init(
+                        name: "-FIRDebugEnabled",
+                        isEnabled: true
+                    )
+                ])
+            ),
             archiveAction: .archiveAction(configuration: .release)
         )
     }

diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -38,6 +38,6 @@ let project = Project.makeProject(
     dependencies: [
         .mainFeature,
         .data,
-        .package(product: "FirebaseMessaging"),
+        .package(product: "FirebaseMessaging")
     ]
 )
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="32700.99.1234" 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="22505" 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="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="appLogo2.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
-                                <rect key="frame" x="116.66666666666669" y="276" width="170" height="300"/>
+                                <rect key="frame" x="111.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"/>
@@ -28,7 +28,7 @@
                         <color key="backgroundColor" red="0.37647058823529411" green="0.47058823529411764" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <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"/>
+                            <constraint firstItem="SN6-pt-WKY" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="cME-92-iZn"/>
                         </constraints>
                     </view>
                 </viewController>

diff --git a/Projects/App/Sources/AppDelegate+Firebase.swift b/Projects/App/Sources/AppDelegate+Firebase.swift
@@ -13,12 +13,18 @@ import FirebaseMessaging
 
 extension AppDelegate {
     func configureFirebase(application: UIApplication) {
+        var googleInfoName: String
+        #if DEBUG
+        googleInfoName = "GoogleService-Info-debugging"
+        #else
+        googleInfoName = "GoogleService-Info"
+        #endif
         guard let filePath = Bundle.main.path(
-            forResource: "GoogleService-Info",
+            forResource: googleInfoName,
             ofType: "plist"
         ),
-              let options = FirebaseOptions(contentsOfFile: filePath)
-        else { return }
+            let options = FirebaseOptions(contentsOfFile: filePath)
+            else { return }
         FirebaseApp.configure(options: options)
         application.registerForRemoteNotifications()
     }

diff --git a/Projects/App/Sources/AppDelegate.swift b/Projects/App/Sources/AppDelegate.swift
@@ -22,6 +22,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         registerDependencies()
         configureNotification(application: application)
         configureFirebase(application: application)
+
         return true
     }
 
@@ -44,3 +45,4 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     ) {
     }
 }
+
diff --git a/Projects/Core/Sources/Extension/UIColor+.swift b/Projects/Core/Sources/Extension/UIColor+.swift
@@ -37,9 +37,9 @@ public extension UIColor {
         return UIColor { traitCollection in
             if traitCollection.userInterfaceStyle == .dark {
                 return UIColor(
-                    red: 20/255,
-                    green: 20/255,
-                    blue: 23/255,
+                    red: 25/255,
+                    green: 25/255,
+                    blue: 25/255,
                     alpha: 1.0
                 )
             } else {

diff --git a/Projects/Data/Project.swift b/Projects/Data/Project.swift
@@ -7,7 +7,8 @@ let project = Project.makeProject(
     moduleType: .dynamicFramework,
     dependencies: [
         .networkService,
-        .coreDataService
+        .coreDataService,
+        .package(product: "FirebaseAnalytics"),
     ],
     coreDataModel: [
         .init(

diff --git a/Projects/Data/Sources/Repository/DefaultBusStopArrivalInfoRepository.swift b/Projects/Data/Sources/Repository/DefaultBusStopArrivalInfoRepository.swift
@@ -12,6 +12,7 @@ import Domain
 import NetworkService
 
 import RxSwift
+import FirebaseAnalytics
 
 public final class DefaultBusStopArrivalInfoRepository:
     NSObject, BusStopArrivalInfoRepository {
@@ -23,10 +24,10 @@ public final class DefaultBusStopArrivalInfoRepository:
         self.networkService = networkService
     }
 
-    public func fetchArrivalList(
-        busStopId: String
-    ) -> Observable<BusStopArrivalInfoResponse> {
-        networkService.request(
+    public func fetchArrivalList(busStopId: String) ->
+    Observable<BusStopArrivalInfoResponse> {
+        Analytics.logEvent("fetchArrivalEvent", parameters: nil)
+        return networkService.request(
             endPoint: BusStopArrivalInfoEndPoint(arsId: busStopId)
         )
         .decode(

diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/cellColor.colorset/Contents.json
@@ -40,7 +40,7 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "0.980",
+          "alpha" : "1.000",
           "blue" : "0x12",
           "green" : "0x0F",
           "red" : "0x0F"

diff --git a/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift b/Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift
@@ -10,6 +10,8 @@ import UIKit
 import Lottie
 import DesignSystem
 
+import Lottie
+
 final class EmptyFavoritesView: UIView {
     private let listLottieView: LottieAnimationView = {
         let imgView = LottieAnimationView(

diff --git a/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift b/Projects/Feature/NearMapFeature/Sources/View/BusStopInformationView.swift
@@ -122,6 +122,10 @@ public final class BusStopInformationView: UIView {
                 equalTo: leadingAnchor,
                 constant: 15
             ),
+            busStopNameLabel.trailingAnchor.constraint(
+                equalTo: trailingAnchor,
+                constant: -15
+            ),
 
             busStopDescription.leadingAnchor.constraint(
                 equalTo: busStopNameLabel.leadingAnchor

diff --git a/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift b/Projects/Feature/SearchFeature/Sources/View/SearchTextFieldView.swift
@@ -27,7 +27,7 @@ public final class SearchTextFieldView: UITextField {
     private func configureUI() {
         self.backgroundColor = .adaptiveWhite
         self.font =
-        DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(size: 15)
+        DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(size: 14)
         self.layer.cornerRadius = 15
         self.clipsToBounds = true
         self.contentVerticalAlignment = .center

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-# 버스어디 v 1.2.1 
+# 버스어디 v 1.2.3
+
 ![제목을-입력해주세요_-001 (1)](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/65907001/a97bb417-52b2-454b-9f79-7fb715b4d96c)
 
 ## 프로젝트 소개
@@ -16,22 +17,20 @@
     - 특정 버스정류장의 버스에 정기알람을 설정하여 원하는 시간에 받을 알람을 설정할 수 있습니다.
     - ex 출퇴근 버스) 월~금 오전 7시 30분, 은곡마을 741번 버스 
 - **`설정`** 
-    - 앱 버전과 이용약관 확인 가능합니다.
+    - 앱 버전과 이용약관 확인 및 문의하기가 가능합니다.
 
 ### 📱구동화면
 
 | 즐겨찾기 | 검색 | 버스정류장 | 가까운 정류장 지도 |
 | --- | --- | --- | --- |
-|![Search](https://github.com/Pepsi-Club/BusComing/raw/dev/Document/ko/iPhone_15_Pro-1_Favorites.png)|![Search](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/65907001/db977cc0-42b9-48c5-b088-0802c3cf979e)|![BusStop](https://github.com/Pepsi-Club/BusComing/raw/dev/Document/ko/iPhone_15_Pro-4_BusStop.png)|![NearMap](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/65907001/781ca995-b5c6-4e5d-8556-d293359e3a7f)|
+|![Search](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/60245d90-b78e-4ea8-bc6b-48418e0a5d8f)|![Search](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/9f89c5c4-11f4-42e5-95de-c71ba1e07316)|![BusStop](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/551aa349-20f7-4183-b8f0-0d159cc02e66)|![NearMap](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/d5516f98-a3e3-4ee1-9e8d-731a71cd94e9)|
 
 | 즐겨찾기X | 최근검색어 | 정규알람 추가 | 정규알람 | 
 | --- | --- | --- | --- |
-| ![NonFavorites](https://github.com/Pepsi-Club/BusComing/raw/dev/Document/ko/iPhone_15_Pro-0_EmptyFavorites.png)|![RecentSearch](https://github.com/Pepsi-Club/BusComing/raw/dev/Document/ko/iPhone_15_Pro-2_RecentSearch.png)|![AddRegularAlarm](https://github.com/Pepsi-Club/BusComing/raw/dev/Document/ko/iPhone_15_Pro-6_RegularAlarm.png)|![Simulator Screenshot - iPhone 15 Pro - 2024-03-20 at 23 50 04](https://github.com/Pepsi-Club/BusComing/assets/133845468/6c930784-7de1-4940-a94a-3c65c17ca4fc) |
+| ![NonFavorites](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/938b5193-7f95-4050-afea-75a11ca7351c)|![RecentSearch](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/31e680db-c9a6-4485-bd75-c1a6f086c992)|![AddRegularAlarm](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/0fcb6763-3790-4545-8bfb-f4ff4839d92d)|![Simulator Screenshot - iPhone 15 Pro - 2024-03-20 at 23 50 04](https://github.com/Pepsi-Club/WhereMyBus-iOS/assets/91649269/214d4a6c-c079-4abd-827b-fe7432fb41d0)|
 
 <br>
 
-
-
 ### 💻 개발 환경, 기술스택, 아키텍처
 
 #### 개발환경
@@ -40,7 +39,8 @@
 - 개발 환경 : UIKit, Swift 5.0
     - iOS 최소 버전 : 16.0
     - iPhone SE ~ iPhone 15 ProMax 호환
-    - 다크모드 미지원
+    - 다크모드 지원
+
 - 디자인 툴 : Figma
 - 협업 도구 : Github, Team Notion, Discord
 ```
@@ -89,6 +89,7 @@
 - Fastlane
 - FirebaseMessaging - iOS
 - KakaoMapSDK_SPM
+- Lottie
 
 - 데이터: [서울특별시_정류소정보조회 서비스](https://www.data.go.kr/tcs/dss/selectApiDataDetailView.do?publicDataPk=15000303)
 

diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
@@ -9,10 +9,6 @@ import ProjectDescription
 import EnvironmentPlugin
 import DependencyPlugin
 
-import ProjectDescription
-import EnvironmentPlugin
-import DependencyPlugin
-
 extension Project {
     // MARK: Refact
     public static func makeProject(

diff --git a/Tuist/Templates/framework/project.stencil b/Tuist/Templates/framework/project.stencil
@@ -1,5 +1,6 @@
 import ProjectDescription
 import ProjectDescriptionHelpers
+import DependencyPlugin
 
 let project = Project.makeProject(
     name: "{{ name }}",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,6 @@ download-env:

		download-googleinfo:
		$(call download_file, Projects/App/Resources, $(token),GoogleService-Info.plist)
		$(call download_file, Projects/App/Resources, $(token),GoogleService-Info-debugging.plist)