Skip to content

fix: [#383] transparent weather assets and native back controls #384

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 1 commit into from
Nov 4, 2026
Merged

fix: [#383] transparent weather assets and native back controls #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified 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.
Binary file modified 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.
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.
41 changes: 19 additions & 22 deletions heatguard-iOS/Presentation/Features/SiteLinking/TeamMembershipFlowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct TeamMembershipFlowView: View {

private var invitationConfirmation: some View {
VStack(spacing: 0) {
flowHeader(title: "현장 연동", backgroundColor: HGColor.appBackground, height: 54, topInset: 10)
flowHeader(title: "현장 연동")

Spacer(minLength: 24)

Expand Down Expand Up @@ -157,7 +157,6 @@ struct TeamMembershipFlowView: View {
}
.dismissKeyboardOnBackgroundTap()
.background(HGColor.appBackground.ignoresSafeArea())
.toolbar(.hidden, for: .navigationBar)
}

@ViewBuilder
Expand Down Expand Up @@ -505,7 +504,7 @@ struct TeamMembershipFlowView: View {

private var membershipList: some View {
VStack(spacing: 0) {
flowHeader(title: "내 현장 목록", backgroundColor: HGColor.appBackground, height: 54, topInset: 10)
flowHeader(title: "내 현장 목록")
if memberships.isEmpty {
ContentUnavailableView(
"초대받은 현장이 없어요",
Expand Down Expand Up @@ -582,30 +581,28 @@ struct TeamMembershipFlowView: View {

private func flowHeader(
title: String,
backgroundColor: Color = HGColor.surface,
height: CGFloat = 48,
topInset: CGFloat = 0,
onBack: (() -> Void)? = nil
) -> some View {
ZStack {
Text(title)
.font(HGFont.semiBold(18, relativeTo: .headline))
.foregroundStyle(HGColor.primaryText)
HStack {
Button(action: onBack ?? onClose) {
Image(systemName: "chevron.left")
.font(.system(size: 17, weight: .semibold))
Color.clear
.frame(height: 0)
.navigationTitle(title)
.navigationBarTitleDisplayMode(.inline)
.toolbar(.visible, for: .navigationBar)
.toolbarBackground(HGColor.appBackground, for: .navigationBar)
.toolbarBackground(.visible, for: .navigationBar)
.toolbar {
ToolbarItem(placement: .principal) {
Text(title)
.font(HGFont.semiBold(18, relativeTo: .headline))
.foregroundStyle(HGColor.primaryText)
.frame(width: 44, height: 44)
}
.accessibilityLabel("뒤로")
Spacer()
ToolbarItem(placement: .navigationBarLeading) {
Button(action: onBack ?? onClose) {
Image(systemName: "chevron.backward")
}
.accessibilityLabel("뒤로")
}
}
}
.frame(height: height)
.padding(.horizontal, 14)
.padding(.top, topInset)
.background(backgroundColor)
}

@MainActor
Expand Down
Loading