diff --git a/DerivedData/FixerApp/Logs/Build/LogStoreManifest.plist b/DerivedData/FixerApp/Logs/Build/LogStoreManifest.plist index 6319286..8be2b4d 100644 --- a/DerivedData/FixerApp/Logs/Build/LogStoreManifest.plist +++ b/DerivedData/FixerApp/Logs/Build/LogStoreManifest.plist @@ -6,7 +6,7 @@ 10 logs - 005F5B9E-88ED-4499-AC61-C005A7D3CA4C + 2505736A-22C9-44CB-8A7F-BE00F8D722AF className IDEActivityLogSection @@ -15,523 +15,13 @@ domainType Xcode.IDEActivityLogDomainType.BuildLog fileName - 005F5B9E-88ED-4499-AC61-C005A7D3CA4C.xcactivitylog + 2505736A-22C9-44CB-8A7F-BE00F8D722AF.xcactivitylog hasPrimaryLog primaryObservable highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069253.48468804 - timeStoppedRecording - 635069256.50509906 - title - Build FixerApp - uniqueIdentifier - 005F5B9E-88ED-4499-AC61-C005A7D3CA4C - - 03CB6D67-09F5-4634-8947-947B03813B04 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 03CB6D67-09F5-4634-8947-947B03813B04.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - E - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069086.25351906 - timeStoppedRecording - 635069088.85706997 - title - Build FixerApp - uniqueIdentifier - 03CB6D67-09F5-4634-8947-947B03813B04 - - 0A8268B6-5895-45AC-A747-3A901E68CAB3 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 0A8268B6-5895-45AC-A747-3A901E68CAB3.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635000982.12871802 - timeStoppedRecording - 635000982.63176203 - title - Build FixerApp - uniqueIdentifier - 0A8268B6-5895-45AC-A747-3A901E68CAB3 - - 0B9F6EFF-4DA2-427E-8B54-E611DC853AD6 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 0B9F6EFF-4DA2-427E-8B54-E611DC853AD6.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635067544.88761699 - timeStoppedRecording - 635067550.47964704 - title - Build FixerApp - uniqueIdentifier - 0B9F6EFF-4DA2-427E-8B54-E611DC853AD6 - - 1057E9A2-2E4D-4CEB-BF7C-D85B58E63199 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 1057E9A2-2E4D-4CEB-BF7C-D85B58E63199.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635067165.40310895 - timeStoppedRecording - 635067168.06045794 - title - Build FixerApp - uniqueIdentifier - 1057E9A2-2E4D-4CEB-BF7C-D85B58E63199 - - 1ADA60F6-CDA9-4E4B-A0D6-D547C89FF73A - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 1ADA60F6-CDA9-4E4B-A0D6-D547C89FF73A.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635068818.64006901 - timeStoppedRecording - 635068823.38024902 - title - Build FixerApp - uniqueIdentifier - 1ADA60F6-CDA9-4E4B-A0D6-D547C89FF73A - - 2C6757A3-4F39-4B10-BD73-A6BA8D6B9199 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 2C6757A3-4F39-4B10-BD73-A6BA8D6B9199.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635068526.08916295 - timeStoppedRecording - 635068530.66013801 - title - Build FixerApp - uniqueIdentifier - 2C6757A3-4F39-4B10-BD73-A6BA8D6B9199 - - 34196A35-054E-445F-A263-D28E66A334DE - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 34196A35-054E-445F-A263-D28E66A334DE.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635067971.05517995 - timeStoppedRecording - 635067974.43491197 - title - Build FixerApp - uniqueIdentifier - 34196A35-054E-445F-A263-D28E66A334DE - - 44F15117-C2B4-4FC8-B9B3-62B74DDC7B6C - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 44F15117-C2B4-4FC8-B9B3-62B74DDC7B6C.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069292.50461805 - timeStoppedRecording - 635069299.52988505 - title - Build FixerApp - uniqueIdentifier - 44F15117-C2B4-4FC8-B9B3-62B74DDC7B6C - - 4703DD33-BC1B-454B-A9F4-6F560F7AA777 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 4703DD33-BC1B-454B-A9F4-6F560F7AA777.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635068633.99362397 - timeStoppedRecording - 635068640.69396305 - title - Build FixerApp - uniqueIdentifier - 4703DD33-BC1B-454B-A9F4-6F560F7AA777 - - 595F6DBC-B87D-4DD3-AC85-B0A47A81DAF5 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 595F6DBC-B87D-4DD3-AC85-B0A47A81DAF5.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635067819.56724095 - timeStoppedRecording - 635067823.857095 - title - Build FixerApp - uniqueIdentifier - 595F6DBC-B87D-4DD3-AC85-B0A47A81DAF5 - - 930C2A4C-7A6F-42A7-9EEA-592FA3F067A4 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 930C2A4C-7A6F-42A7-9EEA-592FA3F067A4.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - E - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069166.06671596 - timeStoppedRecording - 635069166.97098804 - title - Build FixerApp - uniqueIdentifier - 930C2A4C-7A6F-42A7-9EEA-592FA3F067A4 - - 95D4DB43-B12C-41A4-864E-0CA4EAD23157 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 95D4DB43-B12C-41A4-864E-0CA4EAD23157.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069224.89389002 - timeStoppedRecording - 635069228.76304805 - title - Build FixerApp - uniqueIdentifier - 95D4DB43-B12C-41A4-864E-0CA4EAD23157 - - 968A843D-B7FA-4939-8D12-F15674BDB040 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - 968A843D-B7FA-4939-8D12-F15674BDB040.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635068552.96852505 - timeStoppedRecording - 635068556.37398601 - title - Build FixerApp - uniqueIdentifier - 968A843D-B7FA-4939-8D12-F15674BDB040 - - A98270B5-86E2-4689-AC78-3AC0994AAAA1 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - A98270B5-86E2-4689-AC78-3AC0994AAAA1.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Build FixerApp - timeStartedRecording - 635069308.822891 - timeStoppedRecording - 635069311.72337902 - title - Build FixerApp - uniqueIdentifier - A98270B5-86E2-4689-AC78-3AC0994AAAA1 - - CC54BE05-B589-455B-92A5-3000358EC5B9 - - className - IDEActivityLogSection - documentTypeString - <nil> - domainType - Xcode.IDEActivityLogDomainType.BuildLog - fileName - CC54BE05-B589-455B-92A5-3000358EC5B9.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - W + S schemeIdentifier-containerName FixerApp project @@ -542,15 +32,15 @@ signature Build FixerApp timeStartedRecording - 635067591.81758201 + 636439587.46053398 timeStoppedRecording - 635067592.06187606 + 636439596.504987 title Build FixerApp uniqueIdentifier - CC54BE05-B589-455B-92A5-3000358EC5B9 + 2505736A-22C9-44CB-8A7F-BE00F8D722AF - D918B733-2F1D-4850-8CE6-BD541951F7D2 + 2E76DE5A-BDE1-4439-ADD1-D8719DBB95C7 className IDEActivityLogSection @@ -559,7 +49,7 @@ domainType Xcode.IDEActivityLogDomainType.BuildLog fileName - D918B733-2F1D-4850-8CE6-BD541951F7D2.xcactivitylog + 2E76DE5A-BDE1-4439-ADD1-D8719DBB95C7.xcactivitylog hasPrimaryLog primaryObservable @@ -576,15 +66,15 @@ signature Build FixerApp timeStartedRecording - 635068696.58301198 + 637222277.84553301 timeStoppedRecording - 635068700.76470602 + 637222289.83158898 title Build FixerApp uniqueIdentifier - D918B733-2F1D-4850-8CE6-BD541951F7D2 + 2E76DE5A-BDE1-4439-ADD1-D8719DBB95C7 - F7552755-43C8-43CF-9789-70B5D368491C + 88A3AC37-70FC-4741-BEC6-90C348A1F347 className IDEActivityLogSection @@ -593,7 +83,7 @@ domainType Xcode.IDEActivityLogDomainType.BuildLog fileName - F7552755-43C8-43CF-9789-70B5D368491C.xcactivitylog + 88A3AC37-70FC-4741-BEC6-90C348A1F347.xcactivitylog hasPrimaryLog primaryObservable @@ -610,13 +100,13 @@ signature Build FixerApp timeStartedRecording - 635068594.70343101 + 637222031.72768998 timeStoppedRecording - 635068597.79228699 + 637222051.70563996 title Build FixerApp uniqueIdentifier - F7552755-43C8-43CF-9789-70B5D368491C + 88A3AC37-70FC-4741-BEC6-90C348A1F347 diff --git a/DerivedData/FixerApp/Logs/Issues/LogStoreManifest.plist b/DerivedData/FixerApp/Logs/Issues/LogStoreManifest.plist index 535bd88..434147e 100644 --- a/DerivedData/FixerApp/Logs/Issues/LogStoreManifest.plist +++ b/DerivedData/FixerApp/Logs/Issues/LogStoreManifest.plist @@ -6,63 +6,63 @@ 10 logs - 40B005C4-BDA0-406D-AB90-0E6161015C1E + 004ADF7D-9087-4A24-B639-6C7A7719D196 className IDEActivityLogMajorGroupSection documentTypeString <nil> domainType - Xcode.IDEActivityLogDomainType.target.product-type.application + Xcode.IDEActivityLogDomainType.target.product-type.bundle fileName - 40B005C4-BDA0-406D-AB90-0E6161015C1E.xcactivitylog + 004ADF7D-9087-4A24-B639-6C7A7719D196.xcactivitylog hasPrimaryLog primaryObservable highLevelStatus - W + S signature - FixerApp-dhfjqiurjssqfudltkeozqdtkrcv + LineSDKSwift-LineSDK-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 635069309.02392995 + 637222039.080585 timeStoppedRecording - 635069311.70651996 + 637222039.09495604 title - Build target FixerApp + Build target LineSDKSwift-LineSDK uniqueIdentifier - 40B005C4-BDA0-406D-AB90-0E6161015C1E + 004ADF7D-9087-4A24-B639-6C7A7719D196 - 40EF47BC-776F-4AFD-B83B-E4F4EC8E3C86 + 08B1D926-2045-4C1F-8B36-3CAFC3195EB8 className IDEActivityLogMajorGroupSection documentTypeString <nil> domainType - Xcode.IDEActivityLogDomainType.target.product-type.framework + Xcode.IDEActivityLogDomainType.target.product-type.application fileName - 40EF47BC-776F-4AFD-B83B-E4F4EC8E3C86.xcactivitylog + 08B1D926-2045-4C1F-8B36-3CAFC3195EB8.xcactivitylog hasPrimaryLog primaryObservable highLevelStatus - S + W signature - RxRelay-bzvwvhzukxljoyfgwtzmckmbofxx + FixerApp-dhfjqiurjssqfudltkeozqdtkrcv timeStartedRecording - 634963055.85183501 + 637222278.63970494 timeStoppedRecording - 634963056.13062406 + 637222289.81127405 title - Build target RxRelay + Build target FixerApp uniqueIdentifier - 40EF47BC-776F-4AFD-B83B-E4F4EC8E3C86 + 08B1D926-2045-4C1F-8B36-3CAFC3195EB8 - 52401D5B-13AC-40EB-BD03-A9656F27EFC8 + 4282CDF2-3196-4FD9-830A-CC5C9DD743D9 className IDEActivityLogMajorGroupSection @@ -71,7 +71,7 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - 52401D5B-13AC-40EB-BD03-A9656F27EFC8.xcactivitylog + 4282CDF2-3196-4FD9-830A-CC5C9DD743D9.xcactivitylog hasPrimaryLog primaryObservable @@ -80,17 +80,17 @@ S signature - LineSDKSwift-bzvwvhzukxljoyfgwtzmckmbofxx + RxCocoa-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963053.57500696 + 637222039.51649296 timeStoppedRecording - 634963053.66955805 + 637222040.88021898 title - Build target LineSDKSwift + Build target RxCocoa uniqueIdentifier - 52401D5B-13AC-40EB-BD03-A9656F27EFC8 + 4282CDF2-3196-4FD9-830A-CC5C9DD743D9 - 8BB440AD-1928-4A59-B407-5CDEDC361577 + 49D959CD-F79B-4997-9346-0BFBF38A57C9 className IDEActivityLogMajorGroupSection @@ -99,7 +99,7 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - 8BB440AD-1928-4A59-B407-5CDEDC361577.xcactivitylog + 49D959CD-F79B-4997-9346-0BFBF38A57C9.xcactivitylog hasPrimaryLog primaryObservable @@ -108,17 +108,17 @@ S signature - Pods-FixerApp-bzvwvhzukxljoyfgwtzmckmbofxx + LineSDKSwift-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963057.55694902 + 637222037.03934705 timeStoppedRecording - 634963057.56629801 + 637222039.54340899 title - Build target Pods-FixerApp + Build target LineSDKSwift uniqueIdentifier - 8BB440AD-1928-4A59-B407-5CDEDC361577 + 49D959CD-F79B-4997-9346-0BFBF38A57C9 - C50DCF57-C799-485B-BD96-E6843A7EF496 + 9A0C2061-56B5-4892-BB52-21FD01C1770B className IDEActivityLogMajorGroupSection @@ -127,35 +127,35 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - C50DCF57-C799-485B-BD96-E6843A7EF496.xcactivitylog + 9A0C2061-56B5-4892-BB52-21FD01C1770B.xcactivitylog hasPrimaryLog primaryObservable highLevelStatus - S + W signature - RxCocoa-bzvwvhzukxljoyfgwtzmckmbofxx + FSCalendar-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963056.13135397 + 637222289.81738496 timeStoppedRecording - 634963057.55619204 + 637222289.81770897 title - Build target RxCocoa + Build target FSCalendar uniqueIdentifier - C50DCF57-C799-485B-BD96-E6843A7EF496 + 9A0C2061-56B5-4892-BB52-21FD01C1770B - C544AD30-2754-4BED-A579-44F0D34B71DD + AC6CA16A-D61D-414D-88FD-469944E373C8 className IDEActivityLogMajorGroupSection documentTypeString <nil> domainType - Xcode.IDEActivityLogDomainType.target.product-type.bundle + Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - C544AD30-2754-4BED-A579-44F0D34B71DD.xcactivitylog + AC6CA16A-D61D-414D-88FD-469944E373C8.xcactivitylog hasPrimaryLog primaryObservable @@ -164,17 +164,17 @@ S signature - LineSDKSwift-LineSDK-bzvwvhzukxljoyfgwtzmckmbofxx + RxSwift-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963053.47615004 + 637222035.27152205 timeStoppedRecording - 634963053.64769006 + 637222036.66777897 title - Build target LineSDKSwift-LineSDK + Build target RxSwift uniqueIdentifier - C544AD30-2754-4BED-A579-44F0D34B71DD + AC6CA16A-D61D-414D-88FD-469944E373C8 - C7B926B5-E3C4-4DF5-9EF4-5CB65A2AC70F + D02C9815-81F8-4078-A0AD-818A75A9193F className IDEActivityLogMajorGroupSection @@ -183,7 +183,7 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - C7B926B5-E3C4-4DF5-9EF4-5CB65A2AC70F.xcactivitylog + D02C9815-81F8-4078-A0AD-818A75A9193F.xcactivitylog hasPrimaryLog primaryObservable @@ -192,17 +192,17 @@ S signature - RxSwift-bzvwvhzukxljoyfgwtzmckmbofxx + Pods-FixerApp-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963053.55340004 + 637222040.87944901 timeStoppedRecording - 634963055.85145104 + 637222040.88951898 title - Build target RxSwift + Build target Pods-FixerApp uniqueIdentifier - C7B926B5-E3C4-4DF5-9EF4-5CB65A2AC70F + D02C9815-81F8-4078-A0AD-818A75A9193F - E0880BB4-4A85-4DE8-B894-AC09F1773A54 + D8A7B9CE-E3B5-4D6C-B2D3-189ACCDEDB96 className IDEActivityLogMajorGroupSection @@ -211,26 +211,26 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - E0880BB4-4A85-4DE8-B894-AC09F1773A54.xcactivitylog + D8A7B9CE-E3B5-4D6C-B2D3-189ACCDEDB96.xcactivitylog hasPrimaryLog primaryObservable highLevelStatus - W + S signature - FSCalendar-bzvwvhzukxljoyfgwtzmckmbofxx + CalculateCalendarLogic-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 635069311.71126103 + 637222034.654513 timeStoppedRecording - 635069311.71166897 + 637222039.53013301 title - Build target FSCalendar + Build target CalculateCalendarLogic uniqueIdentifier - E0880BB4-4A85-4DE8-B894-AC09F1773A54 + D8A7B9CE-E3B5-4D6C-B2D3-189ACCDEDB96 - E2EE0B39-3EB7-452E-B4F0-4E5CA7667709 + F1040450-EEFF-49B1-9E3A-D81A960E68AD className IDEActivityLogMajorGroupSection @@ -239,7 +239,7 @@ domainType Xcode.IDEActivityLogDomainType.target.product-type.framework fileName - E2EE0B39-3EB7-452E-B4F0-4E5CA7667709.xcactivitylog + F1040450-EEFF-49B1-9E3A-D81A960E68AD.xcactivitylog hasPrimaryLog primaryObservable @@ -248,15 +248,15 @@ S signature - CalculateCalendarLogic-bzvwvhzukxljoyfgwtzmckmbofxx + RxRelay-bzvwvhzukxljoyfgwtzmckmbofxx timeStartedRecording - 634963053.57318902 + 637222036.66983104 timeStoppedRecording - 634963053.62521601 + 637222039.52172899 title - Build target CalculateCalendarLogic + Build target RxRelay uniqueIdentifier - E2EE0B39-3EB7-452E-B4F0-4E5CA7667709 + F1040450-EEFF-49B1-9E3A-D81A960E68AD preserveOldLogs diff --git a/DerivedData/FixerApp/Logs/Run/LogStoreManifest.plist b/DerivedData/FixerApp/Logs/Run/LogStoreManifest.plist index d839fba..93fe46b 100644 --- a/DerivedData/FixerApp/Logs/Run/LogStoreManifest.plist +++ b/DerivedData/FixerApp/Logs/Run/LogStoreManifest.plist @@ -6,7 +6,7 @@ 10 logs - 03BA0784-8762-451A-8B61-743041AA58FE + 34D6649D-E694-49CE-A8B8-A378604A5ECA className DBGConsoleLog @@ -15,7 +15,7 @@ domainType Xcode.IDEActivityLogDomainType.DebugLog fileName - 03BA0784-8762-451A-8B61-743041AA58FE.xcactivitylog + 34D6649D-E694-49CE-A8B8-A378604A5ECA.xcactivitylog hasPrimaryLog primaryObservable @@ -32,15 +32,15 @@ signature Run FixerApp timeStartedRecording - 635068823.386711 + 636439310.50238097 timeStoppedRecording - 635069086.40562105 + 636439581.63066804 title Run FixerApp uniqueIdentifier - 03BA0784-8762-451A-8B61-743041AA58FE + 34D6649D-E694-49CE-A8B8-A378604A5ECA - 04996D9E-F870-49C2-89DF-44C5543CEDEE + DC0194DD-C3F8-425D-A703-F9C78A1D6B46 className DBGConsoleLog @@ -49,7 +49,7 @@ domainType Xcode.IDEActivityLogDomainType.DebugLog fileName - 04996D9E-F870-49C2-89DF-44C5543CEDEE.xcactivitylog + DC0194DD-C3F8-425D-A703-F9C78A1D6B46.xcactivitylog hasPrimaryLog primaryObservable @@ -66,455 +66,13 @@ signature Run FixerApp timeStartedRecording - 635067550.487867 + 637222289.87817597 timeStoppedRecording - 635067592.00979102 + 637222353.24234605 title Run FixerApp uniqueIdentifier - 04996D9E-F870-49C2-89DF-44C5543CEDEE - - 0DE38EC5-56A5-42AB-B732-18257EF25895 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 0DE38EC5-56A5-42AB-B732-18257EF25895.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635067592.06680405 - timeStoppedRecording - 635067819.67046905 - title - Run FixerApp - uniqueIdentifier - 0DE38EC5-56A5-42AB-B732-18257EF25895 - - 1610C40D-DD3E-45BE-A00E-FDAD92D3840B - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 1610C40D-DD3E-45BE-A00E-FDAD92D3840B.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635069256.51052594 - timeStoppedRecording - 635069292.64968204 - title - Run FixerApp - uniqueIdentifier - 1610C40D-DD3E-45BE-A00E-FDAD92D3840B - - 28A344E2-A209-4E0E-B72E-1FB319EB59F8 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 28A344E2-A209-4E0E-B72E-1FB319EB59F8.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635068597.79771996 - timeStoppedRecording - 635068634.07965195 - title - Run FixerApp - uniqueIdentifier - 28A344E2-A209-4E0E-B72E-1FB319EB59F8 - - 332F38CC-A1F2-49D6-AB04-6D537D5F3E29 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 332F38CC-A1F2-49D6-AB04-6D537D5F3E29.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635068530.67469597 - timeStoppedRecording - 635068553.06882203 - title - Run FixerApp - uniqueIdentifier - 332F38CC-A1F2-49D6-AB04-6D537D5F3E29 - - 417CBCED-9E34-4BA5-9998-66F6D0D159C4 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 417CBCED-9E34-4BA5-9998-66F6D0D159C4.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635067974.44165206 - timeStoppedRecording - 635067974.65188897 - title - Run FixerApp - uniqueIdentifier - 417CBCED-9E34-4BA5-9998-66F6D0D159C4 - - 4F45446F-B49A-4DEF-B0D1-FE90A7B6DA3A - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 4F45446F-B49A-4DEF-B0D1-FE90A7B6DA3A.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635068640.70227599 - timeStoppedRecording - 635068696.79943299 - title - Run FixerApp - uniqueIdentifier - 4F45446F-B49A-4DEF-B0D1-FE90A7B6DA3A - - 54B383DD-D67D-466C-A76A-6635FBD58508 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 54B383DD-D67D-466C-A76A-6635FBD58508.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635069228.77039599 - timeStoppedRecording - 635069253.63263202 - title - Run FixerApp - uniqueIdentifier - 54B383DD-D67D-466C-A76A-6635FBD58508 - - 668B3697-BBD3-4BD1-AAA1-8548A606319C - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - 668B3697-BBD3-4BD1-AAA1-8548A606319C.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635067823.86262405 - timeStoppedRecording - 635067971.16713405 - title - Run FixerApp - uniqueIdentifier - 668B3697-BBD3-4BD1-AAA1-8548A606319C - - B89AD75A-E28E-4D47-87D0-926EB0A2E573 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - B89AD75A-E28E-4D47-87D0-926EB0A2E573.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635068556.37870204 - timeStoppedRecording - 635068594.87148702 - title - Run FixerApp - uniqueIdentifier - B89AD75A-E28E-4D47-87D0-926EB0A2E573 - - C6F36009-30A6-4A85-BF27-1FF4500E2598 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - C6F36009-30A6-4A85-BF27-1FF4500E2598.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635000982.651384 - timeStoppedRecording - 635000994.07365799 - title - Run FixerApp - uniqueIdentifier - C6F36009-30A6-4A85-BF27-1FF4500E2598 - - CAA1B644-662C-4C59-ADA9-DDDFAC6C5AF3 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - CAA1B644-662C-4C59-ADA9-DDDFAC6C5AF3.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635068700.77020001 - timeStoppedRecording - 635068818.75536501 - title - Run FixerApp - uniqueIdentifier - CAA1B644-662C-4C59-ADA9-DDDFAC6C5AF3 - - CBA70B55-0109-482A-B10C-EBC7A4DEFDC3 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - CBA70B55-0109-482A-B10C-EBC7A4DEFDC3.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635067168.07486105 - timeStoppedRecording - 635067545.13221502 - title - Run FixerApp - uniqueIdentifier - CBA70B55-0109-482A-B10C-EBC7A4DEFDC3 - - EF48249E-8296-4524-A931-FBB0EE3E7010 - - className - DBGConsoleLog - documentTypeString - com.apple.dt.IDE.DebuggerLogContentType - domainType - Xcode.IDEActivityLogDomainType.DebugLog - fileName - EF48249E-8296-4524-A931-FBB0EE3E7010.xcactivitylog - hasPrimaryLog - - primaryObservable - - highLevelStatus - S - - schemeIdentifier-containerName - FixerApp project - schemeIdentifier-schemeName - FixerApp - schemeIdentifier-sharedScheme - 1 - signature - Run FixerApp - timeStartedRecording - 635069299.53514302 - timeStoppedRecording - 635069300.25341904 - title - Run FixerApp - uniqueIdentifier - EF48249E-8296-4524-A931-FBB0EE3E7010 + DC0194DD-C3F8-425D-A703-F9C78A1D6B46 diff --git a/DerivedData/FixerApp/info.plist b/DerivedData/FixerApp/info.plist index d55f214..3c3d8bb 100644 --- a/DerivedData/FixerApp/info.plist +++ b/DerivedData/FixerApp/info.plist @@ -3,7 +3,7 @@ LastAccessedDate - 2021-02-15T08:08:28Z + 2021-03-12T06:26:03Z WorkspacePath /Users/kohei.k.0824/myfolder/iOS/FixerApp/FixerApp.xcworkspace diff --git a/FixerApp.xcodeproj/project.pbxproj b/FixerApp.xcodeproj/project.pbxproj index 1df4642..5e7ce8f 100644 --- a/FixerApp.xcodeproj/project.pbxproj +++ b/FixerApp.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ D71373AC25BD455600DBF96B /* MakeScheduleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D71373AA25BD455500DBF96B /* MakeScheduleViewController.xib */; }; D752C9E12595D30E005A4889 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752C9E02595D30E005A4889 /* AppDelegate.swift */; }; D752C9E32595D30E005A4889 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752C9E22595D30E005A4889 /* SceneDelegate.swift */; }; - D752C9E52595D30E005A4889 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752C9E42595D30E005A4889 /* ViewController.swift */; }; - D752C9E82595D30E005A4889 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D752C9E62595D30E005A4889 /* Main.storyboard */; }; D752C9EA2595D312005A4889 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D752C9E92595D312005A4889 /* Assets.xcassets */; }; D752C9ED2595D312005A4889 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D752C9EB2595D312005A4889 /* LaunchScreen.storyboard */; }; D752C9F82595D313005A4889 /* FixerAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752C9F72595D313005A4889 /* FixerAppTests.swift */; }; @@ -33,12 +31,15 @@ D770606125D7B00900E08916 /* enteredEventsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D770605F25D7B00900E08916 /* enteredEventsTableViewCell.xib */; }; D770606725D7B01700E08916 /* confirmedEventsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D770606525D7B01700E08916 /* confirmedEventsTableViewCell.swift */; }; D770606825D7B01700E08916 /* confirmedEventsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D770606625D7B01700E08916 /* confirmedEventsTableViewCell.xib */; }; - D770606D25D7BAF100E08916 /* UITableViewCell+NIb+Identifier+config.swift in Sources */ = {isa = PBXBuildFile; fileRef = D770606C25D7BAF100E08916 /* UITableViewCell+NIb+Identifier+config.swift */; }; + D770606D25D7BAF100E08916 /* UITableViewCell+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D770606C25D7BAF100E08916 /* UITableViewCell+Extension.swift */; }; + D770610325DA67E200E08916 /* EventDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D770610125DA67E200E08916 /* EventDetailViewController.swift */; }; + D770610425DA67E200E08916 /* EventDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D770610225DA67E200E08916 /* EventDetailViewController.xib */; }; + D77061A125DE51E900E08916 /* BidirectionalCollectionLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77061A025DE51E800E08916 /* BidirectionalCollectionLayout.swift */; }; D776BCFD25CA930800E92BD4 /* TimezoneStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = D776BCFC25CA930800E92BD4 /* TimezoneStatus.swift */; }; D776BD1B25CA992500E92BD4 /* check.png in Resources */ = {isa = PBXBuildFile; fileRef = D776BD1A25CA992500E92BD4 /* check.png */; }; D776BD2025CA993000E92BD4 /* file.png in Resources */ = {isa = PBXBuildFile; fileRef = D776BD1F25CA993000E92BD4 /* file.png */; }; D776BD2525CA993700E92BD4 /* document.png in Resources */ = {isa = PBXBuildFile; fileRef = D776BD2425CA993700E92BD4 /* document.png */; }; - D776BD2A25CA99D500E92BD4 /* UIImage+Scale.swift in Sources */ = {isa = PBXBuildFile; fileRef = D776BD2925CA99D500E92BD4 /* UIImage+Scale.swift */; }; + D776BD2A25CA99D500E92BD4 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D776BD2925CA99D500E92BD4 /* UIImage+Extension.swift */; }; D776BD3025CAA43F00E92BD4 /* MadeScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D776BD2E25CAA43F00E92BD4 /* MadeScheduleViewController.swift */; }; D776BD3125CAA43F00E92BD4 /* MadeScheduleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D776BD2F25CAA43F00E92BD4 /* MadeScheduleViewController.xib */; }; D776BD3925CAAC4F00E92BD4 /* plus.png in Resources */ = {isa = PBXBuildFile; fileRef = D776BD3825CAAC4F00E92BD4 /* plus.png */; }; @@ -48,12 +49,12 @@ D77E3B7F25BE8B0B00BC8BB6 /* InputScheduleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D77E3B7D25BE8B0B00BC8BB6 /* InputScheduleViewController.xib */; }; D77E3B8625BE90AC00BC8BB6 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3B8425BE90AC00BC8BB6 /* HomeViewController.swift */; }; D77E3B8725BE90AC00BC8BB6 /* HomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D77E3B8525BE90AC00BC8BB6 /* HomeViewController.xib */; }; - D77E3B9225BEE62100BC8BB6 /* DIYcalendarCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3B9125BEE62100BC8BB6 /* DIYcalendarCell.swift */; }; D77E3B9825BEED8600BC8BB6 /* CalendarCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3B9625BEED8600BC8BB6 /* CalendarCell.swift */; }; D77E3B9925BEED8600BC8BB6 /* CalendarCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D77E3B9725BEED8600BC8BB6 /* CalendarCell.xib */; }; D77E3BA425C067EF00BC8BB6 /* HomeTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3BA225C067EF00BC8BB6 /* HomeTabViewController.swift */; }; D77E3BA525C067EF00BC8BB6 /* HomeTabViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D77E3BA325C067EF00BC8BB6 /* HomeTabViewController.xib */; }; - D77E3BBB25C1031B00BC8BB6 /* UIView+Border.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3BBA25C1031B00BC8BB6 /* UIView+Border.swift */; }; + D77E3BBB25C1031B00BC8BB6 /* UIView+Inspectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77E3BBA25C1031B00BC8BB6 /* UIView+Inspectable.swift */; }; + D7B67B3225DFC9EA00480873 /* TimezoneToSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7B67B3125DFC9EA00480873 /* TimezoneToSchedule.swift */; }; D7BE6F9925C7D3A500D6E708 /* Schedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7BE6F9825C7D3A500D6E708 /* Schedule.swift */; }; D7BE6F9F25C7D7C500D6E708 /* testdata.json in Sources */ = {isa = PBXBuildFile; fileRef = D7BE6F9E25C7D7C500D6E708 /* testdata.json */; }; D7BE6FAF25C7E18800D6E708 /* Key.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7BE6FAE25C7E18800D6E708 /* Key.swift */; }; @@ -95,8 +96,6 @@ D752C9DD2595D30E005A4889 /* FixerApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FixerApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; D752C9E02595D30E005A4889 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; D752C9E22595D30E005A4889 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - D752C9E42595D30E005A4889 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - D752C9E72595D30E005A4889 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; D752C9E92595D312005A4889 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; D752C9EC2595D312005A4889 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; D752C9EE2595D312005A4889 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -116,12 +115,15 @@ D770605F25D7B00900E08916 /* enteredEventsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = enteredEventsTableViewCell.xib; sourceTree = ""; }; D770606525D7B01700E08916 /* confirmedEventsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = confirmedEventsTableViewCell.swift; sourceTree = ""; }; D770606625D7B01700E08916 /* confirmedEventsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = confirmedEventsTableViewCell.xib; sourceTree = ""; }; - D770606C25D7BAF100E08916 /* UITableViewCell+NIb+Identifier+config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+NIb+Identifier+config.swift"; sourceTree = ""; }; + D770606C25D7BAF100E08916 /* UITableViewCell+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+Extension.swift"; sourceTree = ""; }; + D770610125DA67E200E08916 /* EventDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailViewController.swift; sourceTree = ""; }; + D770610225DA67E200E08916 /* EventDetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EventDetailViewController.xib; sourceTree = ""; }; + D77061A025DE51E800E08916 /* BidirectionalCollectionLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BidirectionalCollectionLayout.swift; sourceTree = ""; }; D776BCFC25CA930800E92BD4 /* TimezoneStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimezoneStatus.swift; sourceTree = ""; }; D776BD1A25CA992500E92BD4 /* check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = check.png; sourceTree = ""; }; D776BD1F25CA993000E92BD4 /* file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = file.png; sourceTree = ""; }; D776BD2425CA993700E92BD4 /* document.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = document.png; sourceTree = ""; }; - D776BD2925CA99D500E92BD4 /* UIImage+Scale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Scale.swift"; sourceTree = ""; }; + D776BD2925CA99D500E92BD4 /* UIImage+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = ""; }; D776BD2E25CAA43F00E92BD4 /* MadeScheduleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MadeScheduleViewController.swift; sourceTree = ""; }; D776BD2F25CAA43F00E92BD4 /* MadeScheduleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MadeScheduleViewController.xib; sourceTree = ""; }; D776BD3825CAAC4F00E92BD4 /* plus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = plus.png; sourceTree = ""; }; @@ -131,12 +133,12 @@ D77E3B7D25BE8B0B00BC8BB6 /* InputScheduleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InputScheduleViewController.xib; sourceTree = ""; }; D77E3B8425BE90AC00BC8BB6 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; D77E3B8525BE90AC00BC8BB6 /* HomeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeViewController.xib; sourceTree = ""; }; - D77E3B9125BEE62100BC8BB6 /* DIYcalendarCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DIYcalendarCell.swift; sourceTree = ""; }; D77E3B9625BEED8600BC8BB6 /* CalendarCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarCell.swift; sourceTree = ""; }; D77E3B9725BEED8600BC8BB6 /* CalendarCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CalendarCell.xib; sourceTree = ""; }; D77E3BA225C067EF00BC8BB6 /* HomeTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTabViewController.swift; sourceTree = ""; }; D77E3BA325C067EF00BC8BB6 /* HomeTabViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeTabViewController.xib; sourceTree = ""; }; - D77E3BBA25C1031B00BC8BB6 /* UIView+Border.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Border.swift"; sourceTree = ""; }; + D77E3BBA25C1031B00BC8BB6 /* UIView+Inspectable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Inspectable.swift"; sourceTree = ""; }; + D7B67B3125DFC9EA00480873 /* TimezoneToSchedule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimezoneToSchedule.swift; sourceTree = ""; }; D7BE6F9825C7D3A500D6E708 /* Schedule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Schedule.swift; sourceTree = ""; }; D7BE6F9E25C7D7C500D6E708 /* testdata.json */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = text.json; path = testdata.json; sourceTree = ""; tabWidth = 2; }; D7BE6FAE25C7E18800D6E708 /* Key.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Key.swift; sourceTree = ""; }; @@ -196,33 +198,27 @@ path = Pods; sourceTree = ""; }; - D71373B025BD455D00DBF96B /* ViewController */ = { + D71373B025BD455D00DBF96B /* Views */ = { isa = PBXGroup; children = ( - D77E3B8325BE905E00BC8BB6 /* Main(deleted) */, + D798724425FB3F1300890047 /* Extensions */, + D71373B925BD480000DBF96B /* Cells */, + D798724525FB3FC600890047 /* Header */, + D798724A25FB40B800890047 /* Login */, + D798724925FB407B00890047 /* EventMake */, + D798724C25FB40EA00890047 /* EventInput */, + D798724B25FB40D400890047 /* EventDetail */, D77E3BA125C0679400BC8BB6 /* Home */, - D776BD2E25CAA43F00E92BD4 /* MadeScheduleViewController.swift */, - D776BD2F25CAA43F00E92BD4 /* MadeScheduleViewController.xib */, - D770604425D7872D00E08916 /* didInputScheduleViewController.swift */, - D770604525D7872D00E08916 /* didInputScheduleViewController.xib */, - D76D330525C27C9400E67DB2 /* LoginViewController.swift */, - D76D330625C27C9400E67DB2 /* LoginViewController.xib */, - D77E3B7C25BE8B0B00BC8BB6 /* InputScheduleViewController.swift */, - D77E3B7D25BE8B0B00BC8BB6 /* InputScheduleViewController.xib */, - D71373A925BD455500DBF96B /* MakeScheduleViewController.swift */, - D71373AA25BD455500DBF96B /* MakeScheduleViewController.xib */, + D798725025FB412500890047 /* Finish */, ); - path = ViewController; + path = Views; sourceTree = ""; }; - D71373B925BD480000DBF96B /* View */ = { + D71373B925BD480000DBF96B /* Cells */ = { isa = PBXGroup; children = ( - D776BD4F25CD92B900E92BD4 /* SwipeSelectingCollectionView.swift */, - D713739225BB18DF00DBF96B /* TimeZoneHeader.swift */, D713739F25BBBD4400DBF96B /* TimeZoneCell.swift */, D71373A025BBBD4400DBF96B /* TimeZoneCell.xib */, - D713739325BB18DF00DBF96B /* TimeZoneHeader.xib */, D77E3B9625BEED8600BC8BB6 /* CalendarCell.swift */, D77E3B9725BEED8600BC8BB6 /* CalendarCell.xib */, D770605725D7AFEE00E08916 /* unenteredEventsTableViewCell.swift */, @@ -232,7 +228,7 @@ D770605F25D7B00900E08916 /* enteredEventsTableViewCell.xib */, D770605825D7AFEE00E08916 /* unenteredEventsTableViewCell.xib */, ); - path = View; + path = Cells; sourceTree = ""; }; D752C9D42595D30D005A4889 = { @@ -260,11 +256,11 @@ D752C9DF2595D30E005A4889 /* FixerApp */ = { isa = PBXGroup; children = ( + D7B67B3025DFC94F00480873 /* Entity */, D776BD0125CA965E00E92BD4 /* Image */, D7BE6F9D25C7D7A500D6E708 /* TestData */, D7BE6F9725C7D37400D6E708 /* Model */, - D71373B025BD455D00DBF96B /* ViewController */, - D71373B925BD480000DBF96B /* View */, + D71373B025BD455D00DBF96B /* Views */, D77E3BB925C102CE00BC8BB6 /* Extension */, D752C9E22595D30E005A4889 /* SceneDelegate.swift */, D752C9E02595D30E005A4889 /* AppDelegate.swift */, @@ -306,16 +302,6 @@ path = Image; sourceTree = ""; }; - D77E3B8325BE905E00BC8BB6 /* Main(deleted) */ = { - isa = PBXGroup; - children = ( - D77E3B9125BEE62100BC8BB6 /* DIYcalendarCell.swift */, - D752C9E62595D30E005A4889 /* Main.storyboard */, - D752C9E42595D30E005A4889 /* ViewController.swift */, - ); - path = "Main(deleted)"; - sourceTree = ""; - }; D77E3BA125C0679400BC8BB6 /* Home */ = { isa = PBXGroup; children = ( @@ -330,14 +316,87 @@ D77E3BB925C102CE00BC8BB6 /* Extension */ = { isa = PBXGroup; children = ( - D77E3BBA25C1031B00BC8BB6 /* UIView+Border.swift */, - D776BD2925CA99D500E92BD4 /* UIImage+Scale.swift */, + D77E3BBA25C1031B00BC8BB6 /* UIView+Inspectable.swift */, + D776BD2925CA99D500E92BD4 /* UIImage+Extension.swift */, D776BD4A25CD927B00E92BD4 /* SwipeSelectingGestureRecognizer.swift */, - D770606C25D7BAF100E08916 /* UITableViewCell+NIb+Identifier+config.swift */, + D770606C25D7BAF100E08916 /* UITableViewCell+Extension.swift */, + D77061A025DE51E800E08916 /* BidirectionalCollectionLayout.swift */, ); path = Extension; sourceTree = ""; }; + D798724425FB3F1300890047 /* Extensions */ = { + isa = PBXGroup; + children = ( + D776BD4F25CD92B900E92BD4 /* SwipeSelectingCollectionView.swift */, + ); + path = Extensions; + sourceTree = ""; + }; + D798724525FB3FC600890047 /* Header */ = { + isa = PBXGroup; + children = ( + D713739325BB18DF00DBF96B /* TimeZoneHeader.xib */, + D713739225BB18DF00DBF96B /* TimeZoneHeader.swift */, + ); + path = Header; + sourceTree = ""; + }; + D798724925FB407B00890047 /* EventMake */ = { + isa = PBXGroup; + children = ( + D71373A925BD455500DBF96B /* MakeScheduleViewController.swift */, + D71373AA25BD455500DBF96B /* MakeScheduleViewController.xib */, + ); + path = EventMake; + sourceTree = ""; + }; + D798724A25FB40B800890047 /* Login */ = { + isa = PBXGroup; + children = ( + D76D330525C27C9400E67DB2 /* LoginViewController.swift */, + D76D330625C27C9400E67DB2 /* LoginViewController.xib */, + ); + path = Login; + sourceTree = ""; + }; + D798724B25FB40D400890047 /* EventDetail */ = { + isa = PBXGroup; + children = ( + D770610225DA67E200E08916 /* EventDetailViewController.xib */, + D770610125DA67E200E08916 /* EventDetailViewController.swift */, + ); + path = EventDetail; + sourceTree = ""; + }; + D798724C25FB40EA00890047 /* EventInput */ = { + isa = PBXGroup; + children = ( + D77E3B7D25BE8B0B00BC8BB6 /* InputScheduleViewController.xib */, + D77E3B7C25BE8B0B00BC8BB6 /* InputScheduleViewController.swift */, + ); + path = EventInput; + sourceTree = ""; + }; + D798725025FB412500890047 /* Finish */ = { + isa = PBXGroup; + children = ( + D770604525D7872D00E08916 /* didInputScheduleViewController.xib */, + D770604425D7872D00E08916 /* didInputScheduleViewController.swift */, + D776BD2F25CAA43F00E92BD4 /* MadeScheduleViewController.xib */, + D776BD2E25CAA43F00E92BD4 /* MadeScheduleViewController.swift */, + ); + path = Finish; + sourceTree = ""; + }; + D7B67B3025DFC94F00480873 /* Entity */ = { + isa = PBXGroup; + children = ( + D7B67B3125DFC9EA00480873 /* TimezoneToSchedule.swift */, + ); + path = Entity; + sourceTree = ""; + }; D7BE6F9725C7D37400D6E708 /* Model */ = { isa = PBXGroup; children = ( @@ -463,6 +522,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + D770610425DA67E200E08916 /* EventDetailViewController.xib in Resources */, D770604725D7872D00E08916 /* didInputScheduleViewController.xib in Resources */, D71373A225BBBD4400DBF96B /* TimeZoneCell.xib in Resources */, D713739525BB18DF00DBF96B /* TimeZoneHeader.xib in Resources */, @@ -471,7 +531,6 @@ D77E3B7F25BE8B0B00BC8BB6 /* InputScheduleViewController.xib in Resources */, D770605A25D7AFEE00E08916 /* unenteredEventsTableViewCell.xib in Resources */, D752C9EA2595D312005A4889 /* Assets.xcassets in Resources */, - D752C9E82595D30E005A4889 /* Main.storyboard in Resources */, D76D330825C27C9400E67DB2 /* LoginViewController.xib in Resources */, D770606125D7B00900E08916 /* enteredEventsTableViewCell.xib in Resources */, D7BE6FCA25C9594B00D6E708 /* Key.plist in Resources */, @@ -612,17 +671,16 @@ buildActionMask = 2147483647; files = ( D776BD5025CD92B900E92BD4 /* SwipeSelectingCollectionView.swift in Sources */, + D77061A125DE51E900E08916 /* BidirectionalCollectionLayout.swift in Sources */, D776BD4B25CD927B00E92BD4 /* SwipeSelectingGestureRecognizer.swift in Sources */, D776BD3025CAA43F00E92BD4 /* MadeScheduleViewController.swift in Sources */, D76D330725C27C9400E67DB2 /* LoginViewController.swift in Sources */, - D77E3B9225BEE62100BC8BB6 /* DIYcalendarCell.swift in Sources */, D77E3B7E25BE8B0B00BC8BB6 /* InputScheduleViewController.swift in Sources */, D770606725D7B01700E08916 /* confirmedEventsTableViewCell.swift in Sources */, - D77E3BBB25C1031B00BC8BB6 /* UIView+Border.swift in Sources */, + D77E3BBB25C1031B00BC8BB6 /* UIView+Inspectable.swift in Sources */, D7BE6F9925C7D3A500D6E708 /* Schedule.swift in Sources */, - D776BD2A25CA99D500E92BD4 /* UIImage+Scale.swift in Sources */, + D776BD2A25CA99D500E92BD4 /* UIImage+Extension.swift in Sources */, D713739425BB18DF00DBF96B /* TimeZoneHeader.swift in Sources */, - D752C9E52595D30E005A4889 /* ViewController.swift in Sources */, D77E3B8625BE90AC00BC8BB6 /* HomeViewController.swift in Sources */, D770606025D7B00900E08916 /* enteredEventsTableViewCell.swift in Sources */, D71373A125BBBD4400DBF96B /* TimeZoneCell.swift in Sources */, @@ -632,8 +690,10 @@ D7BE6F9F25C7D7C500D6E708 /* testdata.json in Sources */, D71373AB25BD455600DBF96B /* MakeScheduleViewController.swift in Sources */, D776BCFD25CA930800E92BD4 /* TimezoneStatus.swift in Sources */, + D770610325DA67E200E08916 /* EventDetailViewController.swift in Sources */, D770605925D7AFEE00E08916 /* unenteredEventsTableViewCell.swift in Sources */, - D770606D25D7BAF100E08916 /* UITableViewCell+NIb+Identifier+config.swift in Sources */, + D7B67B3225DFC9EA00480873 /* TimezoneToSchedule.swift in Sources */, + D770606D25D7BAF100E08916 /* UITableViewCell+Extension.swift in Sources */, D752C9E32595D30E005A4889 /* SceneDelegate.swift in Sources */, D770604625D7872D00E08916 /* didInputScheduleViewController.swift in Sources */, D77E3B9825BEED8600BC8BB6 /* CalendarCell.swift in Sources */, @@ -672,14 +732,6 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - D752C9E62595D30E005A4889 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - D752C9E72595D30E005A4889 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; D752C9EB2595D312005A4889 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( diff --git a/FixerApp/AppDelegate.swift b/FixerApp/AppDelegate.swift index a7ff013..2869345 100644 --- a/FixerApp/AppDelegate.swift +++ b/FixerApp/AppDelegate.swift @@ -22,8 +22,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { LoginManager.shared.setup(channelID: Key.LineChannelID, universalLinkURL: nil) let window = UIWindow(frame: UIScreen.main.bounds) - window.rootViewController = UINavigationController(rootViewController: HomeTabViewController()) -// window.rootViewController = UINavigationController(rootViewController: LoginViewController()) +// window.rootViewController = UINavigationController(rootViewController: EventDetailViewController()) + window.rootViewController = UINavigationController(rootViewController: LoginViewController()) self.window = window self.window?.makeKeyAndVisible() diff --git a/FixerApp/Entity/TimezoneToSchedule.swift b/FixerApp/Entity/TimezoneToSchedule.swift new file mode 100644 index 0000000..9cde19f --- /dev/null +++ b/FixerApp/Entity/TimezoneToSchedule.swift @@ -0,0 +1,39 @@ +// +// TimezoneToSchedule.swift +// FixerApp +// +// Created by 化田晃平 on R 3/02/19. +// + +import Foundation + +class TimezoneToSchedule { + static let shared = TimezoneToSchedule() + + func scheduleDataInit(timezones: [Timezone]) { + +// TODO: +// //[Timezone]の数だけ繰り返し +// var index = 0 +// for timezone in timezones { +// +// var i = 0 +// //selectedDateから行番号を特定 +// for date in selectedDate { +// if date.compare(timezone.date) == .orderedSame { +// break +// } +// i += 1 +// } +// +// //開始時間からの計算を行なってselectedDataの値を決定 +// var j = timezones[index].from - 16 //16時からの調整なので定義しているが後々変更する +// while j < timezones[index].to - 16 { +// scheduleData[i][j] = timezones[index].timezoneStatus() +// j += 1 +// } +// index += 1 +// } + } + +} diff --git a/FixerApp/Extension/BidirectionalCollectionLayout.swift b/FixerApp/Extension/BidirectionalCollectionLayout.swift new file mode 100644 index 0000000..5869137 --- /dev/null +++ b/FixerApp/Extension/BidirectionalCollectionLayout.swift @@ -0,0 +1,117 @@ +import UIKit + +final class BidirectionalCollectionLayout: UICollectionViewFlowLayout { + + weak var delegate: UICollectionViewDelegateFlowLayout? + + private var layoutInfo: [IndexPath : UICollectionViewLayoutAttributes] = [:] + private var maxRowsWidth: CGFloat = 0 + private var maxColumnHeight: CGFloat = 0 + + //列間のマージン + private let marginInterItemsForSection : Int = 1 + //セクション間のマージン + private let marginInterSection : Int = 1 + + private func calcMaxRowsWidth() { + guard + let collectionView = self.collectionView, + let delegate = self.delegate + else { return } + var maxRowWidth: CGFloat = 0 + for section in 0.. maxRowWidth ? maxWidth : maxRowWidth + } + + self.maxRowsWidth = maxRowWidth + CGFloat( marginInterItemsForSection * (collectionView.numberOfSections - 1)) + } + + private func calcMaxColumnHeight() { + + guard + let collectionView = self.collectionView, + let delegate = self.delegate + else { return } + + var maxHeight: CGFloat = 0 + for section in 0.. maxRowHeight ? itemSize.height : maxRowHeight + } + maxHeight += maxRowHeight + } + + self.maxColumnHeight = maxHeight + CGFloat( marginInterSection * (collectionView.numberOfSections - 1)) + } + + private func calcCellLayoutInfo() { + + guard + let collectionView = self.collectionView, + let delegate = self.delegate + else { return } + + var cellLayoutInfo: [IndexPath : UICollectionViewLayoutAttributes] = [:] + + var originY: CGFloat = 0 + + for section in 0.. itemSize.height ? height : itemSize.height + } + originY += height + CGFloat( marginInterSection ) + } + + self.layoutInfo = cellLayoutInfo + } + + override func prepare() { + self.delegate = self.collectionView?.delegate as? UICollectionViewDelegateFlowLayout + self.calcMaxRowsWidth() + self.calcMaxColumnHeight() + self.calcCellLayoutInfo() + } + + override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? { + + var allAttributes: [UICollectionViewLayoutAttributes] = [] + for attributes in self.layoutInfo.values { + + if rect.intersects(attributes.frame) { + allAttributes.append(attributes) + } + } + return allAttributes + } + + override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? { + + return self.layoutInfo[indexPath] + } + + override var collectionViewContentSize: CGSize { + return CGSize(width: self.maxRowsWidth, height: self.maxColumnHeight) + } + +} diff --git a/FixerApp/Extension/UIImage+Scale.swift b/FixerApp/Extension/UIImage+Extension.swift similarity index 96% rename from FixerApp/Extension/UIImage+Scale.swift rename to FixerApp/Extension/UIImage+Extension.swift index c678635..e415a8f 100644 --- a/FixerApp/Extension/UIImage+Scale.swift +++ b/FixerApp/Extension/UIImage+Extension.swift @@ -1,5 +1,5 @@ // -// UIImage+Scale.swift +// UIImage+Extension.swift // FixerApp // // Created by 化田晃平 on R 3/02/03. diff --git a/FixerApp/Extension/UITableViewCell+NIb+Identifier+config.swift b/FixerApp/Extension/UITableViewCell+Extension.swift similarity index 86% rename from FixerApp/Extension/UITableViewCell+NIb+Identifier+config.swift rename to FixerApp/Extension/UITableViewCell+Extension.swift index 190bdc5..c887512 100644 --- a/FixerApp/Extension/UITableViewCell+NIb+Identifier+config.swift +++ b/FixerApp/Extension/UITableViewCell+Extension.swift @@ -1,5 +1,5 @@ // -// UITableViewCell+NIb+Identifier.swift +// UITableViewCell+Extension.swift // FixerApp // // Created by 化田晃平 on R 3/02/13. diff --git a/FixerApp/Extension/UIView+Border.swift b/FixerApp/Extension/UIView+Inspectable.swift similarity index 98% rename from FixerApp/Extension/UIView+Border.swift rename to FixerApp/Extension/UIView+Inspectable.swift index 185ef08..4828584 100644 --- a/FixerApp/Extension/UIView+Border.swift +++ b/FixerApp/Extension/UIView+Inspectable.swift @@ -1,5 +1,5 @@ // -// UIView+Border.swift +// UIView+Inspectable.swift // FixerApp // // Created by 化田晃平 on R 3/01/27. diff --git a/FixerApp/SceneDelegate.swift b/FixerApp/SceneDelegate.swift index 24b404c..428de60 100644 --- a/FixerApp/SceneDelegate.swift +++ b/FixerApp/SceneDelegate.swift @@ -22,8 +22,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { guard let windowScene = (scene as? UIWindowScene) else { return } let window = UIWindow(windowScene: windowScene) self.window = window - window.rootViewController = UINavigationController(rootViewController: HomeTabViewController()) -// window.rootViewController = UINavigationController(rootViewController: LoginViewController()) +// window.rootViewController = UINavigationController(rootViewController: EventDetailViewController()) +// window.rootViewController = UINavigationController(rootViewController: HomeTabViewController()) + window.rootViewController = UINavigationController(rootViewController: LoginViewController()) window.makeKeyAndVisible() } diff --git a/FixerApp/ViewController/MadeScheduleViewController.swift b/FixerApp/ViewController/MadeScheduleViewController.swift deleted file mode 100644 index 7fe710c..0000000 --- a/FixerApp/ViewController/MadeScheduleViewController.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// MadeScheduleViewController.swift -// FixerApp -// -// Created by 化田晃平 on R 3/02/03. -// - -import UIKit - -class MadeScheduleViewController: UIViewController { - @IBOutlet weak var closeButton: UIButton! - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - @IBAction func closeButtonTapped(_ sender: Any) { - dismiss(animated: true) - } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/FixerApp/ViewController/Main(deleted)/Base.lproj/Main.storyboard b/FixerApp/ViewController/Main(deleted)/Base.lproj/Main.storyboard deleted file mode 100644 index 8cdc54f..0000000 --- a/FixerApp/ViewController/Main(deleted)/Base.lproj/Main.storyboard +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FixerApp/ViewController/Main(deleted)/DIYcalendarCell.swift b/FixerApp/ViewController/Main(deleted)/DIYcalendarCell.swift deleted file mode 100644 index b8d9143..0000000 --- a/FixerApp/ViewController/Main(deleted)/DIYcalendarCell.swift +++ /dev/null @@ -1,88 +0,0 @@ - -// -// DIYCalendarCell.swift -// FSCalendarSwiftExample -// -// Created by dingwenchao on 06/11/2016. -// Copyright © 2016 wenchao. All rights reserved. -// -import Foundation -import UIKit -import FSCalendar - -enum SelectType : Int { - case none - case single - case leftBorder - case middle - case rightBorder -} - - -class DIYCalendarCell: FSCalendarCell { - - weak var circleImageView: UIImageView! - weak var selectionLayer: CAShapeLayer! - - var selectionType: SelectType = .none { - didSet { - setNeedsLayout() - } - } - - required init!(coder aDecoder: NSCoder!) { - fatalError("init(coder:) has not been implemented") - } - - override init(frame: CGRect) { - super.init(frame: frame) - - let circleImageView = UIImageView(image: UIImage(named: "circle")!) - self.contentView.insertSubview(circleImageView, at: 0) - self.circleImageView = circleImageView - - let selectionLayer = CAShapeLayer() - selectionLayer.fillColor = UIColor.black.cgColor - selectionLayer.actions = ["hidden": NSNull()] - self.contentView.layer.insertSublayer(selectionLayer, below: self.titleLabel!.layer) - self.selectionLayer = selectionLayer - - self.shapeLayer.isHidden = true - - let view = UIView(frame: self.bounds) - view.backgroundColor = UIColor.lightGray.withAlphaComponent(0.12) - self.backgroundView = view; - - } - - override func layoutSubviews() { - super.layoutSubviews() - self.circleImageView.frame = self.contentView.bounds - self.backgroundView?.frame = self.bounds.insetBy(dx: 1, dy: 1) - self.selectionLayer.frame = self.contentView.bounds - - if selectionType == .middle { - self.selectionLayer.path = UIBezierPath(rect: self.selectionLayer.bounds).cgPath - } - else if selectionType == .leftBorder { - self.selectionLayer.path = UIBezierPath(roundedRect: self.selectionLayer.bounds, byRoundingCorners: [.topLeft, .bottomLeft], cornerRadii: CGSize(width: self.selectionLayer.frame.width / 2, height: self.selectionLayer.frame.width / 2)).cgPath - } - else if selectionType == .rightBorder { - self.selectionLayer.path = UIBezierPath(roundedRect: self.selectionLayer.bounds, byRoundingCorners: [.topRight, .bottomRight], cornerRadii: CGSize(width: self.selectionLayer.frame.width / 2, height: self.selectionLayer.frame.width / 2)).cgPath - } - else if selectionType == .single { - let diameter: CGFloat = min(self.selectionLayer.frame.height, self.selectionLayer.frame.width) - self.selectionLayer.path = UIBezierPath(ovalIn: CGRect(x: self.contentView.frame.width / 2 - diameter / 2, y: self.contentView.frame.height / 2 - diameter / 2, width: diameter, height: diameter)).cgPath - } - } - - override func configureAppearance() { - super.configureAppearance() - // Override the build-in appearance configuration - if self.isPlaceholder { - self.eventIndicator.isHidden = true - self.titleLabel.textColor = UIColor.lightGray - } - } - -} diff --git a/FixerApp/ViewController/Main(deleted)/ViewController.swift b/FixerApp/ViewController/Main(deleted)/ViewController.swift deleted file mode 100644 index 9b7352b..0000000 --- a/FixerApp/ViewController/Main(deleted)/ViewController.swift +++ /dev/null @@ -1,124 +0,0 @@ -// -// ViewController.swift -// FixerApp -// -// Created by 化田晃平 on R 2/12/25. -// - -import UIKit - -class ViewController: UIViewController { - - private var selectedStatus: TimeZoneStatus = .unavailable - private var selectedDate: [Date] = [] - private var scheduleData: [[ TimeZoneStatus ]] = [[]] - - @IBOutlet weak var timeZoneColectionView: UICollectionView!{ - didSet{ - timeZoneColectionView.delegate = self - timeZoneColectionView.dataSource = self - } - } - @IBOutlet weak var buttonCircle: UIButton! - @IBOutlet weak var buttonTriangle: UIButton! - @IBOutlet weak var buttonCross: UIButton! - @IBOutlet weak var buttonSend: UIButton! - - override func viewDidLoad() { - super.viewDidLoad() - - buttonCircle.layer.cornerRadius = 30 - buttonTriangle.layer.cornerRadius = 30 - buttonCross.layer.cornerRadius = 30 - buttonSend.layer.cornerRadius = 10 - - self.view.backgroundColor = .gray - - let layout = UICollectionViewFlowLayout() - layout.headerReferenceSize = CGSize(width: self.view.bounds.width, height: 30.0) - layout.sectionInset = UIEdgeInsets(top:10, left:30, bottom:10, right: 30) - layout.minimumInteritemSpacing = 1 - let size = UIScreen.main.bounds.size - layout.itemSize = CGSize(width: (size.width - 70) / 8, height: 60) - - timeZoneColectionView.collectionViewLayout = layout - timeZoneColectionView.register(UINib(nibName: "TimeZoneCell", bundle: nil), forCellWithReuseIdentifier: "timeZoneCell") - timeZoneColectionView.register(UINib(nibName: "TimeZoneHeader", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "timeZoneHeader") - - let calendar = Calendar(identifier: .gregorian) - let date = calendar.date(from: DateComponents(year: 2021, month: 1, day: 1)) - var dateComponents = calendar.dateComponents([.year,.month,.day], from: date!) - dateComponents.month = 2 - - for day in 1...28 { - dateComponents.day! = day - selectedDate.append(calendar.date(from:dateComponents)!) - } - - scheduleData = [[TimeZoneStatus]](repeating: [ TimeZoneStatus ](repeating: .unavailable, count: 8), count: selectedDate.count) - } - - @IBAction func buttonCircleTapped(_ sender: Any) { - selectedStatus = .available - } - @IBAction func buttonTriangleTapped(_ sender: Any) { - selectedStatus = .undecided - } - @IBAction func buttonCrossTapped(_ sender: Any) { - selectedStatus = .unavailable - } - @IBAction func buttonSendtapped(_ sender: Any) { - print("send") - } -} - -extension ViewController: UICollectionViewDelegate{ - func numberOfSections(in collectionView: UICollectionView) -> Int { - return selectedDate.count - } - - - - func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView { - - let df = DateFormatter() - df.dateFormat = "yyyy年MM月dd日" - - if(kind == "UICollectionElementKindSectionHeader"){ - let header = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "timeZoneHeader", for: indexPath) as! TimeZoneHeader - header.backgroundColor = .gray - header.dateLabel.text = df.string(from: selectedDate[indexPath.section]) - return header - } - return UICollectionReusableView() - } - - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - let item = collectionView.cellForItem(at: indexPath) as! TimeZoneCell - scheduleData[indexPath.section][indexPath.row] = selectedStatus - item.contentView.backgroundColor = selectedStatus.color() -// print(indexPath) - } - - - func collectionView(_ collectionView: UICollectionView, shouldBeginMultipleSelectionInteractionAt indexPath: IndexPath) -> Bool { - return true - } -} - - -extension ViewController: UICollectionViewDataSource{ - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return 8 - } - - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - let timezones = ["16〜17","〜18","〜19","〜20","〜21","〜22","〜23","〜24"] - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "timeZoneCell", for: indexPath) as! TimeZoneCell - let timezoneStatus = scheduleData[indexPath.section][indexPath.row] - cell.contentView.backgroundColor = timezoneStatus.color() - cell.timezoneLabel.text = timezones[indexPath.row] - cell.layer.cornerRadius = 5 - return cell - } -} diff --git a/FixerApp/ViewController/didInputScheduleViewController.swift b/FixerApp/ViewController/didInputScheduleViewController.swift deleted file mode 100644 index bcb64bb..0000000 --- a/FixerApp/ViewController/didInputScheduleViewController.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// didInputScheduleViewController.swift -// FixerApp -// -// Created by 化田晃平 on R 3/02/13. -// - -import UIKit - -class didInputScheduleViewController: UIViewController { - @IBOutlet weak var closeButton: UIButton! - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - @IBAction func closeButtonTapped(_ sender: Any) { - dismiss(animated: true) - } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/FixerApp/View/CalendarCell.swift b/FixerApp/Views/Cells/CalendarCell.swift similarity index 98% rename from FixerApp/View/CalendarCell.swift rename to FixerApp/Views/Cells/CalendarCell.swift index fa90c3f..ea27013 100644 --- a/FixerApp/View/CalendarCell.swift +++ b/FixerApp/Views/Cells/CalendarCell.swift @@ -5,6 +5,7 @@ // Created by 化田晃平 on R 3/01/25. // + import Foundation import UIKit import FSCalendar @@ -25,7 +26,6 @@ class CalendarCell: FSCalendarCell { override func awakeFromNib() { super.awakeFromNib() - // Initialization code } var selectionType: SelectionType = .none { @@ -41,6 +41,8 @@ class CalendarCell: FSCalendarCell { override init(frame: CGRect) { super.init(frame: frame) +// TODO: カレンダーのセルの内容を編集する。 + // let circleImageView = UIImageView(image: UIImage(named: "circle")!) // self.contentView.insertSubview(circleImageView, at: 0) // self.circleImageView = circleImageView diff --git a/FixerApp/View/CalendarCell.xib b/FixerApp/Views/Cells/CalendarCell.xib similarity index 100% rename from FixerApp/View/CalendarCell.xib rename to FixerApp/Views/Cells/CalendarCell.xib diff --git a/FixerApp/View/TimeZoneCell.swift b/FixerApp/Views/Cells/TimeZoneCell.swift similarity index 92% rename from FixerApp/View/TimeZoneCell.swift rename to FixerApp/Views/Cells/TimeZoneCell.swift index b99779a..d794ece 100644 --- a/FixerApp/View/TimeZoneCell.swift +++ b/FixerApp/Views/Cells/TimeZoneCell.swift @@ -13,11 +13,9 @@ class TimeZoneCell: UICollectionViewCell { override func awakeFromNib() { super.awakeFromNib() - // Initialization code } override func prepareForReuse() { status = .unavailable } - } diff --git a/FixerApp/View/TimeZoneCell.xib b/FixerApp/Views/Cells/TimeZoneCell.xib similarity index 89% rename from FixerApp/View/TimeZoneCell.xib rename to FixerApp/Views/Cells/TimeZoneCell.xib index 742e8b9..ece32e4 100644 --- a/FixerApp/View/TimeZoneCell.xib +++ b/FixerApp/Views/Cells/TimeZoneCell.xib @@ -16,8 +16,8 @@ -