Merge pull request #24 from BoostSwiftUI/ericKwon-Pillyze-QA

ericKwon95 · web-flow · commit 4a0392501a72 · 2024-08-30T23:25:36.000+09:00
권승용 필라이즈 2차 QA 작업
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze.xcodeproj/project.pbxproj b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 		60C610E02C4D3C4700C94465 /* CustomTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60C610DF2C4D3C4700C94465 /* CustomTabBar.swift */; };
 		60DF1A4B2C4235E80090057B /* ComponentBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A4A2C4235E80090057B /* ComponentBackground.swift */; };
 		60DF1A4F2C4238060090057B /* MyDiets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A4E2C4238060090057B /* MyDiets.swift */; };
-		60DF1A542C423CD40090057B /* ButtonEnabledStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A532C423CD40090057B /* ButtonEnabledStyle.swift */; };
+		60DF1A542C423CD40090057B /* MyButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A532C423CD40090057B /* MyButtonStyle.swift */; };
 		60DF1A572C4260960090057B /* Diet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A562C4260960090057B /* Diet.swift */; };
 		60DF1A592C429DFE0090057B /* TransparentBlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A582C429DFE0090057B /* TransparentBlurView.swift */; };
 		60DF1A5C2C42C0D50090057B /* AddDiet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60DF1A5B2C42C0D50090057B /* AddDiet.swift */; };
@@ -97,7 +97,7 @@
 		60C610DF2C4D3C4700C94465 /* CustomTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabBar.swift; sourceTree = "<group>"; };
 		60DF1A4A2C4235E80090057B /* ComponentBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComponentBackground.swift; sourceTree = "<group>"; };
 		60DF1A4E2C4238060090057B /* MyDiets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyDiets.swift; sourceTree = "<group>"; };
-		60DF1A532C423CD40090057B /* ButtonEnabledStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonEnabledStyle.swift; sourceTree = "<group>"; };
+		60DF1A532C423CD40090057B /* MyButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyButtonStyle.swift; sourceTree = "<group>"; };
 		60DF1A562C4260960090057B /* Diet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Diet.swift; sourceTree = "<group>"; };
 		60DF1A582C429DFE0090057B /* TransparentBlurView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransparentBlurView.swift; sourceTree = "<group>"; };
 		60DF1A5B2C42C0D50090057B /* AddDiet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddDiet.swift; sourceTree = "<group>"; };
@@ -345,7 +345,7 @@
 			isa = PBXGroup;
 			children = (
 				60DF1A4A2C4235E80090057B /* ComponentBackground.swift */,
-				60DF1A532C423CD40090057B /* ButtonEnabledStyle.swift */,
+				60DF1A532C423CD40090057B /* MyButtonStyle.swift */,
 			);
 			path = Modifiers;
 			sourceTree = "<group>";
@@ -548,7 +548,7 @@
 				60C610E02C4D3C4700C94465 /* CustomTabBar.swift in Sources */,
 				6082A0EB2C410E8D00C72C97 /* PillyzeApp.swift in Sources */,
 				6082A11F2C41299900C72C97 /* TabBarButton.swift in Sources */,
