Merge pull request #4 from DO-SOPT-iOS-Part/Feature/#3

3주차 기본과제 구현
DO-SOPT-iOS-Part · Nov 12, 2023 · 8856d25 · 8856d25
2 parents ee825f7 + edc5ec9
commit 8856d25
Show file tree

Hide file tree

Showing 44 changed files with 1,258 additions and 693 deletions.
diff --git a/assignment1/assignment1/Applications/SceneDelegate.swift b/assignment1/assignment1/Applications/SceneDelegate.swift
@@ -18,7 +18,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let windowScene = (scene as? UIWindowScene) else { return }
 
         let window = UIWindow(windowScene: windowScene)
-        window.rootViewController = UINavigationController(rootViewController: WheatherListViewController())
+        window.rootViewController = UINavigationController(rootViewController: WeatherListViewController())
         window.makeKeyAndVisible()
         self.window = window
     }

diff --git a/assignment1/assignment1/Global/Protocols/Protocol.swift b/assignment1/assignment1/Global/Protocols/Protocol.swift
@@ -9,10 +9,7 @@
 
 import Foundation
 
-protocol WeatherInfoViewDelegate: AnyObject {
-    func weatherInfoViewTapped(_ cityListView: CityListView)
-}
 
-protocol BottomAppBarDelegate: AnyObject {
-    func listButtonPressed(_ BottomAppBar: BottomAppBar)
-}
+//protocol BottomAppBarDelegate: AnyObject {
+//    func listButtonPressed(_ BottomAppBar: BottomAppBar)
+//}
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/calendar.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/calendar.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 14.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/calendar.imageset/Frame 14.png b/...nt1/assignment1/Global/Resources/Assets.xcassets/calendar.imageset/Frame 14.png
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar1.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 17.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar1.imageset/Frame 17.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar1.imageset/Frame 17.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar10.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar10.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 26.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...t1/assignment1/Global/Resources/Assets.xcassets/tempBar10.imageset/Frame 26.svg b/...t1/assignment1/Global/Resources/Assets.xcassets/tempBar10.imageset/Frame 26.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar11.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar11.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 27.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...t1/assignment1/Global/Resources/Assets.xcassets/tempBar11.imageset/Frame 27.svg b/...t1/assignment1/Global/Resources/Assets.xcassets/tempBar11.imageset/Frame 27.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar2.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 19.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar2.imageset/Frame 19.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar2.imageset/Frame 19.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar3.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar3.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 20.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar3.imageset/Frame 20.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar3.imageset/Frame 20.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar4.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar4.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 18.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar4.imageset/Frame 18.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar4.imageset/Frame 18.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar5.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar5.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 21.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar5.imageset/Frame 21.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar5.imageset/Frame 21.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar6.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar6.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 22.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar6.imageset/Frame 22.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar6.imageset/Frame 22.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar7.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar7.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 23.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar7.imageset/Frame 23.svg b/...nt1/assignment1/Global/Resources/Assets.xcassets/tempBar7.imageset/Frame 23.svg
diff --git a/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar8.imageset/Contents.json b/assignment1/assignment1/Global/Resources/Assets.xcassets/tempBar8.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 24.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}