Skip to content

fix: [#381] use Figma weather assets and align emergency popups #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dltldn1234 merged 3 commits into from
Nov 4, 2026
Merged

fix: [#381] use Figma weather assets and align emergency popups #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7697558
fix: [#381] hide weather asset canvas and align call popup
dltldn1234 Nov 3, 2026
51594e0
fix: [#381] remove weather canvas and align emergency popup
dltldn1234 Nov 4, 2026
dd53896
fix: [#381] use Figma weather assets and unify popup height
dltldn1234 Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"filename" : "weather-cloudy.png",
"idiom" : "universal",
"scale" : "1x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added heatguard-iOS/Assets.xcassets/WeatherCloudy.imageset/weather-cloudy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions heatguard-iOS/Assets.xcassets/WeatherRain.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"filename" : "weather-rain.png",
"idiom" : "universal",
"scale" : "1x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added heatguard-iOS/Assets.xcassets/WeatherRain.imageset/weather-rain.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
"filename" : "weather-sunny.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
Binary file modified heatguard-iOS/Assets.xcassets/WeatherSunny.imageset/weather-sunny.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions heatguard-iOS/Core/Dashboard/HGDashboardService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ struct HomeWeather: Equatable {
switch skyStatus {
case "CLEAR": "WeatherSunny"
case "PARTLY_CLOUDY": "WeatherPartlyCloudy"
case "CLOUDY": "WeatherCloudy"
case "RAIN": "WeatherRain"
case "SNOW": nil
default: "WeatherSunny"
}
}
Expand Down
7 changes: 7 additions & 0 deletions heatguard-iOS/Presentation/Components/HGEmergencyComponents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import SwiftUI

enum HGEmergencyPopupLayout {
static let popupHeight: CGFloat = 560
static let contentTopPadding: CGFloat = 22
static let contactCardTopPadding: CGFloat = 20
static let actionHorizontalPadding: CGFloat = 18
}

struct HGEmergencyPulse: View {
@State private var isExpanded = false

Expand Down
8 changes: 4 additions & 4 deletions heatguard-iOS/Presentation/Features/EmergencyAlert/EmergencyAlertView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ struct EmergencyAlertView: View {
}

var body: some View {
HGStatusPopup(title: "긴급 호출", height: 560) {
HGStatusPopup(title: "긴급 호출", height: HGEmergencyPopupLayout.popupHeight) {
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) {}
Expand Down
8 changes: 4 additions & 4 deletions heatguard-iOS/Presentation/Features/EmergencyCall/EmergencyCallView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ struct EmergencyCallView: View {
}

var body: some View {
HGStatusPopup(title: "긴급 호출", height: 620) {
HGStatusPopup(title: "긴급 호출", height: HGEmergencyPopupLayout.popupHeight) {
callStatus
.padding(.top, 32)
.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) {}
Expand Down
Loading