Merge pull request #87 from DeveloperAcademy-POSTECH/feat/#42

Feat: Button 영역 수정

Author: teabag759

MC2-Team3-Pilling.xcodeproj/project.pbxproj

@@ -550,7 +550,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"MC2-Team3-Pilling/Preview Content\"";
-				DEVELOPMENT_TEAM = F5WP2FDW4U;
+				DEVELOPMENT_TEAM = 223UXY9RY6;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -591,7 +591,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"MC2-Team3-Pilling/Preview Content\"";
-				DEVELOPMENT_TEAM = F5WP2FDW4U;
+				DEVELOPMENT_TEAM = 223UXY9RY6;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

MC2-Team3-Pilling.xcodeproj/xcshareddata/xcschemes/MC2-Team3-Pilling.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.7">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

MC2-Team3-Pilling/Extentsion/main+extension.swift

@@ -14,9 +14,9 @@ extension MainView{
         print("today-1:\(sortedDay[today-1].status)")
         if today == 1 && sortedDay[today - 1].status == 0 { // 첫째날 -> 약먹어야함
             statusNum = 1
-        } else if sortedDay[today - 1].status == 0 && sortedDay[today - 2].status == 1 { // 약먹어야함
+        } else if sortedDay[today - 1].status == 0{ // 약먹어야함
             statusNum = 1
-        } else if sortedDay[today - 1].status == 1 && sortedDay[today - 2].status == 0 { // 약먹음 -> 윙크
+        } else if sortedDay[today - 1].status == 1{ // 약먹음 -> 윙크
             statusNum = 6
         }
         else if sortedDay[today - 1].status == 1 { // 약먹음 -> 윙크
@@ -85,12 +85,9 @@ extension MainView{
 
         func makeBody(configuration: Configuration) -> some View {
             configuration.label
-                .padding(.vertical, 25)
-                .frame(maxWidth: .infinity)
                 .background(isDisabled ? .customGray : .customGreen)
-                .clipShape(RoundedRectangle(cornerRadius: 20))
-                .foregroundColor(.black)
                 .opacity(configuration.isPressed ? 0.8 : 1.0)
+                .clipShape(RoundedRectangle(cornerRadius: 20))
         }
     }
 

MC2-Team3-Pilling/View/ChooseStatusView.swift

@@ -145,12 +145,13 @@ struct ChooseStatusView: View {
                 Text("수정")
                     .font(.title3)
                     .bold()
+                    .padding(.vertical, 25)
+                    .frame(maxWidth: .infinity)
+                    .background(.customGreen)
+                    .clipShape(RoundedRectangle(cornerRadius: 20))
+                    .foregroundColor(.black)
             })
-            .padding(.vertical, 25)
-            .frame(maxWidth: .infinity)
-            .background(.customGreen)
-            .clipShape(RoundedRectangle(cornerRadius: 20))
-            .foregroundColor(.black)
+            
 
         }
         .padding(25)

MC2-Team3-Pilling/View/MainView.swift

@@ -212,10 +212,16 @@ struct MainView: View {
                 }, label: {
                     Text("잔디 심기")
                         .largeBold()
+                        .padding(.vertical, 25)
+                        .frame(maxWidth: .infinity)
+                        .foregroundColor(.black)
+                        
+                        
                 })
                 .buttonStyle(CustomButtonStyle(isDisabled: sortedDay[today-1].status != 0))
                 .disabled(sortedDay[today-1].status != 0)
 
+                
             }
             .padding()
             // 알람 시간(type: Date)을 alarmTime에 넘겨주세요

MC2-Team3-Pilling/View/OnboardingFirstView.swift

@@ -112,12 +112,13 @@ struct OnboardingFirstView: View {
                     }, label: {
                         Text("다음으로")
                             .largeBold()
+                            
+                            .foregroundColor(.black)
+                            .padding(.vertical, 25)
+                            .frame(maxWidth: .infinity)
                     })
-                    .padding(.vertical, 25)
-                    .frame(maxWidth: .infinity)
                     .background(selectedPill == nil ? Color.customGray : Color.customGreen)
                     .clipShape(RoundedRectangle(cornerRadius: 20))
-                    .foregroundColor(.black)
                     .padding()
                     .disabled(selectedPill == nil)
                 }