From 7697558b5c5c715dd4b518b481d6189e7f2c37ee Mon Sep 17 00:00:00 2001 From: Book-on <266720604+dltldn1234@users.noreply.github.com> Date: Tue, 3 Nov 2026 22:14:21 +0900 Subject: [PATCH 1/3] fix: [#381] hide weather asset canvas and align call popup --- .../Features/EmergencyCall/EmergencyCallView.swift | 2 +- heatguard-iOS/Presentation/Features/Home/HomeView.swift | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift index 6a52d6d..95149b8 100644 --- a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift +++ b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift @@ -29,7 +29,7 @@ struct EmergencyCallView: View { var body: some View { HGStatusPopup(title: "긴급 호출", height: 620) { callStatus - .padding(.top, 32) + .padding(.top, 22) contactCard .padding(.top, 20) diff --git a/heatguard-iOS/Presentation/Features/Home/HomeView.swift b/heatguard-iOS/Presentation/Features/Home/HomeView.swift index 18fa489..3da63d3 100644 --- a/heatguard-iOS/Presentation/Features/Home/HomeView.swift +++ b/heatguard-iOS/Presentation/Features/Home/HomeView.swift @@ -301,6 +301,9 @@ struct HomeView: View { Image(assetName) .resizable() .scaledToFit() + // WeatherSunny is a legacy raster with a white canvas baked in. + // Multiply it into the dashboard background to hide that canvas. + .blendMode(assetName == "WeatherSunny" ? .multiply : .normal) } else { Image(systemName: dashboard.weather.skySymbol) .resizable() From 51594e09f5b8a6bcf6957c26a52ba3f17ead8466 Mon Sep 17 00:00:00 2001 From: Book-on <266720604+dltldn1234@users.noreply.github.com> Date: Wed, 4 Nov 2026 19:36:30 +0900 Subject: [PATCH 2/3] fix: [#381] remove weather canvas and align emergency popup --- .../WeatherSunny.imageset/Contents.json | 13 ++++------- .../WeatherSunny.imageset/weather-sunny.png | Bin 8867 -> 0 bytes .../WeatherSunny.imageset/weather-sunny.svg | 21 ++++++++++++++++++ .../Core/Dashboard/HGDashboardService.swift | 1 + .../Components/HGEmergencyComponents.swift | 6 +++++ .../EmergencyAlert/EmergencyAlertView.swift | 6 ++--- .../EmergencyCall/EmergencyCallView.swift | 6 ++--- .../Presentation/Features/Home/HomeView.swift | 3 --- 8 files changed, 38 insertions(+), 18 deletions(-) delete mode 100644 heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png create mode 100644 heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.svg diff --git a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json index d7b3eb9..f29ceb3 100644 --- a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json +++ b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json @@ -1,19 +1,14 @@ { "images" : [ { - "filename" : "weather-sunny.png", + "filename" : "weather-sunny.svg", "idiom" : "universal", "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" } ], + "properties" : { + "preserves-vector-representation" : true + }, "info" : { "author" : "xcode", "version" : 1 diff --git a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png deleted file mode 100644 index 7909e6b6e847bac2601c0a3040ae66a1379dc6e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8867 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 + + + + + + + + + + + + + + + + + + + + diff --git a/heatguard-iOS/Core/Dashboard/HGDashboardService.swift b/heatguard-iOS/Core/Dashboard/HGDashboardService.swift index 6aeacfe..bb4ad42 100644 --- a/heatguard-iOS/Core/Dashboard/HGDashboardService.swift +++ b/heatguard-iOS/Core/Dashboard/HGDashboardService.swift @@ -225,6 +225,7 @@ struct HomeWeather: Equatable { switch skyStatus { case "CLEAR": "WeatherSunny" case "PARTLY_CLOUDY": "WeatherPartlyCloudy" + case "CLOUDY", "RAIN", "SNOW": nil default: "WeatherSunny" } } diff --git a/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift b/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift index 0fa748e..a9c94e4 100644 --- a/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift +++ b/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift @@ -1,5 +1,11 @@ import SwiftUI +enum HGEmergencyPopupLayout { + static let contentTopPadding: CGFloat = 22 + static let contactCardTopPadding: CGFloat = 20 + static let actionHorizontalPadding: CGFloat = 18 +} + struct HGEmergencyPulse: View { @State private var isExpanded = false diff --git a/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift b/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift index 97435cb..ddbb408 100644 --- a/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift +++ b/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift @@ -26,14 +26,14 @@ struct EmergencyAlertView: View { var body: some View { HGStatusPopup(title: "긴급 호출", height: 560) { callPrompt - .padding(.top, 22) + .padding(.top, HGEmergencyPopupLayout.contentTopPadding) contactCard - .padding(.top, 20) + .padding(.top, HGEmergencyPopupLayout.contactCardTopPadding) } actions: { HGSecondaryButton(title: isCalling ? "호출 중..." : "호출하기", action: onCall) .disabled(isCalling) - .padding(.horizontal, 18) + .padding(.horizontal, HGEmergencyPopupLayout.actionHorizontalPadding) } .alert(error?.title ?? "본사 전화 오류", isPresented: errorAlert) { Button("확인", role: .cancel) {} diff --git a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift index 95149b8..6a5e049 100644 --- a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift +++ b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift @@ -29,17 +29,17 @@ struct EmergencyCallView: View { var body: some View { HGStatusPopup(title: "긴급 호출", height: 620) { callStatus - .padding(.top, 22) + .padding(.top, HGEmergencyPopupLayout.contentTopPadding) contactCard - .padding(.top, 20) + .padding(.top, HGEmergencyPopupLayout.contactCardTopPadding) } actions: { HGSecondaryButton( title: isCancelling ? "취소 중..." : canCancel ? "호출 취소" : "접수 완료", action: onCancel ) .disabled(isCancelling || !canCancel) - .padding(.horizontal, 18) + .padding(.horizontal, HGEmergencyPopupLayout.actionHorizontalPadding) } .alert(error?.title ?? "긴급 호출 오류", isPresented: errorAlert) { Button("확인", role: .cancel) {} diff --git a/heatguard-iOS/Presentation/Features/Home/HomeView.swift b/heatguard-iOS/Presentation/Features/Home/HomeView.swift index 3da63d3..18fa489 100644 --- a/heatguard-iOS/Presentation/Features/Home/HomeView.swift +++ b/heatguard-iOS/Presentation/Features/Home/HomeView.swift @@ -301,9 +301,6 @@ struct HomeView: View { Image(assetName) .resizable() .scaledToFit() - // WeatherSunny is a legacy raster with a white canvas baked in. - // Multiply it into the dashboard background to hide that canvas. - .blendMode(assetName == "WeatherSunny" ? .multiply : .normal) } else { Image(systemName: dashboard.weather.skySymbol) .resizable() From dd5389605a8161eb485604887dfdf019d931a749 Mon Sep 17 00:00:00 2001 From: Book-on <266720604+dltldn1234@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:10:30 +0900 Subject: [PATCH 3/3] fix: [#381] use Figma weather assets and unify popup height --- .../WeatherCloudy.imageset/Contents.json | 13 +++++++++++ .../WeatherCloudy.imageset/weather-cloudy.png | Bin 0 -> 7496 bytes .../WeatherRain.imageset/Contents.json | 13 +++++++++++ .../WeatherRain.imageset/weather-rain.png | Bin 0 -> 10279 bytes .../WeatherSunny.imageset/Contents.json | 5 +---- .../WeatherSunny.imageset/weather-sunny.png | Bin 0 -> 7915 bytes .../WeatherSunny.imageset/weather-sunny.svg | 21 ------------------ .../Core/Dashboard/HGDashboardService.swift | 4 +++- .../Components/HGEmergencyComponents.swift | 1 + .../EmergencyAlert/EmergencyAlertView.swift | 2 +- .../EmergencyCall/EmergencyCallView.swift | 2 +- 11 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/Contents.json create mode 100644 heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/weather-cloudy.png create mode 100644 heatguard-iOS/Assets.xcassets/WeatherRain.imageset/Contents.json create mode 100644 heatguard-iOS/Assets.xcassets/WeatherRain.imageset/weather-rain.png create mode 100644 heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png delete mode 100644 heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.svg diff --git a/heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/Contents.json b/heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/Contents.json new file mode 100644 index 0000000..8a2a49b --- /dev/null +++ b/heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/Contents.json @@ -0,0 +1,13 @@ +{ + "images" : [ + { + "filename" : "weather-cloudy.png", + "idiom" : "universal", + "scale" : "1x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/weather-cloudy.png b/heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/weather-cloudy.png new file mode 100644 index 0000000000000000000000000000000000000000..0d93a07ee2e9a5a6f423f9fa1855c2c011e39b41 GIT binary patch literal 7496 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 S4z!T~0000pLiV-ONjmAh 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 literal 0 HcmV?d00001 diff --git a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json index f29ceb3..119a490 100644 --- a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json +++ b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json @@ -1,14 +1,11 @@ { "images" : [ { - "filename" : "weather-sunny.svg", + "filename" : "weather-sunny.png", "idiom" : "universal", "scale" : "1x" } ], - "properties" : { - "preserves-vector-representation" : true - }, "info" : { "author" : "xcode", "version" : 1 diff --git a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png new file mode 100644 index 0000000000000000000000000000000000000000..955406b44e7270a941307e1a0f1e570248990ee2 GIT binary patch literal 7915 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 V8PS{;Dop?Y002ovPDHLkV1h2z|F-}D literal 0 HcmV?d00001 diff --git a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.svg b/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.svg deleted file mode 100644 index 75dff78..0000000 --- a/heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/heatguard-iOS/Core/Dashboard/HGDashboardService.swift b/heatguard-iOS/Core/Dashboard/HGDashboardService.swift index bb4ad42..26435ef 100644 --- a/heatguard-iOS/Core/Dashboard/HGDashboardService.swift +++ b/heatguard-iOS/Core/Dashboard/HGDashboardService.swift @@ -225,7 +225,9 @@ struct HomeWeather: Equatable { switch skyStatus { case "CLEAR": "WeatherSunny" case "PARTLY_CLOUDY": "WeatherPartlyCloudy" - case "CLOUDY", "RAIN", "SNOW": nil + case "CLOUDY": "WeatherCloudy" + case "RAIN": "WeatherRain" + case "SNOW": nil default: "WeatherSunny" } } diff --git a/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift b/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift index a9c94e4..bf22de0 100644 --- a/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift +++ b/heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift @@ -1,6 +1,7 @@ import SwiftUI enum HGEmergencyPopupLayout { + static let popupHeight: CGFloat = 560 static let contentTopPadding: CGFloat = 22 static let contactCardTopPadding: CGFloat = 20 static let actionHorizontalPadding: CGFloat = 18 diff --git a/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift b/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift index ddbb408..0fd254f 100644 --- a/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift +++ b/heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift @@ -24,7 +24,7 @@ struct EmergencyAlertView: View { } var body: some View { - HGStatusPopup(title: "긴급 호출", height: 560) { + HGStatusPopup(title: "긴급 호출", height: HGEmergencyPopupLayout.popupHeight) { callPrompt .padding(.top, HGEmergencyPopupLayout.contentTopPadding) diff --git a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift index 6a5e049..a8aa82b 100644 --- a/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift +++ b/heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift @@ -27,7 +27,7 @@ struct EmergencyCallView: View { } var body: some View { - HGStatusPopup(title: "긴급 호출", height: 620) { + HGStatusPopup(title: "긴급 호출", height: HGEmergencyPopupLayout.popupHeight) { callStatus .padding(.top, HGEmergencyPopupLayout.contentTopPadding)