[#5] 기본 탭에서 '하는 중' 구현하기

hiddenparts · hiddenparts · commit b64eaf3504b9 · 2023-11-12T17:50:28.000+09:00
diff --git a/Todo.xcodeproj/project.pbxproj b/Todo.xcodeproj/project.pbxproj
@@ -20,6 +20,7 @@
 		6FDD59D42B00ACBE00D7148D /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6FDD59D02B00ACBE00D7148D /* Pretendard-SemiBold.otf */; };
 		6FDD59D72B00AF9600D7148D /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FDD59D62B00AF9600D7148D /* Font.swift */; };
 		6FDD59D92B00B12900D7148D /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FDD59D82B00B12900D7148D /* Color.swift */; };
+		6FDD59DD2B00BE3E00D7148D /* TaskListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FDD59DC2B00BE3E00D7148D /* TaskListItemView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -38,6 +39,7 @@
 		6FDD59D52B00ADEC00D7148D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		6FDD59D62B00AF9600D7148D /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
 		6FDD59D82B00B12900D7148D /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
+		6FDD59DC2B00BE3E00D7148D /* TaskListItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskListItemView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -92,9 +94,8 @@
 		6FDD59C42B009FE700D7148D /* View */ = {
 			isa = PBXGroup;
 			children = (
-				6FDD59C52B009FF600D7148D /* MainView.swift */,
-				6FDD59C72B00A00600D7148D /* FavoriteView.swift */,
-				6FDD59C92B00A0D400D7148D /* TaskEmptyView.swift */,
+				6FDD59DA2B00BE0100D7148D /* Main */,
+				6FDD59DB2B00BE0900D7148D /* Favorite */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -120,6 +121,24 @@
 			path = fonts;
 			sourceTree = "<group>";
 		};
+		6FDD59DA2B00BE0100D7148D /* Main */ = {
+			isa = PBXGroup;
+			children = (
+				6FDD59C52B009FF600D7148D /* MainView.swift */,
+				6FDD59C92B00A0D400D7148D /* TaskEmptyView.swift */,
+				6FDD59DC2B00BE3E00D7148D /* TaskListItemView.swift */,
+			);
+			path = Main;
+			sourceTree = "<group>";
+		};
+		6FDD59DB2B00BE0900D7148D /* Favorite */ = {
+			isa = PBXGroup;
+			children = (
+				6FDD59C72B00A00600D7148D /* FavoriteView.swift */,
+			);
+			path = Favorite;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -196,6 +215,7 @@
 			files = (
 				6FDD59C82B00A00600D7148D /* FavoriteView.swift in Sources */,
 				6FDD59B92B009E9E00D7148D /* ContentView.swift in Sources */,
+				6FDD59DD2B00BE3E00D7148D /* TaskListItemView.swift in Sources */,
 				6FDD59D92B00B12900D7148D /* Color.swift in Sources */,
 				6FDD59D72B00AF9600D7148D /* Font.swift in Sources */,
 				6FDD59C62B009FF600D7148D /* MainView.swift in Sources */,
diff --git a/Todo/Assets.xcassets/ic_notyet.imageset/Contents.json b/Todo/Assets.xcassets/ic_notyet.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_notyet.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Todo/Assets.xcassets/ic_notyet.imageset/ic_notyet.svg b/Todo/Assets.xcassets/ic_notyet.imageset/ic_notyet.svg
@@ -0,0 +1,5 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_notyet">
+<rect id="Rectangle 6438" x="6.4" y="6.4" width="17.2" height="17.2" fill="white" stroke="black" stroke-width="0.8"/>
+</g>
+</svg>
diff --git a/Todo/Assets.xcassets/ic_notyet_fill.imageset/Contents.json b/Todo/Assets.xcassets/ic_notyet_fill.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_notyet_fill.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Todo/Assets.xcassets/ic_notyet_fill.imageset/ic_notyet_fill.svg b/Todo/Assets.xcassets/ic_notyet_fill.imageset/ic_notyet_fill.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="ic_notyet">
+<rect id="Rectangle 6438" x="6.4" y="6.4" width="17.2" height="17.2" fill="#FF3434" stroke="black" stroke-width="0.8"/>
+<path id="Vector 4" d="M10 15L14.5 19L20 10" stroke="white" stroke-width="2"/>
+</g>
+</svg>
diff --git a/Todo/Assets.xcassets/ic_tap_star_fill.imageset/Contents.json b/Todo/Assets.xcassets/ic_tap_star_fill.imageset/Contents.json
@@ -17,5 +17,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/Todo/TodoApp.swift b/Todo/TodoApp.swift
@@ -12,13 +12,6 @@ struct TodoApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
-                .onAppear {
-                    getFpont()
-                }
         }
     }
-    
-    func getFpont() {
-        UIFont.familyNames.forEach{ print($0); UIFont.fontNames(forFamilyName: $0).forEach{ print("  ", $0) } }
-    }
 }
