Skip to content

Commit 8d39bf6

Browse files
committed
Merge branch 'develop' of personal-github.com:YAPP-Github/21st-iOS-Team-2-iOS into feature/qa-login
2 parents a2cf646 + 542d3a3 commit 8d39bf6

File tree

50 files changed

+1055
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1055
-223
lines changed

Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_sun.fill.imageset/Contents.json renamed to Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_home.fill.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "icon_sun.fill.svg",
4+
"filename" : "icon_home.fill.svg",
55
"idiom" : "universal"
66
}
77
],
Lines changed: 10 additions & 0 deletions
Loading

Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_sun.imageset/Contents.json renamed to Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_home.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "icon_sun.svg",
4+
"filename" : "icon_home.svg",
55
"idiom" : "universal"
66
}
77
],
Lines changed: 14 additions & 0 deletions
Loading

Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_sun.fill.imageset/icon_sun.fill.svg

Lines changed: 0 additions & 18 deletions
This file was deleted.

Fitfty/Projects/Common/Resources/Images.xcassets/icons/icon_sun.imageset/icon_sun.svg

Lines changed: 0 additions & 18 deletions
This file was deleted.

Fitfty/Projects/Common/Sources/AppAppearance.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@ public final class AppAppearance {
1414
UINavigationBar.appearance().largeTitleTextAttributes = [.foregroundColor: UIColor.label]
1515
UINavigationBar.appearance().titleTextAttributes = [.foregroundColor: UIColor.label]
1616
UINavigationBar.appearance().barTintColor = .white
17+
UITabBar.appearance().shadowImage = UIImage()
18+
UITabBar.appearance().backgroundImage = UIImage()
19+
UITabBar.appearance().backgroundColor = UIColor.white
1720
}
1821
}

Fitfty/Projects/Common/Sources/TabBarController.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public final class TabBarController: UITabBarController {
1313
public init() {
1414
super.init(nibName: nil, bundle: nil)
1515
object_setClass(self.tabBar, TabBar.self)
16-
self.tabBar.backgroundColor = .white
16+
applyShadow()
1717
}
1818

1919
required init?(coder: NSCoder) {
@@ -27,4 +27,11 @@ public final class TabBarController: UITabBarController {
2727
}
2828
}
2929

30+
private func applyShadow() {
31+
tabBar.layer.shadowColor = UIColor.black.cgColor
32+
tabBar.layer.shadowOpacity = 0.3
33+
tabBar.layer.shadowOffset = CGSize(width: 0, height: 0)
34+
tabBar.layer.shadowRadius = 0.33
35+
}
36+
3037
}

Fitfty/Projects/Common/Sources/WeatherTag.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ public enum WeatherTag: String, Codable {
7777
}
7878
extension WeatherTag {
7979
public init(temp: Int) {
80-
if temp < 3 {
80+
if temp <= 3 {
8181
self = .freezing
82-
} else if temp > 3, temp < 9 {
82+
} else if temp >= 3, temp <= 9 {
8383
self = .cold
84-
} else if temp > 9, temp < 17 {
84+
} else if temp >= 9, temp <= 17 {
8585
self = .chilly
86-
} else if temp > 17, temp < 23 {
86+
} else if temp >= 17, temp <= 23 {
8787
self = .warm
8888
} else {
8989
self = .hot

Fitfty/Projects/Coordinator/Sources/Coordinator.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ enum CoordinatorType {
6969
case onboarding
7070
case detailReport
7171
case report
72+
case reportList
7273
}

0 commit comments

Comments
 (0)