Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#43] 캘린더 뷰 #47

Merged
merged 4 commits into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions popo/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ target 'popo' do
# Pods for popo
pod 'SwiftLint'
pod 'Moya', '~> 15.0'
pod 'Kingfisher', '~> 7.0'
end
6 changes: 5 additions & 1 deletion popo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
PODS:
- Alamofire (5.4.4)
- Kingfisher (7.0.0)
- Moya (15.0.0):
- Moya/Core (= 15.0.0)
- Moya/Core (15.0.0):
- Alamofire (~> 5.0)
- SwiftLint (0.42.0)

DEPENDENCIES:
- Kingfisher (~> 7.0)
- Moya (~> 15.0)
- SwiftLint

SPEC REPOS:
trunk:
- Alamofire
- Kingfisher
- Moya
- SwiftLint

SPEC CHECKSUMS:
Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
Kingfisher: 5efc54fec3980f92354898532e562cc17f31efb4
Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee
SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d

PODFILE CHECKSUM: 5797af67ac481a532a89cfd8f9fae200c9347584
PODFILE CHECKSUM: 624d5255892bc85462208d36a7c76920b48d766c

COCOAPODS: 1.10.1
89 changes: 75 additions & 14 deletions popo/popo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,21 @@
562F556E26452218000F8CAB /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 562F556D26452218000F8CAB /* Const.swift */; };
562F557A26452252000F8CAB /* ViewExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 562F557926452252000F8CAB /* ViewExample.swift */; };
562F557D26452408000F8CAB /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = 562F557C26452408000F8CAB /* .swiftlint.yml */; };
565A1F0527056C47000CAB1B /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565A1F0427056C47000CAB1B /* CalendarViewController.swift */; };
565A1F0827056C7E000CAB1B /* Calendar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 565A1F0727056C7E000CAB1B /* Calendar.storyboard */; };
565A1F0B2705EEC8000CAB1B /* LoginMethod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 565A1F0A2705EEC8000CAB1B /* LoginMethod.storyboard */; };
565A1F152706F58F000CAB1B /* CalendarCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565A1F132706F58F000CAB1B /* CalendarCollectionViewCell.swift */; };
565A1F162706F58F000CAB1B /* CalendarCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 565A1F142706F58F000CAB1B /* CalendarCollectionViewCell.xib */; };
565A1F182706FC22000CAB1B /* AppMonth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565A1F172706FC22000CAB1B /* AppMonth.swift */; };
565A1F1B2707073E000CAB1B /* Calendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565A1F1A2707073E000CAB1B /* Calendar.swift */; };
565A1F1D27070768000CAB1B /* Tracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565A1F1C27070768000CAB1B /* Tracker.swift */; };
567840FD265E211300BDBF26 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567840FC265E211300BDBF26 /* UINavigationController+Extension.swift */; };
567BF244265A571300285956 /* CoverCalendar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567BF243265A571300285956 /* CoverCalendar.storyboard */; };
567BF246265A5BBE00285956 /* CoverUserPhoto.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567BF245265A5BBE00285956 /* CoverUserPhoto.storyboard */; };
567BF248265A604100285956 /* CoverCalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567BF247265A604100285956 /* CoverCalendarViewController.swift */; };
567BF24A265A626100285956 /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567BF249265A626100285956 /* Storyboard.swift */; };
567BF24C265A62C000285956 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567BF24B265A62C000285956 /* ViewController.swift */; };
5686FA4E265A728600B7B9D5 /* CoverUserPhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5686FA4D265A728600B7B9D5 /* CoverUserPhotoViewController.swift */; };
56924E07265635DA00745273 /* LoginMethod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56924E06265635DA00745273 /* LoginMethod.storyboard */; };
56924E09265635ED00745273 /* LoginMethodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56924E08265635ED00745273 /* LoginMethodViewController.swift */; };
56924E0B265648EB00745273 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56924E0A265648EB00745273 /* UIView+Extension.swift */; };
56EE71BB265E165B005AC12A /* Concept.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 56EE71BA265E165B005AC12A /* Concept.storyboard */; };
Expand Down Expand Up @@ -70,14 +77,21 @@
562F556D26452218000F8CAB /* Const.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = "<group>"; };
562F557926452252000F8CAB /* ViewExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewExample.swift; sourceTree = "<group>"; };
562F557C26452408000F8CAB /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = "<group>"; };
565A1F0427056C47000CAB1B /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = "<group>"; };
565A1F0727056C7E000CAB1B /* Calendar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Calendar.storyboard; sourceTree = "<group>"; };
565A1F0A2705EEC8000CAB1B /* LoginMethod.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LoginMethod.storyboard; sourceTree = "<group>"; };
565A1F132706F58F000CAB1B /* CalendarCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarCollectionViewCell.swift; sourceTree = "<group>"; };
565A1F142706F58F000CAB1B /* CalendarCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CalendarCollectionViewCell.xib; sourceTree = "<group>"; };
565A1F172706FC22000CAB1B /* AppMonth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMonth.swift; sourceTree = "<group>"; };
565A1F1A2707073E000CAB1B /* Calendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Calendar.swift; sourceTree = "<group>"; };
565A1F1C27070768000CAB1B /* Tracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tracker.swift; sourceTree = "<group>"; };
567840FC265E211300BDBF26 /* UINavigationController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Extension.swift"; sourceTree = "<group>"; };
567BF243265A571300285956 /* CoverCalendar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CoverCalendar.storyboard; sourceTree = "<group>"; };
567BF245265A5BBE00285956 /* CoverUserPhoto.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CoverUserPhoto.storyboard; sourceTree = "<group>"; };
567BF247265A604100285956 /* CoverCalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverCalendarViewController.swift; sourceTree = "<group>"; };
567BF249265A626100285956 /* Storyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
567BF24B265A62C000285956 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
5686FA4D265A728600B7B9D5 /* CoverUserPhotoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverUserPhotoViewController.swift; sourceTree = "<group>"; };
56924E06265635DA00745273 /* LoginMethod.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LoginMethod.storyboard; sourceTree = "<group>"; };
56924E08265635ED00745273 /* LoginMethodViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMethodViewController.swift; sourceTree = "<group>"; };
56924E0A265648EB00745273 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
56EE71BA265E165B005AC12A /* Concept.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Concept.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -182,6 +196,7 @@
children = (
F873648926A6A61300F121DC /* Login */,
F873648826A6A60A00F121DC /* Onboarding */,
565A1F0327056C2F000CAB1B /* Calendar */,
F8967D8126F9F66A00F034E3 /* PopoConcept */,
);
path = ViewController;
Expand All @@ -200,6 +215,7 @@
children = (
F8967D9026FA01C400F034E3 /* PopoConcept */,
F873648726A6A60100F121DC /* Onboarding */,
565A1F122706F577000CAB1B /* Calendar */,
);
path = Cell;
sourceTree = "<group>";
Expand All @@ -218,6 +234,7 @@
isa = PBXGroup;
children = (
F873648C26A6A92900F121DC /* Onboarding */,
565A1F172706FC22000CAB1B /* AppMonth.swift */,
);
path = AppModel;
sourceTree = "<group>";
Expand All @@ -228,6 +245,7 @@
F881A74126FC588400AEE21E /* NetworkResult.swift */,
F881A73F26FC50B200AEE21E /* GenericResponse.swift */,
F881A73C26FC18E100AEE21E /* PopoConcept */,
565A1F1927070730000CAB1B /* Calendar */,
);
path = APIModel;
sourceTree = "<group>";
Expand Down Expand Up @@ -256,11 +274,12 @@
562F5569264521ED000F8CAB /* Storyboard */ = {
isa = PBXGroup;
children = (
F8967D8626F9F6B000F034E3 /* Login */,
F88491BF26B2DF28007590E9 /* Onboarding */,
F8967D8726F9F6B500F034E3 /* PopoConcept */,
562F555726452103000F8CAB /* LaunchScreen.storyboard */,
562F555226452101000F8CAB /* Main.storyboard */,
565A1F092705EEC8000CAB1B /* Login */,
F88491BF26B2DF28007590E9 /* Onboarding */,
565A1F0627056C6C000CAB1B /* Calendar */,
F8967D8726F9F6B500F034E3 /* PopoConcept */,
);
path = Storyboard;
sourceTree = "<group>";
Expand All @@ -277,6 +296,48 @@
path = Constant;
sourceTree = "<group>";
};
565A1F0327056C2F000CAB1B /* Calendar */ = {
isa = PBXGroup;
children = (
565A1F0427056C47000CAB1B /* CalendarViewController.swift */,
);
path = Calendar;
sourceTree = "<group>";
};
565A1F0627056C6C000CAB1B /* Calendar */ = {
isa = PBXGroup;
children = (
565A1F0727056C7E000CAB1B /* Calendar.storyboard */,
);
path = Calendar;
sourceTree = "<group>";
};
565A1F092705EEC8000CAB1B /* Login */ = {
isa = PBXGroup;
children = (
565A1F0A2705EEC8000CAB1B /* LoginMethod.storyboard */,
);
path = Login;
sourceTree = "<group>";
};
565A1F122706F577000CAB1B /* Calendar */ = {
isa = PBXGroup;
children = (
565A1F142706F58F000CAB1B /* CalendarCollectionViewCell.xib */,
565A1F132706F58F000CAB1B /* CalendarCollectionViewCell.swift */,
);
path = Calendar;
sourceTree = "<group>";
};
565A1F1927070730000CAB1B /* Calendar */ = {
isa = PBXGroup;
children = (
565A1F1A2707073E000CAB1B /* Calendar.swift */,
565A1F1C27070768000CAB1B /* Tracker.swift */,
);
path = Calendar;
sourceTree = "<group>";
};
8FD1E6BDEB079F1C802D413D /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -372,14 +433,6 @@
path = PopoConcept;
sourceTree = "<group>";
};
F8967D8626F9F6B000F034E3 /* Login */ = {
isa = PBXGroup;
children = (
56924E06265635DA00745273 /* LoginMethod.storyboard */,
);
path = Login;
sourceTree = "<group>";
};
F8967D8726F9F6B500F034E3 /* PopoConcept */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -462,14 +515,16 @@
562F557D26452408000F8CAB /* .swiftlint.yml in Resources */,
562F555926452103000F8CAB /* LaunchScreen.storyboard in Resources */,
F8731B02265BE4B400770760 /* Onboarding.storyboard in Resources */,
565A1F0827056C7E000CAB1B /* Calendar.storyboard in Resources */,
562F556C26452208000F8CAB /* Colors.xcassets in Resources */,
F8967D9426FA01F300F034E3 /* CategoryCell.xib in Resources */,
F8967D9626FA090500F034E3 /* Category.storyboard in Resources */,
565A1F162706F58F000CAB1B /* CalendarCollectionViewCell.xib in Resources */,
F8731B0C265C01A800770760 /* ConceptSelect.storyboard in Resources */,
565A1F0B2705EEC8000CAB1B /* LoginMethod.storyboard in Resources */,
F8C284DC265CCD2300B41054 /* CoverColor.storyboard in Resources */,
F8731B10265C05E900770760 /* ConceptSelectCell.xib in Resources */,
F873648626A6A5E500F121DC /* OnboardingCell.xib in Resources */,
56924E07265635DA00745273 /* LoginMethod.storyboard in Resources */,
562F555626452103000F8CAB /* Assets.xcassets in Resources */,
F8C284E0265CD4DE00B41054 /* CoverGradient.storyboard in Resources */,
567BF244265A571300285956 /* CoverCalendar.storyboard in Resources */,
Expand Down Expand Up @@ -545,6 +600,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
565A1F182706FC22000CAB1B /* AppMonth.swift in Sources */,
565A1F0527056C47000CAB1B /* CalendarViewController.swift in Sources */,
F881A74026FC50B200AEE21E /* GenericResponse.swift in Sources */,
567BF24C265A62C000285956 /* ViewController.swift in Sources */,
56EE71BD265E18BA005AC12A /* ConceptViewController.swift in Sources */,
Expand All @@ -555,6 +612,7 @@
F816E65D26FC631F000C0270 /* FetchPopoListAPI.swift in Sources */,
562F557A26452252000F8CAB /* ViewExample.swift in Sources */,
F84AA56C27057633008D77ED /* Xib.swift in Sources */,
565A1F1D27070768000CAB1B /* Tracker.swift in Sources */,
F816E66026FC6441000C0270 /* TempAPI.swift in Sources */,
562F556E26452218000F8CAB /* Const.swift in Sources */,
F873648B26A6A92600F121DC /* OnboardingDescriptionModel.swift in Sources */,
Expand All @@ -570,10 +628,13 @@
562F554D26452101000F8CAB /* AppDelegate.swift in Sources */,
F8731B0A265C019200770760 /* ConceptSelectViewController.swift in Sources */,
F881A74226FC588400AEE21E /* NetworkResult.swift in Sources */,
565A1F1B2707073E000CAB1B /* Calendar.swift in Sources */,
567BF24A265A626100285956 /* Storyboard.swift in Sources */,
567840FD265E211300BDBF26 /* UINavigationController+Extension.swift in Sources */,
F873648526A6A5E500F121DC /* OnboardingCell.swift in Sources */,
562F554F26452101000F8CAB /* SceneDelegate.swift in Sources */,
565A1F152706F58F000CAB1B /* CalendarCollectionViewCell.swift in Sources */,
565A1F0227056B9F000CAB1B /* AppDate.swift in Sources */,
5686FA4E265A728600B7B9D5 /* CoverUserPhotoViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.949",
"green" : "0.949",
"red" : "0.949"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.949",
"green" : "0.949",
"red" : "0.949"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
1 change: 1 addition & 0 deletions popo/popo/Resources/Constant/Storyboard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ extension Const {
static let onboarding = "Onboarding"
static let conceptSelect = "ConceptSelect"
static let category = "Category"
static let calendar = "Calendar"
}

}
Expand Down
1 change: 1 addition & 0 deletions popo/popo/Resources/Constant/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ extension Const {
static let onboarding = "OnboardingViewController"
static let conseptSelect = "ConceptSelectViewController"
static let category = "CategoryViewController"
static let calendar = "CalendarViewController"
}

}
Expand Down
1 change: 1 addition & 0 deletions popo/popo/Resources/Constant/Xib.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ extension Const {
static let CategoryCell = "CategoryCell"
static let OnboardingCell = "OnboardingCell"
static let ConceptSelectCell = "ConceptSelectCell"
static let calendarCollectionViewCell = "CalendarCollectionViewCell"
}
}
Loading