-				60DF1A542C423CD40090057B /* ButtonEnabledStyle.swift in Sources */,
+				60DF1A542C423CD40090057B /* MyButtonStyle.swift in Sources */,
 				6076A3E42C45073100F95DC9 /* BottomPicker.swift in Sources */,
 				6082A11D2C41288300C72C97 /* TabBar.swift in Sources */,
 				60DF1A592C429DFE0090057B /* TransparentBlurView.swift in Sources */,
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Models/Food.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Models/Food.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct Food: Identifiable, Codable {
+struct Food: Hashable, Identifiable, Codable {
     let id = UUID().uuidString
     let name: String
     let unit: String
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Models/ModelData.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Models/ModelData.swift
@@ -9,6 +9,12 @@ import Foundation
 
 @Observable
 class ModelData {
-    var foods: [Food] = JSONLoader.load("food_list_with_rank.json")
+    var foods: [Food] = JSONLoader.load("food_list_with_rank.json") {
+        didSet {
+            foodsWithRice = foods.filter { $0.name.contains("밥") }
+        }
+    }
+    var foodsWithRice: [Food] = []
     var isAdded: Bool = false
+    var selectedFoods: [Food: Int] = [:]
 }
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Resources/Assets.xcassets/Colors/AppPrimaryDisabled.colorset/Contents.json b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Resources/Assets.xcassets/Colors/AppPrimaryDisabled.colorset/Contents.json
@@ -6,8 +6,8 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "0xFF",
-          "green" : "0xAA",
-          "red" : "0xBC"
+          "green" : "0xE8",
+          "red" : "0xEC"
         }
       },
       "idiom" : "universal"
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Resources/Assets.xcassets/Icons/RankDown.imageset/Type=Down.svg b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Resources/Assets.xcassets/Icons/RankDown.imageset/Type=Down.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.45119 6.6585C2.88543 6.01192 3.34461 5 4.20377 5H13.7962C14.6554 5 15.1146 6.01192 14.5488 6.6585L9.75258 12.1399C9.35416 12.5952 8.64583 12.5952 8.24742 12.1399L3.45119 6.6585Z" fill="#F83766"/>
+<path d="M3.45119 6.6585C2.88543 6.01192 3.34461 5 4.20377 5H13.7962C14.6554 5 15.1146 6.01192 14.5488 6.6585L9.75258 12.1399C9.35416 12.5952 8.64583 12.5952 8.24742 12.1399L3.45119 6.6585Z" fill="#3761F8"/>
 </svg>
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/AddDiet.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/AddDiet.swift
@@ -21,12 +21,12 @@ struct AddDiet: View {
                 Color.componentBackground
                     .ignoresSafeArea(edges: .top)
                 
-                VStack {
+                VStack(spacing: 0) {
                     searchBar()
                     CustomTabBar()
                 }
                 
-                VStack {
+                VStack(spacing: 0) {
                     Spacer()
                     BottomPicker(isAddingList: $isAddingList)
                         .padding(.bottom, proxy.safeAreaInsets.bottom)
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/BottomBar/BottomPicker.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/BottomBar/BottomPicker.swift
@@ -9,6 +9,7 @@ import SwiftUI
 
 struct BottomPicker: View {
     @Binding var isAddingList: Bool
+    @Environment(ModelData.self) private var modelData
     
     var body: some View {
         VStack(spacing: 0) {
@@ -29,12 +30,13 @@ struct BottomPicker: View {
                     .font(.system(size: 18))
                     .fontWeight(.heavy)
                     .foregroundStyle(.textNormal)
+                    .padding(.trailing, 29)
                 
                 Button {
                     
                 } label: {
                     Text("기록하기")
-                        .buttonEnabledStyle()
+                        .myButtonStyle(isEnabled: !modelData.selectedFoods.isEmpty)
                 }
                 .buttonStyle(PlainButtonStyle())
             }
@@ -45,7 +47,8 @@ struct BottomPicker: View {
 }
 
 #Preview {
-    BottomPicker(isAddingList: .constant(true))
+    BottomPicker(isAddingList: .constant(false))
+        .environment(ModelData())
 }
 
 struct MealPicker: View {
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/FoodList/FoodInfo.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/FoodList/FoodInfo.swift
@@ -19,7 +19,10 @@ struct FoodInfo: View {
             
             HStack(spacing: 12) {
                 Text("\(food.caloriesPerUnit)kcal")
-                AddButton()
+                    .font(.system(size: 16))
+                    .fontWeight(.medium)
+                    .foregroundStyle(.textSecondary)
+                AddButton(food: food)
             }
         }
         .padding(.vertical, 16)
@@ -61,8 +64,8 @@ struct FoodInfo: View {
                     .foregroundStyle(.textNormal)
                 Text(food.unit)
                     .font(.system(size: 16))
-                    .fontWeight(.light)
-                    .foregroundStyle(.textSecondary)
+                    .fontWeight(.regular)
+                    .foregroundStyle(.textPlaceholder)
             }
         }
     }
@@ -71,6 +74,7 @@ struct FoodInfo: View {
 struct AddButton: View {
     @Environment(ModelData.self) private var modelData
     @State private var isAdded: Bool = false
+    let food: Food
     
     var body: some View {
         Image(isAdded ? .dietSelected : .dietUnselected)
@@ -81,10 +85,25 @@ struct AddButton: View {
                 isAdded.toggle()
                 if isAdded {
                     modelData.isAdded = true
+                    modelData.selectedFoods[food] = food.hashValue
+                } else {
+                    modelData.selectedFoods[food] = nil
                 }
             }
             .animation(.easeInOut, value: isAdded)
             .disabled(modelData.isAdded)
+            .onAppear {
+                if modelData.selectedFoods[food] != nil {
+                    isAdded = true
+                }
+            }
+            .onChange(of: modelData.selectedFoods) { oldValue, newValue in
+                if newValue[food] != nil {
+                    isAdded = true
+                } else {
+                    isAdded = false
+                }
+            }
     }
 }
 
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/FoodList/FoodListRow.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/Common/FoodList/FoodListRow.swift
@@ -36,4 +36,5 @@ struct FoodListRow: View {
 
 #Preview {
     FoodListRow(food: ModelData().foods.first!, isRankedList: true)
+        .environment(ModelData())
 }
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/CustomTabBar/CustomTabBar.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/CustomTabBar/CustomTabBar.swift
@@ -29,6 +29,7 @@ struct CustomTabBar: View {
                 VStack(spacing: 0) {
                     TabBarHeader(selection: $selection, indicatorOffset: $indicatorOffset, proxy: proxy)
                         .onChange(of: selection) { oldValue, newValue in
+                            modelData.selectedFoods = [:]
                             switch newValue {
                             case .frequentlyEaten:
                                 indicatorOffset = 0
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/FrequentlyEaten/FrequentlyEaten.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/AddDiet/FrequentlyEaten/FrequentlyEaten.swift
@@ -40,7 +40,7 @@ struct FrequentlyEaten: View {
                         case .all:
                             FoodList(foods: modelData.foods, isRankedList: false)
                         case .food:
-                            FoodList(foods: modelData.foods.filter { $0.name.contains("밥")}, isRankedList: false)
+                            FoodList(foods: modelData.foodsWithRice, isRankedList: false)
                         case .set:
                             Image(.favoritesPlaceholder)
                                 .resizable()
@@ -74,7 +74,7 @@ struct FrequentlyEaten: View {
     
     @ViewBuilder
     func frequentlyEatenGroup() -> some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 8) {
             HStack(spacing: 0) {
                 Text("남성")
                     .font(.system(size: 16))
@@ -92,14 +92,16 @@ struct FrequentlyEaten: View {
                     .font(.system(size: 16))
                     .fontWeight(.bold)
                     .foregroundStyle(.textNormal)
+                    .padding(.leading, 8)
             }
+            
             Text("\(currentDateString) 아침 식사 기준")
                 .font(.system(size: 15))
                 .fontWeight(.regular)
                 .foregroundStyle(.textPlaceholder)
         }
         .padding(.horizontal, 20)
-        .padding(.top, 23)
+        .padding(.top, 24)
     }
 }
 
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/Modifiers/MyButtonStyle.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/Modifiers/MyButtonStyle.swift
@@ -1,13 +1,15 @@
 //
-//  ButtonBackground.swift
+//  MyButtonStyle.swift
 //  Pillyze
 //
 //  Created by 권승용 on 7/13/24.
 //
 
 import SwiftUI
 
-struct ButtonEnabledStyle: ViewModifier {
+struct MyButtonStyle: ViewModifier {
+    var isEnabled: Bool
+    
     func body(content: Content) -> some View {
         content
             .font(.system(size: 18))
@@ -17,14 +19,14 @@ struct ButtonEnabledStyle: ViewModifier {
             .padding(.vertical, 16)
             .background {
                 RoundedRectangle(cornerRadius: 8)
-                    .foregroundStyle(.appPrimary)
+                    .foregroundStyle(isEnabled ? .appPrimary : .appPrimaryDisabled)
             }
     }
 }
 
 extension View {
-    func buttonEnabledStyle() -> some View {
-        modifier(ButtonEnabledStyle())
+    func myButtonStyle(isEnabled: Bool = true) -> some View {
+        modifier(MyButtonStyle(isEnabled: isEnabled))
     }
 }
 
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/Header/Calender.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/Header/Calender.swift
@@ -7,39 +7,50 @@
 
 import SwiftUI
 
-    struct Calender: View {
+struct Calender: View {
     let days = ["월", "화", "수", "목", "금", "토", "일"]
     
     var body: some View {
         VStack(spacing: 12) {
             HStack {
                 Spacer()
                 ForEach(0..<days.count, id: \.self) { index in
-                    Text(days[index])
-                        .font(.system(size: 12))
-                        .fontWeight(.regular)
-                        .foregroundStyle(.white)
-                        .opacity(0.5)
+                    calenderComponent(weekdays: days[index], daysInMonth: index + 10)
                     Spacer()
                 }
             }
             
-            HStack {
-                Spacer()
-                ForEach(0..<days.count, id: \.self) { index in
-                    Text("\(index)")
-                        .font(.system(size: 14))
-                        .fontWeight(.medium)
-                        .foregroundStyle(.white)
-                    Spacer()
-                }
-            }
         }
-        .padding(.vertical, 4)
         .background {
             Color(.appPrimary)
         }
     }
+    
+    @ViewBuilder
+    func calenderComponent(weekdays: String, daysInMonth: Int ) -> some View {
+        VStack(spacing: 12) {
+            Text(weekdays)
+                .font(.system(size: 12))
+                .fontWeight(.regular)
+                .foregroundStyle(weekdays == "월" ? .appPrimary : .white)
+                .opacity(weekdays == "월" ? 1 : 0.5)
+                .frame(width: 24, height: 24)
+                .background {
+                    if weekdays == "월" {
+                        Circle()
+                            .fill(.white)
+                    }
+                }
+            
+            Text("\(daysInMonth)")
+                .font(.system(size: 14))
+                .fontWeight(.bold)
+                .foregroundStyle(.white)
+                .frame(width: 24, height: 24)
+        }
+        .padding(.top, 4)
+        .padding(.bottom, 16)
+    }
 }
 
 #Preview {
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/MyDiets/MyDiets.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/MyDiets/MyDiets.swift
@@ -34,7 +34,7 @@ struct MyDiets: View {
                 isPresented = true
             } label: {
                 Text("내 식단 점수 확인하기")
-                    .buttonEnabledStyle()
+                    .myButtonStyle()
             }
             .fullScreenCover(isPresented: $isPresented) {
                 AddDiet()
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/MyHealth.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/MyHealth/MyHealth.swift
@@ -11,14 +11,14 @@ struct MyHealth: View {
     
     var body: some View {
         ZStack {
-            VStack {
+            VStack(spacing: 0) {
                 Color(.appPrimary)
                 Color(.componentBackground)
             }
             .ignoresSafeArea()
             
             ScrollView {
-                VStack {
+                VStack(spacing: 0) {
                     Spacer()
                         .frame(height: 46)
                     Calender()
diff --git a/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/TabBar/TabBar.swift b/멤버-개발-폴더/권승용/앱구현/2차(필라이즈)/Pillyze/Pillyze/Views/TabBar/TabBar.swift
@@ -44,7 +44,7 @@ struct TabBar: View {
                         Image(.addButton)
                             .resizable()
                             .scaledToFit()
-                            .frame(width: 52, height: 52)
+                            .frame(width: 56, height: 56)
                             .offset(y: -12)
                         
                         Spacer()

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,5 @@ struct FoodListRow: View {`
`36`	`36`
`37`	`37`	`#Preview {`
`38`	`38`	`FoodListRow(food: ModelData().foods.first!, isRankedList: true)`
	`39`	`+ .environment(ModelData())`
`39`	`40`	`}`