Merge pull request #13 from TheClimeet/CIOS-30-CustomCalendarView

Feature/Cios 30/Custom calendar & Tabbar

Climeet-iOS/Climeet-iOS.xcodeproj/project.pbxproj

@@ -19,6 +19,13 @@
 		B94EC22A2BD13CBD00DC3FDB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B94EC2292BD13CBD00DC3FDB /* Assets.xcassets */; };
 		B94EC22D2BD13CBD00DC3FDB /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B94EC22C2BD13CBD00DC3FDB /* Preview Assets.xcassets */; };
 		B94EC2422BD1473E00DC3FDB /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = B94EC2412BD1473E00DC3FDB /* .swiftlint.yml */; };
+		D42357402C1DD6BD0070DB70 /* TabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D423573F2C1DD6BD0070DB70 /* TabView.swift */; };
+		D42357432C1DFD320070DB70 /* CustomTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42357422C1DFD320070DB70 /* CustomTabView.swift */; };
+		D42357462C1DFFBF0070DB70 /* ActivityCalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42357452C1DFFBF0070DB70 /* ActivityCalendarView.swift */; };
+		D42357482C1DFFDF0070DB70 /* ActivityCalendarReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42357472C1DFFDF0070DB70 /* ActivityCalendarReducer.swift */; };
+		D423574E2C1E21260070DB70 /* CalendarDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D423574D2C1E21260070DB70 /* CalendarDate.swift */; };
+		D42357522C1E21DC0070DB70 /* CustomCalendar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42357512C1E21DC0070DB70 /* CustomCalendar.swift */; };
+		D42357542C1FC8910070DB70 /* Date + datesOfMonth.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42357532C1FC8910070DB70 /* Date + datesOfMonth.swift */; };
 		D442A3DE2BF9D36500A58F92 /* SearchAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = D442A3DD2BF9D36500A58F92 /* SearchAPI.swift */; };
 		D442A3E12BF9D3F400A58F92 /* SearchRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D442A3E02BF9D3F400A58F92 /* SearchRequestModel.swift */; };
 		D442A3E62BF9D6C800A58F92 /* SearchRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = D442A3E52BF9D6C800A58F92 /* SearchRepository.swift */; };
@@ -71,6 +78,13 @@
 		B94EC2292BD13CBD00DC3FDB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		B94EC22C2BD13CBD00DC3FDB /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		B94EC2412BD1473E00DC3FDB /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = "<group>"; };
