Skip to content

Commit

Permalink
Merge pull request #12 from GO-SOPT-iOS-Part/week3_plus
Browse files Browse the repository at this point in the history
3주차 심화과제
  • Loading branch information
alpha-kwhn authored May 10, 2023
2 parents b08fff2 + 895f40a commit c0085cf
Show file tree
Hide file tree
Showing 47 changed files with 1,117 additions and 69 deletions.
98 changes: 93 additions & 5 deletions Sopt_Seminar/Sopt_Seminar.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@
F4BE7E272A069A4000688732 /* WeatherViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E232A069A4000688732 /* WeatherViewController.swift */; };
F4BE7E282A069A4000688732 /* Config_w.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E242A069A4000688732 /* Config_w.swift */; };
F4BE7E292A069A4000688732 /* WeatherService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E252A069A4000688732 /* WeatherService.swift */; };
F4BE7E2C2A09386900688732 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E2B2A09386900688732 /* UserInfo.swift */; };
F4BE7E2F2A09537400688732 /* LogOut.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E2E2A09537400688732 /* LogOut.swift */; };
F4BE7E322A095B0A00688732 /* SegmentControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E312A095B0A00688732 /* SegmentControl.swift */; };
F4BE7E352A09629B00688732 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E342A09629B00688732 /* HomeViewController.swift */; };
F4BE7E372A0962F500688732 /* RealTimeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E362A0962F500688732 /* RealTimeViewController.swift */; };
F4BE7E392A09820500688732 /* TVViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E382A09820500688732 /* TVViewController.swift */; };
F4BE7E3B2A09820C00688732 /* MovieViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E3A2A09820C00688732 /* MovieViewController.swift */; };
F4BE7E3D2A09821500688732 /* ParamountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E3C2A09821500688732 /* ParamountViewController.swift */; };
F4BE7E402A0A68D300688732 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E3F2A0A68D300688732 /* PageViewController.swift */; };
F4BE7E452A0A923600688732 /* PosterCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E442A0A923600688732 /* PosterCollectionViewCell.swift */; };
F4BE7E4D2A0AC10600688732 /* MovieCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E4C2A0AC10600688732 /* MovieCollectionViewCell.swift */; };
F4BE7E4F2A0AC12200688732 /* MovieTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4BE7E4E2A0AC12200688732 /* MovieTableViewCell.swift */; };
F4DDC4A82A03FA8600E97D1A /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DDC4A72A03FA8600E97D1A /* ProfileView.swift */; };
F4E1E88F2A0233390040AEF7 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E1E88E2A0233390040AEF7 /* MainViewController.swift */; };
F4E1E8912A023A0E0040AEF7 /* MyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E1E8902A023A0E0040AEF7 /* MyPageViewController.swift */; };
Expand Down Expand Up @@ -114,6 +126,18 @@
F4BE7E232A069A4000688732 /* WeatherViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeatherViewController.swift; sourceTree = "<group>"; };
F4BE7E242A069A4000688732 /* Config_w.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config_w.swift; sourceTree = "<group>"; };
F4BE7E252A069A4000688732 /* WeatherService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeatherService.swift; sourceTree = "<group>"; };
F4BE7E2B2A09386900688732 /* UserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfo.swift; sourceTree = "<group>"; };
F4BE7E2E2A09537400688732 /* LogOut.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogOut.swift; sourceTree = "<group>"; };
F4BE7E312A095B0A00688732 /* SegmentControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentControl.swift; sourceTree = "<group>"; };
F4BE7E342A09629B00688732 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
F4BE7E362A0962F500688732 /* RealTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealTimeViewController.swift; sourceTree = "<group>"; };
F4BE7E382A09820500688732 /* TVViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TVViewController.swift; sourceTree = "<group>"; };
F4BE7E3A2A09820C00688732 /* MovieViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieViewController.swift; sourceTree = "<group>"; };
F4BE7E3C2A09821500688732 /* ParamountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamountViewController.swift; sourceTree = "<group>"; };
F4BE7E3F2A0A68D300688732 /* PageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = "<group>"; };
F4BE7E442A0A923600688732 /* PosterCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PosterCollectionViewCell.swift; sourceTree = "<group>"; };
F4BE7E4C2A0AC10600688732 /* MovieCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieCollectionViewCell.swift; sourceTree = "<group>"; };
F4BE7E4E2A0AC12200688732 /* MovieTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieTableViewCell.swift; sourceTree = "<group>"; };
F4DDC4A72A03FA8600E97D1A /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
F4E1E88E2A0233390040AEF7 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
F4E1E8902A023A0E0040AEF7 /* MyPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -198,11 +222,11 @@
F4289C5029EE639F0045BEC8 /* Assignment */ = {
isa = PBXGroup;
children = (
F4E1E88E2A0233390040AEF7 /* MainViewController.swift */,
F4BE7E2D2A09535D00688732 /* Protocols */,
F4BE7E302A095A6F00688732 /* MainViewController */,
F4DDC4A42A03D1CC00E97D1A /* MyPage */,
F4DDC4A32A03D1B900E97D1A /* Login */,
F4F7863129EFB641002E2A61 /* Extensions */,
F49FCF4529F6CE22001DD6AD /* SheetView */,
);
path = Assignment;
sourceTree = "<group>";
Expand Down Expand Up @@ -285,7 +309,7 @@
path = SheetView;
sourceTree = "<group>";
};
F4B5F9312A04AB5A008DA7B7 /* SubViews */ = {
F4B5F9312A04AB5A008DA7B7 /* Cells */ = {
isa = PBXGroup;
children = (
F4B5F93A2A04FFFD008DA7B7 /* StackViewCell.swift */,
Expand All @@ -297,7 +321,7 @@
F4B5F93F2A051491008DA7B7 /* AnotherTableViewCell.swift */,
F4B5F9412A052D83008DA7B7 /* LogOutButtonView.swift */,
);
path = SubViews;
path = Cells;
sourceTree = "<group>";
};
F4BE7DE22A0618A900688732 /* Week4 */ = {
Expand Down Expand Up @@ -330,9 +354,61 @@
path = WeatherNetwork;
sourceTree = "<group>";
};
F4BE7E2D2A09535D00688732 /* Protocols */ = {
isa = PBXGroup;
children = (
F4BE7E2B2A09386900688732 /* UserInfo.swift */,
F4BE7E2E2A09537400688732 /* LogOut.swift */,
);
path = Protocols;
sourceTree = "<group>";
};
F4BE7E302A095A6F00688732 /* MainViewController */ = {
isa = PBXGroup;
children = (
F4BE7E332A09628500688732 /* SubViews */,
F4E1E88E2A0233390040AEF7 /* MainViewController.swift */,
F4BE7E312A095B0A00688732 /* SegmentControl.swift */,
);
path = MainViewController;
sourceTree = "<group>";
};
F4BE7E332A09628500688732 /* SubViews */ = {
isa = PBXGroup;
children = (
F4BE7E3E2A0A670800688732 /* HomeView */,
F4BE7E362A0962F500688732 /* RealTimeViewController.swift */,
F4BE7E382A09820500688732 /* TVViewController.swift */,
F4BE7E3A2A09820C00688732 /* MovieViewController.swift */,
F4BE7E3C2A09821500688732 /* ParamountViewController.swift */,
);
path = SubViews;
sourceTree = "<group>";
};
F4BE7E3E2A0A670800688732 /* HomeView */ = {
isa = PBXGroup;
children = (
F4BE7E4B2A0ABC2800688732 /* Cells */,
F4BE7E342A09629B00688732 /* HomeViewController.swift */,
);
path = HomeView;
sourceTree = "<group>";
};
F4BE7E4B2A0ABC2800688732 /* Cells */ = {
isa = PBXGroup;
children = (
F4BE7E3F2A0A68D300688732 /* PageViewController.swift */,
F4BE7E442A0A923600688732 /* PosterCollectionViewCell.swift */,
F4BE7E4C2A0AC10600688732 /* MovieCollectionViewCell.swift */,
F4BE7E4E2A0AC12200688732 /* MovieTableViewCell.swift */,
);
path = Cells;
sourceTree = "<group>";
};
F4DDC4A32A03D1B900E97D1A /* Login */ = {
isa = PBXGroup;
children = (
F49FCF4529F6CE22001DD6AD /* SheetView */,
F4289C5129EE70A60045BEC8 /* LogInViewController.swift */,
F4F7863829F118E3002E2A61 /* LoginSuccessViewController.swift */,
);
Expand All @@ -342,7 +418,7 @@
F4DDC4A42A03D1CC00E97D1A /* MyPage */ = {
isa = PBXGroup;
children = (
F4B5F9312A04AB5A008DA7B7 /* SubViews */,
F4B5F9312A04AB5A008DA7B7 /* Cells */,
F4E1E8902A023A0E0040AEF7 /* MyPageViewController.swift */,
F4B5F92D2A04A823008DA7B7 /* PurchaseViewController.swift */,
);
Expand Down Expand Up @@ -444,14 +520,18 @@
files = (
F44B4E3329D7FA29003658CD /* ViewController.swift in Sources */,
F4F7863329EFB652002E2A61 /* UIButton+.swift in Sources */,
F4BE7E4F2A0AC12200688732 /* MovieTableViewCell.swift in Sources */,
F4BE7DE72A06240400688732 /* Config.swift in Sources */,
F4BE7E3B2A09820C00688732 /* MovieViewController.swift in Sources */,
F4289C5229EE70A60045BEC8 /* LogInViewController.swift in Sources */,
F4BE7E272A069A4000688732 /* WeatherViewController.swift in Sources */,
F4064F8E29E14988006BB626 /* SecondViewController_Ex1.swift in Sources */,
F4064F7629E134BF006BB626 /* SecondViewController_DelegatePtn.swift in Sources */,
F4064F7F29E1387D006BB626 /* SecondViewController_Closure.swift in Sources */,
F4BE7E2C2A09386900688732 /* UserInfo.swift in Sources */,
F4DDC4A82A03FA8600E97D1A /* ProfileView.swift in Sources */,
F470034E29F26AF80034E787 /* NicknameViewController.swift in Sources */,
F4BE7E452A0A923600688732 /* PosterCollectionViewCell.swift in Sources */,
F4B5F9282A0414D9008DA7B7 /* CashTicketView.swift in Sources */,
F4E1E88F2A0233390040AEF7 /* MainViewController.swift in Sources */,
F470037B29F3A7AC0034E787 /* CommonView.swift in Sources */,
Expand All @@ -461,11 +541,13 @@
F49F47AA2A00BE25006379C7 /* CarrotViewController.swift in Sources */,
F4BE7DEB2A06291500688732 /* SignUpService.swift in Sources */,
F4064F7429E1340D006BB626 /* FirstViewController_DelegatePtn.swift in Sources */,
F4BE7E2F2A09537400688732 /* LogOut.swift in Sources */,
F4F7863729F10F94002E2A61 /* String+.swift in Sources */,
F470037F29F3ABCC0034E787 /* BaseViewController.swift in Sources */,
F44B4E2F29D7FA29003658CD /* AppDelegate.swift in Sources */,
F4BE7DE92A06283200688732 /* NetworkResult<T>.swift in Sources */,
F470038A29F3B6DB0034E787 /* UIView + Extension.swift in Sources */,
F4BE7E3D2A09821500688732 /* ParamountViewController.swift in Sources */,
F44B4E4529D80FC6003658CD /* PracticeViewController2.swift in Sources */,
F4B5F92A2A04944C008DA7B7 /* ADView.swift in Sources */,
F470039529F3C0470034E787 /* Photo.swift in Sources */,
Expand All @@ -475,18 +557,24 @@
F470039729F3C0FF0034E787 /* PhotoCell.swift in Sources */,
F4BE7E292A069A4000688732 /* WeatherService.swift in Sources */,
F4F7863B29F12B72002E2A61 /* UIImage+.swift in Sources */,
F4BE7E322A095B0A00688732 /* SegmentControl.swift in Sources */,
F4BE7DED2A062C3800688732 /* NetworkViewController.swift in Sources */,
F470038129F3ACCC0034E787 /* BaseView.swift in Sources */,
F470038E29F3B8460034E787 /* UIImage + Extension.swift in Sources */,
F49FCF4229F6BBE0001DD6AD /* SheetViewController.swift in Sources */,
F4BE7E4D2A0AC10600688732 /* MovieCollectionViewCell.swift in Sources */,
F4BE7E352A09629B00688732 /* HomeViewController.swift in Sources */,
F470039029F3BD600034E787 /* NSObject+.swift in Sources */,
F4BE7E392A09820500688732 /* TVViewController.swift in Sources */,
F4BE7E282A069A4000688732 /* Config_w.swift in Sources */,
F4B5F93E2A0508C5008DA7B7 /* DividerView.swift in Sources */,
F470038829F3B2C00034E787 /* CarrotTableViewCell.swift in Sources */,
F470037D29F3A8EF0034E787 /* SecondViewController.swift in Sources */,
F4E1E8912A023A0E0040AEF7 /* MyPageViewController.swift in Sources */,
F4064F8C29E1485C006BB626 /* FirstViewController_Ex1.swift in Sources */,
F4BE7E402A0A68D300688732 /* PageViewController.swift in Sources */,
F4B5F93B2A04FFFD008DA7B7 /* StackViewCell.swift in Sources */,
F4BE7E372A0962F500688732 /* RealTimeViewController.swift in Sources */,
F4B5F92E2A04A823008DA7B7 /* PurchaseViewController.swift in Sources */,
F4F7863929F118E3002E2A61 /* LoginSuccessViewController.swift in Sources */,
F4B5F9402A051491008DA7B7 /* AnotherTableViewCell.swift in Sources */,
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "logo_tving.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "movie1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "movie2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "movie3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "poster1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "poster2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Sopt_Seminar/Sopt_Seminar/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

// 3.
// 뷰 사이의 계층구조를 탐색하게 해주는 스택 형태의 Container ViewController
let navigationController = UINavigationController(rootViewController: WeatherViewController())
let navigationController = UINavigationController(rootViewController: MainViewController())
self.window?.rootViewController = navigationController
// 4.
self.window?.makeKeyAndVisible()
Expand Down
Loading

0 comments on commit c0085cf

Please sign in to comment.