diff --git a/.gitignore b/.gitignore index f5087ca..3bcb53c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,7 @@ xcuserdata/ # you should judge for yourself, the pros and cons are mentioned at: # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -# Pods/ +Pods/ # # Add this line if you want to avoid checking in source code from the Xcode workspace # *.xcworkspace @@ -111,7 +111,7 @@ playground.xcworkspace # you should judge for yourself, the pros and cons are mentioned at: # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -# Pods/ +Pods/ # # Add this line if you want to avoid checking in source code from the Xcode workspace # *.xcworkspace diff --git a/Bodabi/Bodabi.xcodeproj/project.pbxproj b/Bodabi/Bodabi.xcodeproj/project.pbxproj index b921363..7024eb9 100644 --- a/Bodabi/Bodabi.xcodeproj/project.pbxproj +++ b/Bodabi/Bodabi.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4910CCA922043EB4004BDBF1 /* CalendarViewStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4910CCA822043EB4004BDBF1 /* CalendarViewStyle.swift */; }; 491B1C4E221BF86B00ECB66F /* String+PhoneFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491B1C4D221BF86B00ECB66F /* String+PhoneFormat.swift */; }; 491DD81E221505340093720A /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491DD81D221505340093720A /* Tag.swift */; }; 491DD820221532290093720A /* UIView+Shadow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491DD81F221532290093720A /* UIView+Shadow.swift */; }; @@ -26,13 +25,7 @@ 496683BB21FAB2A9003FBA5B /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 496683BA21FAB2A9003FBA5B /* UIView+Extensions.swift */; }; 496683C021FAC662003FBA5B /* HomeTitleViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 496683BE21FAC662003FBA5B /* HomeTitleViewCell.swift */; }; 496683C121FAC662003FBA5B /* HomeTitleViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 496683BF21FAC662003FBA5B /* HomeTitleViewCell.xib */; }; - 4967D66022028D0300223ADF /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4967D65F22028D0300223ADF /* CalendarView.swift */; }; 4967D6622202C1B000223ADF /* UIView+ParentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4967D6612202C1B000223ADF /* UIView+ParentViewController.swift */; }; - 4967D6642202C31300223ADF /* CalendarMonthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4967D6632202C31300223ADF /* CalendarMonthViewController.swift */; }; - 4967D6672202C64700223ADF /* CalendarWeekDayViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4967D6652202C64700223ADF /* CalendarWeekDayViewCell.swift */; }; - 4967D6682202C64700223ADF /* CalendarWeekDayViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4967D6662202C64700223ADF /* CalendarWeekDayViewCell.xib */; }; - 4967D66B2202C65500223ADF /* CalendarDayViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4967D6692202C65500223ADF /* CalendarDayViewCell.swift */; }; - 4967D66C2202C65500223ADF /* CalendarDayViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4967D66A2202C65500223ADF /* CalendarDayViewCell.xib */; }; 4969A58E221A789900E189BD /* ContactManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4969A58D221A789900E189BD /* ContactManager.swift */; }; 4976CFC8221BA17400745422 /* SettingContactsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4976CFC7221BA17400745422 /* SettingContactsViewController.swift */; }; 497882572217BFCB00ED64A7 /* UIImage+Resize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 497882562217BFCB00ED64A7 /* UIImage+Resize.swift */; }; @@ -67,6 +60,7 @@ 49C86BF4221E406100D63455 /* Error+Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C86BF3221E406100D63455 /* Error+Alert.swift */; }; 49C86BF8221E483500D63455 /* Error+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C86BF7221E483500D63455 /* Error+Description.swift */; }; 49C86BFA221E48FF00D63455 /* TabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C86BF9221E48FF00D63455 /* TabBar.swift */; }; + 677E0A886E0E487A07EA1309 /* Pods_Bodabi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F15131D3CDC0CAE8A5A081FC /* Pods_Bodabi.framework */; }; DB147035220D4363000EA1D7 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB147034220D4363000EA1D7 /* CloudKit.framework */; }; DB147037220D4707000EA1D7 /* CloudManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB147036220D4707000EA1D7 /* CloudManager.swift */; }; DB2725FE2209720A00F30CBC /* ThanksFriendHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB2725FD2209720A00F30CBC /* ThanksFriendHeaderView.swift */; }; @@ -139,7 +133,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 4910CCA822043EB4004BDBF1 /* CalendarViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewStyle.swift; sourceTree = ""; }; 491B1C4D221BF86B00ECB66F /* String+PhoneFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+PhoneFormat.swift"; sourceTree = ""; }; 491DD81D221505340093720A /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = ""; }; 491DD81F221532290093720A /* UIView+Shadow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Shadow.swift"; sourceTree = ""; }; @@ -158,13 +151,7 @@ 496683BA21FAB2A9003FBA5B /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = ""; }; 496683BE21FAC662003FBA5B /* HomeTitleViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HomeTitleViewCell.swift; path = Bodabi/Views/Home/HomeTitleViewCell.swift; sourceTree = SOURCE_ROOT; }; 496683BF21FAC662003FBA5B /* HomeTitleViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = HomeTitleViewCell.xib; path = Bodabi/Views/Home/HomeTitleViewCell.xib; sourceTree = SOURCE_ROOT; }; - 4967D65F22028D0300223ADF /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = ""; }; 4967D6612202C1B000223ADF /* UIView+ParentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+ParentViewController.swift"; sourceTree = ""; }; - 4967D6632202C31300223ADF /* CalendarMonthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarMonthViewController.swift; sourceTree = ""; }; - 4967D6652202C64700223ADF /* CalendarWeekDayViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarWeekDayViewCell.swift; sourceTree = ""; }; - 4967D6662202C64700223ADF /* CalendarWeekDayViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CalendarWeekDayViewCell.xib; sourceTree = ""; }; - 4967D6692202C65500223ADF /* CalendarDayViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDayViewCell.swift; sourceTree = ""; }; - 4967D66A2202C65500223ADF /* CalendarDayViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CalendarDayViewCell.xib; sourceTree = ""; }; 4969A58D221A789900E189BD /* ContactManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactManager.swift; sourceTree = ""; }; 4976CFC7221BA17400745422 /* SettingContactsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingContactsViewController.swift; sourceTree = ""; }; 497882562217BFCB00ED64A7 /* UIImage+Resize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Resize.swift"; sourceTree = ""; }; @@ -201,6 +188,8 @@ 49C86BF3221E406100D63455 /* Error+Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Error+Alert.swift"; sourceTree = ""; }; 49C86BF7221E483500D63455 /* Error+Description.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Error+Description.swift"; sourceTree = ""; }; 49C86BF9221E48FF00D63455 /* TabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBar.swift; sourceTree = ""; }; + 597DA7EDEDA1B01D39C403D4 /* Pods-Bodabi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bodabi.release.xcconfig"; path = "Pods/Target Support Files/Pods-Bodabi/Pods-Bodabi.release.xcconfig"; sourceTree = ""; }; + 72A9492D3D430C6079B84526 /* Pods-Bodabi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Bodabi.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Bodabi/Pods-Bodabi.debug.xcconfig"; sourceTree = ""; }; DB147032220D426A000EA1D7 /* Bodabi.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Bodabi.entitlements; sourceTree = ""; }; DB147034220D4363000EA1D7 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; }; DB147036220D4707000EA1D7 /* CloudManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudManager.swift; sourceTree = ""; }; @@ -236,6 +225,7 @@ DBF4CF3B21FC546B001536A8 /* HolidayInputViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HolidayInputViewCell.swift; sourceTree = ""; }; DBF4CF4321FCE4F7001536A8 /* UIButton+Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Animation.swift"; sourceTree = ""; }; DBF4CF4521FCE511001536A8 /* NSMutableAttributedString+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+Extension.swift"; sourceTree = ""; }; + F15131D3CDC0CAE8A5A081FC /* Pods_Bodabi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Bodabi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F80C289F22026F0D0032DE3E /* FriendHistoryInformationViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendHistoryInformationViewCell.swift; sourceTree = ""; }; F80C28A022026F0D0032DE3E /* FriendHistoryInformationViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FriendHistoryInformationViewCell.xib; sourceTree = ""; }; F80C28A52202C82B0032DE3E /* FriendHistorySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendHistorySection.swift; sourceTree = ""; }; @@ -279,6 +269,7 @@ buildActionMask = 2147483647; files = ( DB147035220D4363000EA1D7 /* CloudKit.framework in Frameworks */, + 677E0A886E0E487A07EA1309 /* Pods_Bodabi.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -296,26 +287,13 @@ path = Tag; sourceTree = ""; }; - 4967D65E22028C4600223ADF /* Calendar */ = { - isa = PBXGroup; - children = ( - 4967D65F22028D0300223ADF /* CalendarView.swift */, - 4910CCA822043EB4004BDBF1 /* CalendarViewStyle.swift */, - 4967D6632202C31300223ADF /* CalendarMonthViewController.swift */, - 4967D6662202C64700223ADF /* CalendarWeekDayViewCell.xib */, - 4967D6652202C64700223ADF /* CalendarWeekDayViewCell.swift */, - 4967D66A2202C65500223ADF /* CalendarDayViewCell.xib */, - 4967D6692202C65500223ADF /* CalendarDayViewCell.swift */, - ); - path = Calendar; - sourceTree = ""; - }; 4998126121F9D7B4000DB7B2 = { isa = PBXGroup; children = ( 4998126C21F9D7B4000DB7B2 /* Bodabi */, 4998126B21F9D7B4000DB7B2 /* Products */, DB147033220D4363000EA1D7 /* Frameworks */, + 6D60CAB8950D73BB7BB8FB18 /* Pods */, ); sourceTree = ""; }; @@ -380,7 +358,6 @@ DBF4CF0421FB0B2F001536A8 /* Notification */, DBF4CF0321FB0B2D001536A8 /* Setting */, 49484CFF221405FE00C09384 /* Tag */, - 4967D65E22028C4600223ADF /* Calendar */, ); path = Views; sourceTree = ""; @@ -447,10 +424,20 @@ path = Extensions; sourceTree = ""; }; + 6D60CAB8950D73BB7BB8FB18 /* Pods */ = { + isa = PBXGroup; + children = ( + 72A9492D3D430C6079B84526 /* Pods-Bodabi.debug.xcconfig */, + 597DA7EDEDA1B01D39C403D4 /* Pods-Bodabi.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; DB147033220D4363000EA1D7 /* Frameworks */ = { isa = PBXGroup; children = ( DB147034220D4363000EA1D7 /* CloudKit.framework */, + F15131D3CDC0CAE8A5A081FC /* Pods_Bodabi.framework */, ); name = Frameworks; sourceTree = ""; @@ -638,9 +625,11 @@ isa = PBXNativeTarget; buildConfigurationList = 4998127F21F9D7B6000DB7B2 /* Build configuration list for PBXNativeTarget "Bodabi" */; buildPhases = ( + 9766B39676AA6E31E4E1B6F1 /* [CP] Check Pods Manifest.lock */, 4998126621F9D7B4000DB7B2 /* Sources */, 4998126721F9D7B4000DB7B2 /* Frameworks */, 4998126821F9D7B4000DB7B2 /* Resources */, + C9D8AFE8D97BB5FF352E18A7 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -718,9 +707,7 @@ 4998127321F9D7B4000DB7B2 /* Main.storyboard in Resources */, 4998128A21F9D97E000DB7B2 /* Home.storyboard in Resources */, F8748909221E463C0087CFD1 /* FriendHistoryReceiveViewCell.xib in Resources */, - 4967D6682202C64700223ADF /* CalendarWeekDayViewCell.xib in Resources */, F81452A021FCDDE0004A2CF0 /* NotificationViewCell.xib in Resources */, - 4967D66C2202C65500223ADF /* CalendarDayViewCell.xib in Resources */, 49484CF82212D70400C09384 /* FriendsIndexViewCell.xib in Resources */, F814529821FCCF6B004A2CF0 /* SettingViewCell.xib in Resources */, 4998128E21F9D994000DB7B2 /* Notification.storyboard in Resources */, @@ -732,6 +719,53 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 9766B39676AA6E31E4E1B6F1 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Bodabi-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C9D8AFE8D97BB5FF352E18A7 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Bodabi/Pods-Bodabi-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/SIUNCalendarView/SIUNCalendarView.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SIUNCalendarView.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Bodabi/Pods-Bodabi-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 4998126621F9D7B4000DB7B2 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -739,7 +773,6 @@ files = ( DBF4CEFE21FAE59B001536A8 /* UIViewController+Alert.swift in Sources */, F81452A421FD8C1B004A2CF0 /* String+Extensions.swift in Sources */, - 4967D66B2202C65500223ADF /* CalendarDayViewCell.swift in Sources */, DB38739D21FEDB0200ADF0CB /* HolidayViewController.swift in Sources */, 49C0851321FD979A0060B02C /* FriendViewCell.swift in Sources */, DB3873A121FEEF0D00ADF0CB /* ThanksFriendViewCell.swift in Sources */, @@ -755,8 +788,6 @@ 491B1C4E221BF86B00ECB66F /* String+PhoneFormat.swift in Sources */, 49C86BF4221E406100D63455 /* Error+Alert.swift in Sources */, 49484D012214060E00C09384 /* TagViewController.swift in Sources */, - 4910CCA922043EB4004BDBF1 /* CalendarViewStyle.swift in Sources */, - 4967D6642202C31300223ADF /* CalendarMonthViewController.swift in Sources */, DB47A57F221D4F9D002A2081 /* BaseViewController.swift in Sources */, DBF4CF3621FC5418001536A8 /* NameInputViewController.swift in Sources */, F82BE261221130D000C194F1 /* Event+Extensions.swift in Sources */, @@ -768,7 +799,6 @@ 496683B921FAB294003FBA5B /* UIColor+Extensions.swift in Sources */, F89ED960221294F2006588E1 /* NotificationSchedular.swift in Sources */, 49C0850721FAF2810060B02C /* UpcomingEventViewCell.swift in Sources */, - 4967D66022028D0300223ADF /* CalendarView.swift in Sources */, 49C86BF8221E483500D63455 /* Error+Description.swift in Sources */, 4998126E21F9D7B4000DB7B2 /* AppDelegate.swift in Sources */, 49C084F121FAD36D0060B02C /* MyHolidaysViewCell.swift in Sources */, @@ -818,7 +848,6 @@ F8197BAF221F983300984C8B /* DefaultHolidayType.swift in Sources */, F8485CF921FA176B003C935C /* FriendHistoryViewController.swift in Sources */, 4967D6622202C1B000223ADF /* UIView+ParentViewController.swift in Sources */, - 4967D6672202C64700223ADF /* CalendarWeekDayViewCell.swift in Sources */, DBF4CF3421FC5405001536A8 /* HolidayInputViewController.swift in Sources */, DB3873C722001BBC00ADF0CB /* Date+ToString.swift in Sources */, DBF4CF4621FCE511001536A8 /* NSMutableAttributedString+Extension.swift in Sources */, @@ -911,7 +940,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -966,7 +995,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -978,6 +1007,7 @@ }; 4998128021F9D7B6000DB7B2 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 72A9492D3D430C6079B84526 /* Pods-Bodabi.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Bodabi/Supporting Files/Bodabi.entitlements"; @@ -998,6 +1028,7 @@ }; 4998128121F9D7B6000DB7B2 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 597DA7EDEDA1B01D39C403D4 /* Pods-Bodabi.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Bodabi/Supporting Files/Bodabi.entitlements"; diff --git a/Bodabi/Bodabi.xcodeproj/xcshareddata/xcschemes/Bodabi.xcscheme b/Bodabi/Bodabi.xcodeproj/xcshareddata/xcschemes/Bodabi.xcscheme new file mode 100644 index 0000000..ff3b470 --- /dev/null +++ b/Bodabi/Bodabi.xcodeproj/xcshareddata/xcschemes/Bodabi.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bodabi/Bodabi.xcworkspace/contents.xcworkspacedata b/Bodabi/Bodabi.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..aca5a2c --- /dev/null +++ b/Bodabi/Bodabi.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Bodabi/Bodabi.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Bodabi/Bodabi.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Bodabi/Bodabi.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Bodabi/Bodabi/Models/DefaultHolidayType.swift b/Bodabi/Bodabi/Models/DefaultHolidayType.swift index 7684448..16453e9 100644 --- a/Bodabi/Bodabi/Models/DefaultHolidayType.swift +++ b/Bodabi/Bodabi/Models/DefaultHolidayType.swift @@ -17,8 +17,9 @@ enum DefaultHolidayType: CaseIterable { case enterance case graduation case babyBorn + case etcAnniversary - var holidayImage: UIImage? { + var holidayImage: UIImage { switch self { case .wedding: return #imageLiteral(resourceName: "wedding") case .birthday: return #imageLiteral(resourceName: "birthday") @@ -49,6 +50,7 @@ enum DefaultHolidayType: CaseIterable { case .enterance: return "입학" case .graduation: return "졸업" case .babyBorn: return "출산" + default: return "기타 기념일" } } @@ -61,15 +63,17 @@ enum DefaultHolidayType: CaseIterable { case .enterance: return #colorLiteral(red: 0.8807150722, green: 0.3545673192, blue: 0.4221659899, alpha: 1) case .graduation: return #colorLiteral(red: 0.8719369769, green: 0.6207509637, blue: 0.6524723172, alpha: 1) case .babyBorn: return #colorLiteral(red: 0.5707006454, green: 0.6276458502, blue: 0.7518854737, alpha: 1) + default: return #colorLiteral(red: 0.961987555, green: 0.7720394135, blue: 0.4948675036, alpha: 1) } } - static func parse(with holiday: String) -> DefaultHolidayType? { + static func parse(with holiday: String?) -> DefaultHolidayType { + guard let holiday = holiday else { return DefaultHolidayType.etcAnniversary } for type in DefaultHolidayType.allCases { if holiday.contains(search: type.title) { return type } } - return nil + return DefaultHolidayType.etcAnniversary } } diff --git a/Bodabi/Bodabi/Services/InputService/InputManager.swift b/Bodabi/Bodabi/Services/InputService/InputManager.swift index cfd93b9..e3667b1 100644 --- a/Bodabi/Bodabi/Services/InputService/InputManager.swift +++ b/Bodabi/Bodabi/Services/InputService/InputManager.swift @@ -30,14 +30,6 @@ struct InputManager { } static func write(context: NSManagedObjectContext, entryRoute: EntryRoute, data: InputData) { - // FIXME: - Data dummy image - let imageOfHoliday: [(holiday: String, image: UIImage)] = [ - (holiday: "생일", image: #imageLiteral(resourceName: "birthday")), - (holiday: "출산", image: #imageLiteral(resourceName: "babyborn")), - (holiday: "결혼", image: #imageLiteral(resourceName: "wedding")), - (holiday: "장례", image: #imageLiteral(resourceName: "funeral")) - ] - switch entryRoute { case .addHolidayAtHome: let holiday: Holiday = Holiday(context: context) @@ -48,14 +40,9 @@ struct InputManager { holiday.date = data.date holiday.createdDate = Date() - imageOfHoliday.forEach { - if holiday.title?.contains($0.holiday) ?? true { - guard let image = $0.image - .resize(scale: 0.1)?.jpegData(compressionQuality: 1.0) else { return } - holiday.image = image - return - } - } + holiday.image = DefaultHolidayType.parse(with: holiday.title).holidayImage + .resize(scale: 0.1)?.jpegData(compressionQuality: 1.0) + case .addUpcomingEventAtHome: let event: Event = Event(context: context) let friend = getFriend(context: context, data: data) diff --git a/Bodabi/Bodabi/Supporting Files/Info.plist b/Bodabi/Bodabi/Supporting Files/Info.plist index 3ded4cb..d0ca8a4 100644 --- a/Bodabi/Bodabi/Supporting Files/Info.plist +++ b/Bodabi/Bodabi/Supporting Files/Info.plist @@ -26,7 +26,7 @@ CFBundleVersion - 4 + 6 LSApplicationQueriesSchemes fb @@ -36,7 +36,9 @@ NSCameraUsageDescription 경조사 대표 이미지를 촬영할 수 있습니다. NSContactsUsageDescription - 사용자의 연락처에 접근하여 보다비에 친구를 추가할 수 있습니다. 선물을 주고 받은 친구를 손쉽게 추가해보세요. + 사용자의 연락처를 받아서 빠르게 경조사 내역을 추가합니다. 또한 연락처를 통해 같은 이름의 친구를 식별할 수 있습니다. +연락처 정보는 외부에 공개되지 않으며 개인공간에만 저장됩니다. 권한 설정은 설정탭을 통하여 나중에 다시 설정할 수 있습니다. +(설정>개인정보처리방침 확인 가능) NSPhotoLibraryUsageDescription 경조사 대표 이미지를 바꿀 수 있습니다. UILaunchStoryboardName diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.swift b/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.swift deleted file mode 100644 index 034ae7e..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.swift +++ /dev/null @@ -1,70 +0,0 @@ - -// -// CalendarDayViewCell.swift -// Bodabi -// -// Created by 이혜진 on 2019. 1. 31.. -// Copyright © 2019년 LeeHyeJin. All rights reserved. -// - -import UIKit - -class CalendarDayViewCell: UICollectionViewCell { - - // MARK: - IBOutlet - - @IBOutlet weak var dayLabel: UILabel! - @IBOutlet weak var eventView: UIView! - - // MARK: - Property - - public var style: CalendarViewStyle = .init() - public var date: Date? = .init() { - didSet { - dayLabel.textColor = date?.toString(of: .year) == Date().toString(of: .year) ? - style.todayColor : style.dayColor - } - } - public var day: Int = 0 { - didSet { - dayLabel.text = String(format: "%d", day) - } - } - public var events: [Int] = [] { - didSet { - eventView.isHidden = !(events.count > 0) - eventView.backgroundColor = style.eventColor - } - } - - override var isSelected: Bool { - willSet { - backgroundColor = newValue ? style.selectedColor : .clear - } - } - - override func awakeFromNib() { - super.awakeFromNib() - - setUpUI() - } - - override func prepareForReuse() { - super.prepareForReuse() - - backgroundColor = .clear - } - - private func setUpUI() { - eventView.isHidden = true - } - - // MARK: - Configure - - public func configure(daysOfMonth: ClosedRange) { - isHidden = !(daysOfMonth ~= day) - - guard style.selectedType == .round else { return } - makeRound(with: .widthRound) - } -} diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.xib b/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.xib deleted file mode 100644 index c95c884..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarDayViewCell.xib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarMonthViewController.swift b/Bodabi/Bodabi/Views/Calendar/CalendarMonthViewController.swift deleted file mode 100644 index d0a7417..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarMonthViewController.swift +++ /dev/null @@ -1,228 +0,0 @@ -// -// CalendarMonthViewController.swift -// Bodabi -// -// Created by 이혜진 on 2019. 1. 31.. -// Copyright © 2019년 LeeHyeJin. All rights reserved. -// - -import UIKit - -class CalendarMonthViewController: UICollectionViewController { - - // MARK: - Property - - public lazy var calendar: Calendar = { - var gregorian = Calendar(identifier: .gregorian) - gregorian.timeZone = .current - return gregorian - }() - - public weak var delegate: CalendarViewDelegate? - public var isVisible: Bool = true { - didSet { - collectionView.visibleCells.enumerated() - .forEach { [weak self] (index, cell) in - self?.collectionView.deselectItem( - at: IndexPath(item: index, section: Section.day.rawValue), - animated: false - ) - cell.isSelected = false - } - } - } - - public var style: CalendarViewStyle = .init() - public var superFrame: CGRect = .init() { - didSet { - setUpUI() - } - } - - private var selectDay: Int? - public var visibleMonthFirstDay: Date? { - didSet { - guard let visibleMonthFirstDay = visibleMonthFirstDay else { return } - visibleMonthInfo = getMonthInfo(for: visibleMonthFirstDay) - } - } - private var visibleMonthInfo: (firstDay: Int, daysTotal: Int)? - - - enum Section: Int, CaseIterable { - case week - case day - } - - // MARK: - Life cycle - - override func viewDidLoad() { - super.viewDidLoad() - - setUpUI() - initCollectionView() - } - - // MARK: - Initialization - - init() { - super.init(collectionViewLayout: UICollectionViewFlowLayout()) - setUpUI() - } - - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - private func setUpUI() { - view.translatesAutoresizingMaskIntoConstraints = false - view.frame = superFrame - - collectionView.translatesAutoresizingMaskIntoConstraints = false - collectionView.backgroundColor = .clear - - /* Collection View */ - let layout = UICollectionViewFlowLayout() - layout.scrollDirection = .vertical - layout.sectionInset = UIEdgeInsets.zero - layout.minimumLineSpacing = 0 - layout.minimumInteritemSpacing = 0 - - collectionView.collectionViewLayout = layout - collectionView.allowsMultipleSelection = false - collectionView.showsVerticalScrollIndicator = false - collectionView.showsHorizontalScrollIndicator = false - collectionView.frame = superFrame - } - - private func initCollectionView() { - let cells = [CalendarWeekDayViewCell.self, CalendarDayViewCell.self] - collectionView?.register(cells) - } - - // MAKR: - Method - - private func cellSize(in bounds: CGRect) -> CGSize { - return CGSize(width: bounds.size.width / 7.0, - height: bounds.size.height / 7.0) - } - - private func getMonthInfo(for date: Date) -> (firstDay: Int, daysTotal: Int)? { - let firstWeekdayOfMonth = calendar.component(.weekday, from: date) - - (style.firstWeekType == .monday ? 1 : 0) - let firstWeekdayOfMonthIndex = (firstWeekdayOfMonth + 6) % 7 - - guard let rangeOfDaysInMonth = calendar - .range(of: .day, in: .month, for: date) else { return nil } - - return (firstDay: firstWeekdayOfMonthIndex, daysTotal: rangeOfDaysInMonth.count) - } - - public func setCurrentVisibleMonth(date: Date, shouldSelectedDay: Bool = false) { - var currentDateComponents = calendar.dateComponents( - [.era, .year, .month, .day], - from: date - ) - selectDay = shouldSelectedDay ? currentDateComponents.day : nil - currentDateComponents.day = 1 - visibleMonthFirstDay = calendar.date(from: currentDateComponents) - } - - public func getDate(addMonth count: Int) -> Date? { - guard let date = visibleMonthFirstDay else { return nil } - var addDateComponents = DateComponents() - addDateComponents.month = count - return calendar.date(byAdding: addDateComponents, to: date) - } - - public func sendDateForDelegate(date: Date?) { - guard let calendarView = view.superview?.superview?.superview?.superview as? CalendarView else { return } - delegate?.calendar?(calendarView, didSelectedItem: date ?? .init()) - } - -} - -// MARK: - UICollectionViewDelegate - -extension CalendarMonthViewController { - override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - guard let section = Section(rawValue: indexPath.section), - section == .day else { return } - let cell = collectionView.cellForItem(at: indexPath) as? CalendarDayViewCell - sendDateForDelegate(date: cell?.date) - } -} - -// MARK: - UICollectionViewDataSource - -extension CalendarMonthViewController { - override func numberOfSections(in collectionView: UICollectionView) -> Int { - return Section.allCases.count - } - - override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - guard let section = Section(rawValue: section) else { return 0 } - switch section { - case .week: - return 7 - case .day: - return 7 * 6 - } - } - - override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - guard let section = Section(rawValue: indexPath.section) else { return UICollectionViewCell() } - switch section { - case .week: - let cell = collectionView.dequeue(CalendarWeekDayViewCell.self, for: indexPath) - cell.style = style - cell.configure(index: indexPath.item) - return cell - case .day: - let cell = collectionView.dequeue(CalendarDayViewCell.self, for: indexPath) - cell.style = style - - guard let visibleMonthInfo = visibleMonthInfo, - let visibleMonthFirstDay = visibleMonthFirstDay else { return cell } - - var dateComponents = calendar.dateComponents( - [.era, .year, .month], - from: visibleMonthFirstDay - ) - dateComponents.day = indexPath.item - visibleMonthInfo.firstDay + 1 - dateComponents.hour = 23 - dateComponents.minute = 59 - dateComponents.second = 59 - cell.date = calendar.date(from: dateComponents) - - cell.day = dateComponents.day ?? 0 - if cell.day == selectDay { - collectionView.selectItem( - at: indexPath, - animated: true, - scrollPosition: .centeredHorizontally - ) - cell.isSelected = true - sendDateForDelegate(date: cell.date) - } - cell.configure(daysOfMonth: 1...visibleMonthInfo.daysTotal) - - return cell - } - } -} - -extension CalendarMonthViewController: UICollectionViewDelegateFlowLayout { - func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { - return cellSize(in: superFrame) - } -} - -//extension CalendarMonthViewController: UICollectionViewDelegateFlowLayout { -// func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { -// guard let section = Section(rawValue: indexPath.section), -// section == .week else { return cellSize(in: superFrame) } -// return CGSize(width: superFrame.size.width / 7, -// height: style.weekHeaderHeight) -// } -//} diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarView.swift b/Bodabi/Bodabi/Views/Calendar/CalendarView.swift deleted file mode 100644 index 6dc12d0..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarView.swift +++ /dev/null @@ -1,178 +0,0 @@ -// -// CalendarView.swift -// Bodabi -// -// Created by 이혜진 on 2019. 1. 31.. -// Copyright © 2019년 LeeHyeJin. All rights reserved. -// - -import Foundation -import UIKit - -// MARK: - CalendarViewDelegate - -@objc -protocol CalendarViewDelegate: class { - @objc optional func calendar(_ calendar: CalendarView, currentVisibleItem date: Date) - @objc optional func calendar(_ calendar: CalendarView, didSelectedItem date: Date) -} - -// MARK: - CalendarView - -class CalendarView: UIView { - - // MARK: - Property - - public weak var delegate: CalendarViewDelegate? { - didSet { - setPageFirstView() - } - } - - public var pageContainerView: UIView? - public var pageController: UIPageViewController? - public var currentVisibleDate: Date = .init() - - public var style: CalendarViewStyle = .init() - - // MARK: - Initialization - - override func awakeFromNib() { - super.awakeFromNib() - - setUpUI() - } - - override func layoutSubviews() { - super.layoutSubviews() - - pageController?.view.frame = bounds - setPageFirstView() - } - - override init(frame: CGRect) { - super.init(frame: frame) - - setUpUI() - } - - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - private func setUpUI() { - translatesAutoresizingMaskIntoConstraints = false - - pageController = UIPageViewController(transitionStyle: .scroll, - navigationOrientation: style.scrollOrientation, - options: nil) - guard let pageController = pageController else { return } - pageController.view.translatesAutoresizingMaskIntoConstraints = false - pageController.view.frame = bounds - pageController.delegate = self; pageController.dataSource = self - setPageFirstView() - addSubview(pageController.view) - - findParentViewController()?.addChild(pageController) - } - - // MAKR: - Method - - private func setPageFirstView() { - guard let pageController = pageController else { return } - if let firstPageController = pageViewController(date: currentVisibleDate) { - pageController.setViewControllers( - [firstPageController], - direction: .forward, - animated: false, - completion: nil - ) - - delegate?.calendar?(self, currentVisibleItem: currentVisibleDate) - } - } - - public func movePage(to date: Date?, - shouldSelectedDay: Bool = false) { - if let viewController = pageController? - .viewControllers?.first as? CalendarMonthViewController { - guard let toDate = date, - let fromDate = viewController.visibleMonthFirstDay else { return } - setNextPageView(fromDate: fromDate, toDate: toDate, - shouldSelectedDay: shouldSelectedDay) - } - } - - public func movePage(addMonth count: Int) { - if let viewController = pageController? - .viewControllers?.first as? CalendarMonthViewController { - guard let toDate = viewController.getDate(addMonth: count), - let fromDate = viewController.visibleMonthFirstDay else { return } - setNextPageView(fromDate: fromDate, toDate: toDate) - } - } - - private func setNextPageView(fromDate: Date, toDate: Date, - shouldSelectedDay: Bool = false) { - let direction: UIPageViewController.NavigationDirection = fromDate > toDate ? .reverse : .forward - let visibleDateString = fromDate.toString(of: .noDay) - let dateToMoveString = toDate.toString(of: .noDay) - - guard let nextPageController = pageViewController(date: toDate, - shouldSelectedDay: shouldSelectedDay) else { return } - pageController?.setViewControllers( - [nextPageController], - direction: direction, - animated: visibleDateString != dateToMoveString, - completion: nil - ) - delegate?.calendar?(self, currentVisibleItem: toDate) - } -} - -// MARK: - UIPageViewControllerDelegate - -extension CalendarView: UIPageViewControllerDelegate { - func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) { - if let viewController = previousViewControllers - .first as? CalendarMonthViewController { - viewController.isVisible = false - } - - if let viewController = pageViewController - .viewControllers?.first as? CalendarMonthViewController { - viewController.isVisible = true - - guard let date = viewController.visibleMonthFirstDay else { return } - delegate?.calendar?(self, currentVisibleItem: date) - } - } -} - -// MARK: - UIPageViewControllerDataSource - -extension CalendarView: UIPageViewControllerDataSource { - func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? { - guard let viewController = viewController as? CalendarMonthViewController else { return nil } - let previousDate = viewController.getDate(addMonth: -1) - return self.pageViewController(date: previousDate) - } - - func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { - guard let viewController = viewController as? CalendarMonthViewController else { return nil } - let nextDate = viewController.getDate(addMonth: 1) - return self.pageViewController(date: nextDate) - } - - private func pageViewController(date: Date?, shouldSelectedDay: Bool = false) -> UIViewController? { - guard let date = date else { return nil } - - let viewController = CalendarMonthViewController() - viewController.delegate = delegate - viewController.superFrame = bounds - viewController.style = style - - viewController.setCurrentVisibleMonth(date: date, shouldSelectedDay: shouldSelectedDay) - return viewController - } -} diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarViewStyle.swift b/Bodabi/Bodabi/Views/Calendar/CalendarViewStyle.swift deleted file mode 100644 index 37db9b9..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarViewStyle.swift +++ /dev/null @@ -1,62 +0,0 @@ -// -// CalendarViewStyle.swift -// Bodabi -// -// Created by 이혜진 on 2019. 2. 1.. -// Copyright © 2019년 LeeHyeJin. All rights reserved. -// - -import Foundation -import UIKit - -struct CalendarViewStyle { - public enum FirstWeekType { - case monday - case sunday - - func getWeekDay(weeks: [String], index: Int) -> String { - switch self { - case .monday: - return weeks[(index + 1) % 7] - case .sunday: - return weeks[index] - } - } - } - - public enum CalendarWeekType { - case long - case normal - case short - case korean - - var weeksArray: [String] { - let formatter = DateFormatter() - switch self { - case .long: return formatter.standaloneWeekdaySymbols - case .normal: return formatter.shortWeekdaySymbols - case .short: return formatter.veryShortWeekdaySymbols - case .korean: return ["일", "월", "화", "수", "목", "금", "토"] - } - } - } - - public enum CalendarSelectType { - case squre - case round - } - - public var scrollOrientation: UIPageViewController.NavigationOrientation = .horizontal - - public var firstWeekType: FirstWeekType = .sunday - public var selectedType: CalendarSelectType = .round - public var weekType: CalendarWeekType = .short - -// public var weekHeaderHeight: CGFloat = 80.0 - public var weekendColor: UIColor = .red - public var weekColor: UIColor = .gray - public var dayColor: UIColor = .black - public var todayColor: UIColor = .blue - public var selectedColor: UIColor = .yellow - public var eventColor: UIColor = .red -} diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.swift b/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.swift deleted file mode 100644 index 1dc4bfa..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.swift +++ /dev/null @@ -1,46 +0,0 @@ -// -// CalendarWeekDayViewCell.swift -// Bodabi -// -// Created by 이혜진 on 2019. 1. 31.. -// Copyright © 2019년 LeeHyeJin. All rights reserved. -// - -import UIKit - -class CalendarWeekDayViewCell: UICollectionViewCell { - - // MARK: - IBOutlet - - @IBOutlet weak var weekLabel: UILabel! - - // MARK: - Property - - public var style: CalendarViewStyle = .init() - - override func awakeFromNib() { - super.awakeFromNib() - - setupUI() - } - - private func setupUI() { - isUserInteractionEnabled = false - } - - // MARK: - Configure - - public func configure(index: Int) { - let weeksArray = style.weekType.weeksArray - let week = style.firstWeekType.getWeekDay(weeks: weeksArray, index: index) - weekLabel.text = week - - guard let weekFirstCharacter = week.first else { return } - if style.weekType == .korean { - weekLabel.textColor = String(weekFirstCharacter) == "일" || String(weekFirstCharacter) == "토" ? - style.weekendColor : style.weekColor - } else { - weekLabel.textColor = String(weekFirstCharacter) == "S" ? style.weekendColor : style.weekColor - } - } -} diff --git a/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.xib b/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.xib deleted file mode 100644 index 8126648..0000000 --- a/Bodabi/Bodabi/Views/Calendar/CalendarWeekDayViewCell.xib +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Bodabi/Bodabi/Views/Home/HolidayViewCell.xib b/Bodabi/Bodabi/Views/Home/HolidayViewCell.xib index 1d251c0..4ed16b6 100644 --- a/Bodabi/Bodabi/Views/Home/HolidayViewCell.xib +++ b/Bodabi/Bodabi/Views/Home/HolidayViewCell.xib @@ -26,7 +26,7 @@ -