Skip to content

Commit

Permalink
[Merge] #211 - conflict 해결 및 머지
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeongdung-eo
jeongdung-eo committed Jan 8, 2024
2 parents 460acc7 + f7eb506 commit df46bf7
Show file tree
Hide file tree
Showing 61 changed files with 1,560 additions and 708 deletions.
40 changes: 36 additions & 4 deletions iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
0943A9F92A53239200614761 /* Bundle+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0943A9F82A53239200614761 /* Bundle+.swift */; };
09582B4829BDA7F600EF3207 /* DetailStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B4729BDA7F600EF3207 /* DetailStackView.swift */; };
09582B4B29BDE37C00EF3207 /* DetailFooterReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B4A29BDE37C00EF3207 /* DetailFooterReusableView.swift */; };
09582B4D29BE277800EF3207 /* DetailHeaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B4C29BE277800EF3207 /* DetailHeaderReusableView.swift */; };
09582B4D29BE277800EF3207 /* DetailHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B4C29BE277800EF3207 /* DetailHeaderView.swift */; };
09582B4F29BEBAFA00EF3207 /* DetailCalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B4E29BEBAFA00EF3207 /* DetailCalendarViewController.swift */; };
09582B5129C0BC3600EF3207 /* DetailAchievementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09582B5029C0BC3600EF3207 /* DetailAchievementViewController.swift */; };
0960C0D42A38BC6500A3D8DB /* KeychainUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0960C0D32A38BC6500A3D8DB /* KeychainUtil.swift */; };
0960C0D62A38BC8100A3D8DB /* DefaultKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0960C0D52A38BC8100A3D8DB /* DefaultKeys.swift */; };
0964BA4A2B0F6BFB00A8984B /* AuthInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0964BA492B0F6BFB00A8984B /* AuthInterceptor.swift */; };
097568362A2FEF630001EC46 /* String+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097568352A2FEF3F0001EC46 /* String+.swift */; };
097C003629AB8270008CAEF3 /* MissionListCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097C003529AB8270008CAEF3 /* MissionListCollectionViewCell.swift */; };
0982DE5429ADCCE000D933D2 /* HomeEmptyCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0982DE5329ADCCE000D933D2 /* HomeEmptyCollectionViewCell.swift */; };
Expand All @@ -45,6 +46,7 @@
09A1465F2A192C4900DDC308 /* WeekMissionResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A1465E2A192C4900DDC308 /* WeekMissionResponseDTO.swift */; };
09A146652A1964B500DDC308 /* AddAnotherDayResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A146642A19649A00DDC308 /* AddAnotherDayResponseDTO.swift */; };
09C8602D2AB14B4800C4F4B1 /* FSCalendar in Frameworks */ = {isa = PBXBuildFile; productRef = 09C8602C2AB14B4800C4F4B1 /* FSCalendar */; };
09CF56042B09F23800526C8C /* HomeDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CF56032B09F23800526C8C /* HomeDataSource.swift */; };
09DCCD1F2A18ED76003DCF8A /* DailyMissionResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DCCD1E2A18ED76003DCF8A /* DailyMissionResponseDTO.swift */; };
09DCCD212A18EF43003DCF8A /* HomeSevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DCCD202A18EF43003DCF8A /* HomeSevice.swift */; };
09DCCD232A18EFB0003DCF8A /* HomeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DCCD222A18EFB0003DCF8A /* HomeAPI.swift */; };
Expand Down Expand Up @@ -73,6 +75,8 @@
3B027AA2299C355800BEB65C /* AchievementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B027AA1299C355800BEB65C /* AchievementViewController.swift */; };
3B027AA4299C357000BEB65C /* MyInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B027AA3299C357000BEB65C /* MyInfoViewController.swift */; };
3B027AAC299C35E500BEB65C /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3B027AAB299C35E500BEB65C /* Colors.xcassets */; };
3B03D0D62B0F15AA00302872 /* NotificationDialogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B03D0D52B0F15AA00302872 /* NotificationDialogViewController.swift */; };
3B03D0D82B0F5EF300302872 /* CGSize+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B03D0D72B0F5EF300302872 /* CGSize+.swift */; };
3B0CBA222A45FC170004F2DB /* UpdateMissionResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B0CBA212A45FC170004F2DB /* UpdateMissionResponseDTO.swift */; };
3B0CBA242A461B1C0004F2DB /* RecentMissionResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B0CBA232A461B1C0004F2DB /* RecentMissionResponseDTO.swift */; };
3B11740D2A4B574B0033DDF3 /* CALayer+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B11740C2A4B574B0033DDF3 /* CALayer+.swift */; };
Expand Down Expand Up @@ -184,11 +188,12 @@
0943A9F82A53239200614761 /* Bundle+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+.swift"; sourceTree = "<group>"; };
09582B4729BDA7F600EF3207 /* DetailStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailStackView.swift; sourceTree = "<group>"; };
09582B4A29BDE37C00EF3207 /* DetailFooterReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailFooterReusableView.swift; sourceTree = "<group>"; };
09582B4C29BE277800EF3207 /* DetailHeaderReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailHeaderReusableView.swift; sourceTree = "<group>"; };
09582B4C29BE277800EF3207 /* DetailHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailHeaderView.swift; sourceTree = "<group>"; };
09582B4E29BEBAFA00EF3207 /* DetailCalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailCalendarViewController.swift; sourceTree = "<group>"; };
09582B5029C0BC3600EF3207 /* DetailAchievementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailAchievementViewController.swift; sourceTree = "<group>"; };
0960C0D32A38BC6500A3D8DB /* KeychainUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainUtil.swift; sourceTree = "<group>"; };
0960C0D52A38BC8100A3D8DB /* DefaultKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultKeys.swift; sourceTree = "<group>"; };
0964BA492B0F6BFB00A8984B /* AuthInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthInterceptor.swift; sourceTree = "<group>"; };
097568352A2FEF3F0001EC46 /* String+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+.swift"; sourceTree = "<group>"; };
097C003529AB8270008CAEF3 /* MissionListCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MissionListCollectionViewCell.swift; sourceTree = "<group>"; };
0982DE5329ADCCE000D933D2 /* HomeEmptyCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeEmptyCollectionViewCell.swift; sourceTree = "<group>"; };
Expand All @@ -203,6 +208,7 @@
099FC98829B3233D005B37E6 /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
09A1465E2A192C4900DDC308 /* WeekMissionResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekMissionResponseDTO.swift; sourceTree = "<group>"; };
09A146642A19649A00DDC308 /* AddAnotherDayResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAnotherDayResponseDTO.swift; sourceTree = "<group>"; };
09CF56032B09F23800526C8C /* HomeDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeDataSource.swift; sourceTree = "<group>"; };
09DCCD1E2A18ED76003DCF8A /* DailyMissionResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyMissionResponseDTO.swift; sourceTree = "<group>"; };
09DCCD202A18EF43003DCF8A /* HomeSevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeSevice.swift; sourceTree = "<group>"; };
09DCCD222A18EFB0003DCF8A /* HomeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeAPI.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -233,6 +239,8 @@
3B027AA1299C355800BEB65C /* AchievementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AchievementViewController.swift; sourceTree = "<group>"; };
3B027AA3299C357000BEB65C /* MyInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyInfoViewController.swift; sourceTree = "<group>"; };
3B027AAB299C35E500BEB65C /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
3B03D0D52B0F15AA00302872 /* NotificationDialogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationDialogViewController.swift; sourceTree = "<group>"; };
3B03D0D72B0F5EF300302872 /* CGSize+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGSize+.swift"; sourceTree = "<group>"; };
3B0CBA212A45FC170004F2DB /* UpdateMissionResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateMissionResponseDTO.swift; sourceTree = "<group>"; };
3B0CBA232A461B1C0004F2DB /* RecentMissionResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentMissionResponseDTO.swift; sourceTree = "<group>"; };
3B11740C2A4B574B0033DDF3 /* CALayer+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -453,6 +461,7 @@
isa = PBXGroup;
children = (
3B027A9D299C34DA00BEB65C /* HomeViewController.swift */,
09CF56032B09F23800526C8C /* HomeDataSource.swift */,
092C09B42A484DD900E9B06B /* HomeDeleteViewController.swift */,
0930DE6129B80550007958DE /* MissionDetailViewController.swift */,
09582B4E29BEBAFA00EF3207 /* DetailCalendarViewController.swift */,
Expand All @@ -467,7 +476,7 @@
097C003529AB8270008CAEF3 /* MissionListCollectionViewCell.swift */,
092E04B029BD9C86008A5892 /* MissionDetailCollectionViewCell.swift */,
09582B4A29BDE37C00EF3207 /* DetailFooterReusableView.swift */,
09582B4C29BE277800EF3207 /* DetailHeaderReusableView.swift */,
09582B4C29BE277800EF3207 /* DetailHeaderView.swift */,
);
path = Cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -654,6 +663,7 @@
097568352A2FEF3F0001EC46 /* String+.swift */,
3B11740C2A4B574B0033DDF3 /* CALayer+.swift */,
0943A9F82A53239200614761 /* Bundle+.swift */,
3B03D0D72B0F5EF300302872 /* CGSize+.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -682,6 +692,7 @@
3B027A97299C343D00BEB65C /* Presentation */ = {
isa = PBXGroup;
children = (
3B03D0D32B0F157700302872 /* NotificatoinDialog */,
09F6717E29CAD68100708725 /* Onboarding */,
3B027A9B299C348800BEB65C /* Achievement */,
3B027A9C299C349A00BEB65C /* AddMission */,
Expand Down Expand Up @@ -805,6 +816,22 @@
path = Assets;
sourceTree = "<group>";
};
3B03D0D32B0F157700302872 /* NotificatoinDialog */ = {
isa = PBXGroup;
children = (
3B03D0D42B0F159100302872 /* ViewControllers */,
);
path = NotificatoinDialog;
sourceTree = "<group>";
};
3B03D0D42B0F159100302872 /* ViewControllers */ = {
isa = PBXGroup;
children = (
3B03D0D52B0F15AA00302872 /* NotificationDialogViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
};
3B3C89DB29C0EF6A00B1D56D /* Models */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1042,6 +1069,7 @@
isa = PBXGroup;
children = (
6CF4705A29A68EA9008D145C /* URLConstant.swift */,
0964BA492B0F6BFB00A8984B /* AuthInterceptor.swift */,
6CF4705C29A68F5C008D145C /* NetworkLoggerPlugin.swift */,
6CF4705E29A69025008D145C /* GeneralResponse.swift */,
6CF4706029A69096008D145C /* NetworkConstant.swift */,
Expand Down Expand Up @@ -1241,6 +1269,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3B03D0D62B0F15AA00302872 /* NotificationDialogViewController.swift in Sources */,
09F6719729CC81B500708725 /* DetailAchievementCollectionViewCell.swift in Sources */,
0960C0D62A38BC8100A3D8DB /* DefaultKeys.swift in Sources */,
3B14A14129A6FDA900F92897 /* UILabel+.swift in Sources */,
Expand Down Expand Up @@ -1279,6 +1308,7 @@
09022D4629C44BC300DE6E49 /* MissionCalendarCell.swift in Sources */,
6CA2083A2A195906001C4247 /* AuthResponseDTO.swift in Sources */,
09582B4B29BDE37C00EF3207 /* DetailFooterReusableView.swift in Sources */,
09CF56042B09F23800526C8C /* HomeDataSource.swift in Sources */,
093DB03F2A15FCC100ECA5F6 /* MissionDetailResponseDTO.swift in Sources */,
6CF4705B29A68EA9008D145C /* URLConstant.swift in Sources */,
3BD3B5C829B8F82C00D3575B /* AddMissionTextFieldView.swift in Sources */,
Expand All @@ -1296,6 +1326,7 @@
098BFD5F29B7AECF008E80F9 /* MyInfoHeaderCollectionReusableView.swift in Sources */,
3B482FA7299EB8FD00BCF424 /* UIViewController+.swift in Sources */,
0960C0D42A38BC6500A3D8DB /* KeychainUtil.swift in Sources */,
3B03D0D82B0F5EF300302872 /* CGSize+.swift in Sources */,
6CA208302A1925EE001C4247 /* RecommendActionResponseDTO.swift in Sources */,
09F6718629CB26E400708725 /* OnboardingHeaderView.swift in Sources */,
3B11740D2A4B574B0033DDF3 /* CALayer+.swift in Sources */,
Expand All @@ -1310,6 +1341,7 @@
09582B4829BDA7F600EF3207 /* DetailStackView.swift in Sources */,
09F6718429CADB1100708725 /* OnboardingModel.swift in Sources */,
3B027A7A299C31B500BEB65C /* SceneDelegate.swift in Sources */,
0964BA4A2B0F6BFB00A8984B /* AuthInterceptor.swift in Sources */,
09582B5129C0BC3600EF3207 /* DetailAchievementViewController.swift in Sources */,
0982DE5829AE40FB00D933D2 /* UITabBar+.swift in Sources */,
3BC1A27929C9BE6C0088376B /* AddMissionFooterCollectionReusableView.swift in Sources */,
Expand All @@ -1330,7 +1362,7 @@
3BBB6C8F2A1E7BEA00B8745A /* CollectionViewLeftAlignLayout.swift in Sources */,
09A1465F2A192C4900DDC308 /* WeekMissionResponseDTO.swift in Sources */,
0930D37329B4FCAE0000C4AE /* StatisticsView.swift in Sources */,
09582B4D29BE277800EF3207 /* DetailHeaderReusableView.swift in Sources */,
09582B4D29BE277800EF3207 /* DetailHeaderView.swift in Sources */,
6CF4706A29A71D71008D145C /* Strings.swift in Sources */,
6CF4705F29A69025008D145C /* GeneralResponse.swift in Sources */,
097C003629AB8270008CAEF3 /* MissionListCollectionViewCell.swift in Sources */,
Expand Down
Loading

0 comments on commit df46bf7

Please sign in to comment.