+		D423573F2C1DD6BD0070DB70 /* TabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = "<group>"; };
+		D42357422C1DFD320070DB70 /* CustomTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabView.swift; sourceTree = "<group>"; };
+		D42357452C1DFFBF0070DB70 /* ActivityCalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityCalendarView.swift; sourceTree = "<group>"; };
+		D42357472C1DFFDF0070DB70 /* ActivityCalendarReducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityCalendarReducer.swift; sourceTree = "<group>"; };
+		D423574D2C1E21260070DB70 /* CalendarDate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDate.swift; sourceTree = "<group>"; };
+		D42357512C1E21DC0070DB70 /* CustomCalendar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomCalendar.swift; sourceTree = "<group>"; };
+		D42357532C1FC8910070DB70 /* Date + datesOfMonth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date + datesOfMonth.swift"; sourceTree = "<group>"; };
 		D442A3DD2BF9D36500A58F92 /* SearchAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchAPI.swift; sourceTree = "<group>"; };
 		D442A3E02BF9D3F400A58F92 /* SearchRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRequestModel.swift; sourceTree = "<group>"; };
 		D442A3E52BF9D6C800A58F92 /* SearchRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRepository.swift; sourceTree = "<group>"; };
@@ -176,6 +190,50 @@
 			path = "Preview Content";
 			sourceTree = "<group>";
 		};
+		D423573E2C1DD6A50070DB70 /* Tab */ = {
+			isa = PBXGroup;
+			children = (
+				D423573F2C1DD6BD0070DB70 /* TabView.swift */,
+				D42357412C1DFD230070DB70 /* View */,
+			);
+			path = Tab;
+			sourceTree = "<group>";
+		};
+		D42357412C1DFD230070DB70 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				D42357422C1DFD320070DB70 /* CustomTabView.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		D42357442C1DFF7E0070DB70 /* ActivityCalendar */ = {
+			isa = PBXGroup;
+			children = (
+				D42357452C1DFFBF0070DB70 /* ActivityCalendarView.swift */,
+				D42357472C1DFFDF0070DB70 /* ActivityCalendarReducer.swift */,
+				D423574C2C1E21160070DB70 /* Model */,
+				D42357492C1E0A120070DB70 /* View */,
+			);
+			path = ActivityCalendar;
+			sourceTree = "<group>";
+		};
+		D42357492C1E0A120070DB70 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				D42357512C1E21DC0070DB70 /* CustomCalendar.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		D423574C2C1E21160070DB70 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				D423574D2C1E21260070DB70 /* CalendarDate.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		D442A3DF2BF9D3D900A58F92 /* RequestModel */ = {
 			isa = PBXGroup;
 			children = (
@@ -233,8 +291,10 @@
 		D47A3AA82C0CAC1E0031DCAA /* Presentation */ = {
 			isa = PBXGroup;
 			children = (
-				D44FF2242C183508005E9EB1 /* DateTimePicker */,
+				D423573E2C1DD6A50070DB70 /* Tab */,
+				D42357442C1DFF7E0070DB70 /* ActivityCalendar */,
 				D44FF1F32C14585A005E9EB1 /* ActivityRecord */,
+				D44FF2242C183508005E9EB1 /* DateTimePicker */,
 				D47A3AA92C0CAC2D0031DCAA /* Search */,
 			);
 			path = Presentation;
@@ -343,6 +403,7 @@
 				D4930E302C0F3EE2002E138B /* Text + init.swift */,
 				D47392092C192D7F0059AE45 /* View + onReadSize.swift */,
 				D47392112C198E250059AE45 /* DateFormatter + .swift */,
+				D42357532C1FC8910070DB70 /* Date + datesOfMonth.swift */,
 			);
 			path = Extension;
 			sourceTree = "<group>";
@@ -491,12 +552,14 @@
 				D4EE0D032BD14BAB004C6688 /* Encodable + toDictionary.swift in Sources */,
 				D4B75EEE2C0B3CAA0074870D /* AppError.swift in Sources */,
 				D4F1617A2C1AFE1D00BF4392 /* ActivityRecordHeader.swift in Sources */,
+				D42357402C1DD6BD0070DB70 /* TabView.swift in Sources */,
 				04CFB9EE2C007F4900580395 /* test.swift in Sources */,
 				D47A3AB02C0CAD810031DCAA /* GymSearchResult.swift in Sources */,
 				D47A3AB52C0CAF750031DCAA /* ResponseDTO + mapping.swift in Sources */,
 				D4B75EE92C0B36350074870D /* Logger +.swift in Sources */,
 				D4EE0CFA2BD14AC6004C6688 /* NetworkProvider.swift in Sources */,
 				D442A3E62BF9D6C800A58F92 /* SearchRepository.swift in Sources */,
+				D423574E2C1E21260070DB70 /* CalendarDate.swift in Sources */,
 				D473920A2C192D800059AE45 /* View + onReadSize.swift in Sources */,
 				D4930E312C0F3EE2002E138B /* Text + init.swift in Sources */,
 				D47A3AAD2C0CAC4B0031DCAA /* SearchReducer.swift in Sources */,
@@ -507,18 +570,23 @@
 				D44FF1F52C145872005E9EB1 /* ActivityRecordView.swift in Sources */,
 				D4EE0CFD2BD14AFB004C6688 /* ResponseDTO.swift in Sources */,
 				D4F1617E2C1B1F8B00BF4392 /* ClimbingSetupView.swift in Sources */,
+				D42357432C1DFD320070DB70 /* CustomTabView.swift in Sources */,
 				B94EC2262BD13CBB00DC3FDB /* Climeet_iOSApp.swift in Sources */,
 				D44FF2282C183574005E9EB1 /* DateTimePickerReducer.swift in Sources */,
 				D442A3E12BF9D3F400A58F92 /* SearchRequestModel.swift in Sources */,
 				D4EE0CFF2BD14B59004C6688 /* ExampleAPI.swift in Sources */,
 				D4832BB72C0DD245007731FD /* UserUsecase.swift in Sources */,
+				D42357542C1FC8910070DB70 /* Date + datesOfMonth.swift in Sources */,
 				D47392122C198E250059AE45 /* DateFormatter + .swift in Sources */,
+				D42357462C1DFFBF0070DB70 /* ActivityCalendarView.swift in Sources */,
+				D42357482C1DFFDF0070DB70 /* ActivityCalendarReducer.swift in Sources */,
 				04CFB9EC2C007F3100580395 /* Token.swift in Sources */,
 				D44FF1F72C145E66005E9EB1 /* ActivityRecordReducer.swift in Sources */,
 				D442A3DE2BF9D36500A58F92 /* SearchAPI.swift in Sources */,
 				D4B75EF02C0B3D540074870D /* Error + toAppError.swift in Sources */,
 				D4F161782C1AAB6300BF4392 /* RootSelectionView.swift in Sources */,
 				D47A3AB32C0CAE2D0031DCAA /* SearchUsecase.swift in Sources */,
+				D42357522C1E21DC0070DB70 /* CustomCalendar.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Climeet-iOS/Climeet-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/onevcat/Kingfisher.git",
       "state" : {
-        "revision" : "5b92f029fab2cce44386d28588098b5be0824ef5",
-        "version" : "7.11.0"
+        "revision" : "2ef543ee21d63734e1c004ad6c870255e8716c50",
+        "version" : "7.12.0"
       }
     },
     {

Climeet-iOS/Climeet-iOS.xcodeproj/xcuserdata/kovihouseteam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,22 +3,4 @@
    uuid = "ABF4A7BC-F0C2-461F-80DF-4C114271ECD4"
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1B4EC652-16F8-4611-BAE0-5CE07DC9FBD6"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../../../../../var/folders/lj/lkc9wljn33x5zn6g96b_2h040000gn/T/swift-generated-sources/@__swiftmacro_11Climeet_iOS21ActivityRecordReducer0E0fMe_.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1"
-            endingLineNumber = "1"
-            landmarkName = "unknown"
-            landmarkType = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/Calendar/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/Calendar/calendar_left.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "􀆊@1x-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "􀆊@2x-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "􀆊@3x-1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/Calendar/calendar_right.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "􀆊@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "􀆊@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "􀆊@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_activity.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_activity_notselect.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_home.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_home_notselect.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_mypage.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Climeet-iOS/Climeet-iOS/Assets.xcassets/Icons/ContentTab/content_mypage_notselect.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}