diff --git a/Todo/View/Favorite/FavoriteView.swift b/Todo/View/Favorite/FavoriteView.swift
diff --git a/Todo/View/Main/MainView.swift b/Todo/View/Main/MainView.swift
@@ -12,7 +12,8 @@ struct MainView: View {
         NavigationStack {
             List {
                 Section {
-                    TaskEmptyView()
+//                    TaskEmptyView()
+                    TaskListItemView()
                 } header: {
                     Text("하는 중")
                 }
diff --git a/Todo/View/Main/TaskEmptyView.swift b/Todo/View/Main/TaskEmptyView.swift
diff --git a/Todo/View/Main/TaskListItemView.swift b/Todo/View/Main/TaskListItemView.swift
@@ -0,0 +1,45 @@
+//
+//  TaskListItemView.swift
+//  Todo
+//
+//  Created by 상선 on 11/12/23.
+//
+
+import SwiftUI
+
+struct TaskListItemView: View {
+    
+    @State private var isDone: Bool = false
+    @State private var isFavorite: Bool = false
+    
+    var body: some View {
+        HStack {
+            Button {
+                isDone.toggle()
+            } label: {
+                Image(isDone ? "ic_notyet_fill" : "ic_notyet")
+                    .resizable()
+                    .frame(width: 30, height: 30)
+            }
+            
+            Text("Todo 아이템")
+                .font(.Todo.r16)
+                .lineLimit(1)
+            
+            Spacer()
+            
+            Button {
+                isFavorite.toggle()
+            } label: {
+                Image(isFavorite ? "ic_tap_star_fill" : "ic_tap_star")
+                    .foregroundStyle(isFavorite ? Color.Todo.red : Color.Todo.black)
+            }
+            
+        }
+        .buttonStyle(.borderless) // 리스트에서 아이템을 탭했을때 모든 버튼들이 이벤트를 동시에 받는 것을 방지
+    }
+}
+
+#Preview {
+    TaskListItemView()
+}

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,8 @@`
`17`	`17`	`"info" : {`
`18`	`18`	`"author" : "xcode",`
`19`	`19`	`"version" : 1`
	`20`	`+ },`
	`21`	`+ "properties" : {`
	`22`	`+ "template-rendering-intent" : "template"`
`20`	`23`	`}`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,6 @@ struct TodoApp: App {`
`12`	`12`	`var body: some Scene {`
`13`	`13`	`WindowGroup {`
`14`	`14`	`ContentView()`
`15`		`- .onAppear {`
`16`		`- getFpont()`
`17`		`- }`
`18`	`15`	`}`
`19`	`16`	`}`
`20`		`-`
`21`		`- func getFpont() {`
`22`		`- UIFont.familyNames.forEach{ print($0); UIFont.fontNames(forFamilyName: $0).forEach{ print(" ", $0) } }`
`23`		`- }`
`24`	`17`	`}`