-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #243 from Team-Smeme/develop
[TEST] 일기 코칭 및 상세 코칭 기능 테스트 플라이트 등록
- Loading branch information
Showing
38 changed files
with
1,123 additions
and
801 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,8 @@ name: Swift | |
| on: | ||
| push: | ||
| branches: [ "develop" ] | ||
| pull_request: | ||
| branches: [ "develop" ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // | ||
| // Double+.swift | ||
| // Smeem-iOS | ||
| // | ||
| // Created by Joon Baek on 12/1/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| extension Double { | ||
| // 너비 기반 스케일링 (iPhone 13 mini) | ||
| func scaledByWidth() -> Double { | ||
| return (self / 375) * UIScreen.main.bounds.width | ||
| } | ||
|
|
||
| // 높이 기반 스케일링 (iPhone 13 mini) | ||
| func scaledByHeight() -> Double { | ||
| return (self / 812) * UIScreen.main.bounds.height | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
Smeem-iOS/Smeem-iOS/Global/UIComponents/SmeemComponent/LoadingView/SmemeLoadingView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // SmemeLoadingView.swift | ||
| // Smeem-iOS | ||
| // | ||
| // Created by 황찬미 on 11/26/24. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct SmemeLoadingView: View { | ||
|
|
||
| var body: some View { | ||
| HStack { | ||
| Spacer() | ||
| VStack { | ||
| Spacer() | ||
| ProgressView() | ||
| Spacer() | ||
| } | ||
| Spacer() | ||
| } | ||
| .ignoresSafeArea() | ||
| .background(Color.white.opacity(0.1)) // 반투명 배경 | ||
| .allowsHitTesting(true) // 로딩 중 터치 차단 | ||
| } | ||
| } | ||
|
|
||
| struct SmemeEmptyView: View { | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| Color.white.ignoresSafeArea() | ||
| } | ||
| .animation(.easeInOut(duration: 0.5), value: true) // 0.5초 뒤에 서서히 사라짐 | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.