diff --git a/ComfortableMove/ComfortableMove.xcodeproj/project.pbxproj b/ComfortableMove/ComfortableMove.xcodeproj/project.pbxproj index cacbf40..e12fd60 100644 --- a/ComfortableMove/ComfortableMove.xcodeproj/project.pbxproj +++ b/ComfortableMove/ComfortableMove.xcodeproj/project.pbxproj @@ -33,11 +33,6 @@ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ - 804966C02E8B87F7004590A7 /* ComfortableMoveTest */ = { - isa = PBXFileSystemSynchronizedRootGroup; - path = ComfortableMoveTest; - sourceTree = ""; - }; 8070624E2E7A7714004D496D /* ComfortableMove */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( @@ -70,7 +65,6 @@ isa = PBXGroup; children = ( 8070624E2E7A7714004D496D /* ComfortableMove */, - 804966C02E8B87F7004590A7 /* ComfortableMoveTest */, 8070624D2E7A7714004D496D /* Products */, ); sourceTree = ""; @@ -100,9 +94,6 @@ dependencies = ( 804966C42E8B87F7004590A7 /* PBXTargetDependency */, ); - fileSystemSynchronizedGroups = ( - 804966C02E8B87F7004590A7 /* ComfortableMoveTest */, - ); name = ComfortableMoveTest; packageProductDependencies = ( ); diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Color/Onboarding4.colorset/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Color/Onboarding4.colorset/Contents.json new file mode 100644 index 0000000..1e6dac2 --- /dev/null +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Color/Onboarding4.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xCB", + "green" : "0xC0", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xCB", + "green" : "0xC0", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Help Page(New).png b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Help Page(New).png deleted file mode 100644 index 73af8ca..0000000 Binary files a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Help Page(New).png and /dev/null differ diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Contents.json similarity index 86% rename from ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Contents.json rename to ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Contents.json index a468ad7..6d46495 100644 --- a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpImage.imageset/Contents.json +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Contents.json @@ -1,11 +1,11 @@ { "images" : [ { + "filename" : "Help Page 1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Help Page(New).png", "idiom" : "universal", "scale" : "2x" }, diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Help Page 1.png b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Help Page 1.png new file mode 100644 index 0000000..041984c Binary files /dev/null and b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage1.imageset/Help Page 1.png differ diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Contents.json new file mode 100644 index 0000000..48e8dd2 --- /dev/null +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Help Page2 (1).png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Help Page2 (1).png b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Help Page2 (1).png new file mode 100644 index 0000000..6736b47 Binary files /dev/null and b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/HelpImage2.imageset/Help Page2 (1).png differ diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/Contents.json new file mode 100644 index 0000000..f7f6243 --- /dev/null +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "RatioFixHelpPage1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/RatioFixHelpPage1.png b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/RatioFixHelpPage1.png new file mode 100644 index 0000000..8189bb9 Binary files /dev/null and b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage1.imageset/RatioFixHelpPage1.png differ diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Contents.json b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Contents.json new file mode 100644 index 0000000..81ca9aa --- /dev/null +++ b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Ratio Fix Help Page.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Ratio Fix Help Page.png b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Ratio Fix Help Page.png new file mode 100644 index 0000000..3291cdd Binary files /dev/null and b/ComfortableMove/ComfortableMove/App/Resources/Assets.xcassets/Image/HelpPage/RatioFixHelpImage2.imageset/Ratio Fix Help Page.png differ diff --git a/ComfortableMove/ComfortableMove/Core/Manager/BusStopService.swift b/ComfortableMove/ComfortableMove/Core/Manager/BusStopService.swift index d5d692b..c99e1c9 100644 --- a/ComfortableMove/ComfortableMove/Core/Manager/BusStopService.swift +++ b/ComfortableMove/ComfortableMove/Core/Manager/BusStopService.swift @@ -13,8 +13,8 @@ class BusStopService { private init() {} - /// 위치 기반 주변 정류소 조회 - func getNearbyStations(location: CLLocation, radius: Int = 100) async throws -> [StationItem] { + // MARK: 위치 기반 주변 정류소 조회 -> 10m로 업데이트 + func getNearbyStations(location: CLLocation, radius: Int = 10) async throws -> [StationItem] { let baseURL = "http://ws.bus.go.kr/api/rest/stationinfo/getStationByPos" Logger.log(message: "🚏 [API] Searching stations near (\(location.coordinate.latitude), \(location.coordinate.longitude))") diff --git a/ComfortableMove/ComfortableMove/Core/Presentation/Help/HelpPageView.swift b/ComfortableMove/ComfortableMove/Core/Presentation/Help/HelpPageView.swift index 4f6858d..5bdd0ce 100644 --- a/ComfortableMove/ComfortableMove/Core/Presentation/Help/HelpPageView.swift +++ b/ComfortableMove/ComfortableMove/Core/Presentation/Help/HelpPageView.swift @@ -8,48 +8,63 @@ import SwiftUI struct HelpPageView: View { - @Binding var isPresented: Bool + @Environment(\.dismiss) private var dismiss + @State private var currentPage = 0 + + private var helpImages: [String] { + if UIApplication.isMinimumSizeDevice { + return ["RatioFixHelpImage1", "RatioFixHelpImage2"] + } else { + return ["HelpImage1", "HelpImage2"] + } + } + + private var backButton: some View { + Button(action: { + dismiss() + }) { + Image(systemName: "chevron.left") + .foregroundColor(.white) + } + } var body: some View { - ZStack { - Color.black.opacity(0.7) - .ignoresSafeArea() - .onTapGesture { - isPresented = false - } - - VStack(spacing: 0) { - Image("HelpImage") + TabView(selection: $currentPage) { + ForEach(0..