From d939f912fafe46ed046ebad8ad01c265dc63abc6 Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sat, 21 Sep 2024 11:08:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[196]=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E7=A7=BB=E8=A1=8C=E3=80=81=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?= =?UTF-8?q?=E8=A3=85=E9=A3=BE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AkidonComponents/AkidonComponents.h | 18 - Entity/Entity.h | 18 - Features/Features.h | 18 - univIP.xcodeproj/project.pbxproj | 584 +----------------- .../AkidonComponents}/AKLibrary.swift | 12 +- .../AkidonComponents}/CustomDuoButton.swift | 36 +- .../DateFormatter+Exetnsion.swift | 0 .../AkidonComponents}/String+Exetnsion.swift | 0 .../AkidonComponents}/UIColor+Exetnsion.swift | 0 .../UIImageView+Exetnsion.swift | 0 .../Entity}/ActivityIndicatorState.swift | 2 +- {Entity => univIP/Entity}/AdItem.swift | 24 +- {Entity => univIP/Entity}/AdItems.swift | 10 +- .../Entity}/CreditItemModel.swift | 12 +- .../Entity}/HomeEventInfos.swift | 60 +- .../Entity}/HomeMiniSettingsItem.swift | 16 +- .../Entity}/MenuDetailItem.swift | 20 +- {Entity => univIP/Entity}/MenuItem.swift | 18 +- {Entity => univIP/Entity}/NewsItemModel.swift | 10 +- {Entity => univIP/Entity}/SettingsItem.swift | 16 +- {Entity => univIP/Entity}/UnivAuth.swift | 10 +- .../Entity}/WebScrapeError.swift | 2 +- .../Features}/AdItemsAPI.swift | 40 +- .../Features}/CurrentTermVersionAPI.swift | 36 +- .../Features}/GenericAPI.swift | 0 .../Features}/HelpmessegeAgreeAPI.swift | 38 +- .../Features}/HomeEventInfosAPI.swift | 42 +- .../Features}/LibraryCalendarWebScraper.swift | 20 +- .../Features}/NewsItemsRSS.swift | 22 +- .../Features}/NumberOfUsersAPI.swift | 38 +- .../Features}/TermTextAPI.swift | 38 +- 31 files changed, 264 insertions(+), 896 deletions(-) delete mode 100644 AkidonComponents/AkidonComponents.h delete mode 100644 Entity/Entity.h delete mode 100644 Features/Features.h rename {AkidonComponents => univIP/AkidonComponents}/AKLibrary.swift (93%) rename {AkidonComponents => univIP/AkidonComponents}/CustomDuoButton.swift (81%) rename {AkidonComponents => univIP/AkidonComponents}/DateFormatter+Exetnsion.swift (100%) rename {AkidonComponents => univIP/AkidonComponents}/String+Exetnsion.swift (100%) rename {AkidonComponents => univIP/AkidonComponents}/UIColor+Exetnsion.swift (100%) rename {AkidonComponents => univIP/AkidonComponents}/UIImageView+Exetnsion.swift (100%) rename {Entity => univIP/Entity}/ActivityIndicatorState.swift (78%) rename {Entity => univIP/Entity}/AdItem.swift (68%) rename {Entity => univIP/Entity}/AdItems.swift (51%) rename {Entity => univIP/Entity}/CreditItemModel.swift (50%) rename {Entity => univIP/Entity}/HomeEventInfos.swift (61%) rename {Entity => univIP/Entity}/HomeMiniSettingsItem.swift (62%) rename {Entity => univIP/Entity}/MenuDetailItem.swift (89%) rename {Entity => univIP/Entity}/MenuItem.swift (59%) rename {Entity => univIP/Entity}/NewsItemModel.swift (50%) rename {Entity => univIP/Entity}/SettingsItem.swift (68%) rename {Entity => univIP/Entity}/UnivAuth.swift (52%) rename {Entity => univIP/Entity}/WebScrapeError.swift (86%) rename {Features => univIP/Features}/AdItemsAPI.swift (74%) rename {Features => univIP/Features}/CurrentTermVersionAPI.swift (66%) rename {Features => univIP/Features}/GenericAPI.swift (100%) rename {Features => univIP/Features}/HelpmessegeAgreeAPI.swift (65%) rename {Features => univIP/Features}/HomeEventInfosAPI.swift (70%) rename {Features => univIP/Features}/LibraryCalendarWebScraper.swift (85%) rename {Features => univIP/Features}/NewsItemsRSS.swift (89%) rename {Features => univIP/Features}/NumberOfUsersAPI.swift (65%) rename {Features => univIP/Features}/TermTextAPI.swift (65%) diff --git a/AkidonComponents/AkidonComponents.h b/AkidonComponents/AkidonComponents.h deleted file mode 100644 index eae807a2..00000000 --- a/AkidonComponents/AkidonComponents.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// AkidonComponents.h -// AkidonComponents -// -// Created by Akihiro Matsuyama on 2023/11/11. -// - -#import - -//! Project version number for AkidonComponents. -FOUNDATION_EXPORT double AkidonComponentsVersionNumber; - -//! Project version string for AkidonComponents. -FOUNDATION_EXPORT const unsigned char AkidonComponentsVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Entity/Entity.h b/Entity/Entity.h deleted file mode 100644 index ea6b19df..00000000 --- a/Entity/Entity.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// Entity.h -// Entity -// -// Created by Akihiro Matsuyama on 2023/09/12. -// - -#import - -//! Project version number for Entity. -FOUNDATION_EXPORT double EntityVersionNumber; - -//! Project version string for Entity. -FOUNDATION_EXPORT const unsigned char EntityVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Features/Features.h b/Features/Features.h deleted file mode 100644 index 47a7f450..00000000 --- a/Features/Features.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// Features.h -// Features -// -// Created by Akihiro Matsuyama on 2023/11/11. -// - -#import - -//! Project version number for Features. -FOUNDATION_EXPORT double FeaturesVersionNumber; - -//! Project version string for Features. -FOUNDATION_EXPORT const unsigned char FeaturesVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/univIP.xcodeproj/project.pbxproj b/univIP.xcodeproj/project.pbxproj index 5a22b244..8e8d8831 100644 --- a/univIP.xcodeproj/project.pbxproj +++ b/univIP.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 0308162845A03F8D8FE6E237 /* Pods_All_Features.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D88EA7D16C88FCE4923FF9 /* Pods_All_Features.framework */; }; 15768A932C9DDE70006F81C1 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 15768A922C9DDE70006F81C1 /* GoogleService-Info.plist */; }; 15768A952C9DE129006F81C1 /* GoogleService-Info.template.plist in Resources */ = {isa = PBXBuildFile; fileRef = 15768A942C9DE129006F81C1 /* GoogleService-Info.template.plist */; }; 1A11C3D12A95240500D95122 /* CreditsRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3D02A95240500D95122 /* CreditsRouter.swift */; }; @@ -38,21 +37,6 @@ 1A2B04D02AAF5DEF0085188A /* UnivNewsTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ACB59AC291D11CD005A90BE /* UnivNewsTableCell.swift */; }; 1A2B04D42AAF5DEF0085188A /* UnivBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9378B12A6294C6009A5758 /* UnivBannerView.swift */; }; 1A2B04D62AAF5DEF0085188A /* HomeMenuCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A30D0A728F5BFB500C4012E /* HomeMenuCollectionCell.swift */; }; - 1A2B04DF2AAFE5E60085188A /* Entity.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2B04DE2AAFE5E60085188A /* Entity.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1A2B04E22AAFE5E60085188A /* Entity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2B04DC2AAFE5E60085188A /* Entity.framework */; }; - 1A2B04E32AAFE5E60085188A /* Entity.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A2B04DC2AAFE5E60085188A /* Entity.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1A2B04E72AAFE6120085188A /* CreditItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3DB2A952B7400D95122 /* CreditItemModel.swift */; }; - 1A2B04E82AAFE6120085188A /* AdItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A1A4E102A09FE75003A343B /* AdItem.swift */; }; - 1A2B04E92AAFE6120085188A /* HomeMiniSettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A58F67A2A85551E0025737A /* HomeMiniSettingsItem.swift */; }; - 1A2B04EA2AAFE6120085188A /* HomeEventInfos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8E6C52A9DA153001EF99F /* HomeEventInfos.swift */; }; - 1A2B04EB2AAFE6120085188A /* UnivAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AED5D052A90C2DB0090B8DE /* UnivAuth.swift */; }; - 1A2B04EC2AAFE6120085188A /* MenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A085CEB2A694AD200D31183 /* MenuItem.swift */; }; - 1A2B04ED2AAFE6120085188A /* MenuDetailItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A58F6762A8532520025737A /* MenuDetailItem.swift */; }; - 1A2B04EE2AAFE6120085188A /* WebScrapeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A762FCD2A93947200F60DFA /* WebScrapeError.swift */; }; - 1A2B04EF2AAFE6120085188A /* NewsItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AE816B72A836D9F00B8DA64 /* NewsItemModel.swift */; }; - 1A2B04F02AAFE6120085188A /* SettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A085CED2A694B9300D31183 /* SettingsItem.swift */; }; - 1A2B04F12AAFE6120085188A /* AdItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C4002A971C3500D95122 /* AdItems.swift */; }; - 1A2B04F22AAFE6120085188A /* ActivityIndicatorState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A3B75B22A93BBAF00E96B60 /* ActivityIndicatorState.swift */; }; 1A30D0AE28F6D79800C4012E /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A30D0AD28F6D79800C4012E /* WebViewController.swift */; }; 1A30D0B028F6D7BC00C4012E /* Web.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A30D0AF28F6D7BC00C4012E /* Web.storyboard */; }; 1A30D0BB28F9C14200C4012E /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A30D0BA28F9C14200C4012E /* SettingsViewController.swift */; }; @@ -72,32 +56,11 @@ 1A5FAF8D2779B8FB0008A077 /* UrlTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A5FAF8C2779B8FB0008A077 /* UrlTests.swift */; }; 1A625CFE2AFE1020007CA0FE /* CreditsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A625CFD2AFE1020007CA0FE /* CreditsViewModelTests.swift */; }; 1A63062C2944B48600205C7C /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A63062B2944B48600205C7C /* SettingsViewModel.swift */; }; - 1A6B56632AFF8CBD00C1771F /* Features.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B56622AFF8CBD00C1771F /* Features.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1A6B56662AFF8CBD00C1771F /* Features.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B56602AFF8CBD00C1771F /* Features.framework */; }; - 1A6B56672AFF8CBD00C1771F /* Features.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B56602AFF8CBD00C1771F /* Features.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1A6B566B2AFF8CC800C1771F /* NewsItemsRSS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AE816BE2A838C0100B8DA64 /* NewsItemsRSS.swift */; }; - 1A6B566C2AFF8CC800C1771F /* GenericAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A762FCA2A9381D900F60DFA /* GenericAPI.swift */; }; - 1A6B566D2AFF8CC800C1771F /* TermTextAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A02301A2A8F98BF0084DD0B /* TermTextAPI.swift */; }; - 1A6B566E2AFF8CC800C1771F /* HomeEventInfosAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8E6C12A9DA038001EF99F /* HomeEventInfosAPI.swift */; }; - 1A6B566F2AFF8CC800C1771F /* NumberOfUsersAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0230162A8F94680084DD0B /* NumberOfUsersAPI.swift */; }; - 1A6B56702AFF8CC800C1771F /* HelpmessegeAgreeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AED5D0E2A9119180090B8DE /* HelpmessegeAgreeAPI.swift */; }; - 1A6B56712AFF8CC800C1771F /* CurrentTermVersionAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0230182A8F96490084DD0B /* CurrentTermVersionAPI.swift */; }; - 1A6B56722AFF8CC800C1771F /* AdItemsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A3A75F92916792600069818 /* AdItemsAPI.swift */; }; - 1A6B56732AFF8CD700C1771F /* LibraryCalendarWebScraper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A0C602A8B1DD500342186 /* LibraryCalendarWebScraper.swift */; }; - 1A6B567D2AFF91B800C1771F /* AkidonComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B567C2AFF91B800C1771F /* AkidonComponents.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1A6B56802AFF91B800C1771F /* AkidonComponents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B567A2AFF91B800C1771F /* AkidonComponents.framework */; }; - 1A6B56812AFF91B800C1771F /* AkidonComponents.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B567A2AFF91B800C1771F /* AkidonComponents.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1A6B56852AFF91D100C1771F /* AKLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A41EAE2272914CC0064CDB7 /* AKLibrary.swift */; }; - 1A6B56862AFF91F500C1771F /* UIColor+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADE675D2A77A13E00B79D69 /* UIColor+Exetnsion.swift */; }; - 1A6B56872AFF91F500C1771F /* DateFormatter+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6EF50E27BA5C63004D0B2C /* DateFormatter+Exetnsion.swift */; }; - 1A6B56882AFF91F500C1771F /* UIImageView+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A30D0B128F6ED2E00C4012E /* UIImageView+Exetnsion.swift */; }; - 1A6B56892AFF91F500C1771F /* String+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A556D912963BD4B00A650B2 /* String+Exetnsion.swift */; }; 1A6C51B02904E82900A3E85A /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A6C51AF2904E82900A3E85A /* Home.storyboard */; }; 1A6C51B62904ED2400A3E85A /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A6C51B52904ED2400A3E85A /* Settings.storyboard */; }; 1A6C51B82905072500A3E85A /* NewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6C51B72905072500A3E85A /* NewsViewController.swift */; }; 1A6C51BA2905077E00A3E85A /* ClubListsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6C51B92905077E00A3E85A /* ClubListsViewController.swift */; }; 1A9378A42A60E6BC009A5758 /* BannerScrollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9378A32A60E6BC009A5758 /* BannerScrollViewController.swift */; }; - 1A9A15732BA41DE7008BB77E /* CustomDuoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9A15722BA41DE7008BB77E /* CustomDuoButton.swift */; }; 1AB8EF4C2B99EC350048ADEB /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 1AB8EF4B2B99EC350048ADEB /* FirebaseCrashlytics */; }; 1ABDE75526DE534300D4B04E /* AgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ABDE75426DE534300D4B04E /* AgreementViewController.swift */; }; 1ABE8BC127B10402001EEA79 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ABE8BBD27B10402001EEA79 /* HomeViewModel.swift */; }; @@ -125,27 +88,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 1A2B04E02AAFE5E60085188A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AA056C126BD2AE100343005 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1A2B04DB2AAFE5E50085188A; - remoteInfo = Entity; - }; - 1A6B56642AFF8CBD00C1771F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AA056C126BD2AE100343005 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1A6B565F2AFF8CBD00C1771F; - remoteInfo = Features; - }; - 1A6B567E2AFF91B800C1771F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AA056C126BD2AE100343005 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1A6B56792AFF91B800C1771F; - remoteInfo = AkidonComponents; - }; 1AB37B7126FDFCEA008A2D2F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AA056C126BD2AE100343005 /* Project object */; @@ -169,9 +111,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 1A6B56672AFF8CBD00C1771F /* Features.framework in Embed Frameworks */, - 1A2B04E32AAFE5E60085188A /* Entity.framework in Embed Frameworks */, - 1A6B56812AFF91B800C1771F /* AkidonComponents.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -214,8 +153,6 @@ 1A239B592A84A90D0085BA46 /* PRRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PRRouter.swift; sourceTree = ""; }; 1A239B5B2A84A9C30085BA46 /* PRViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PRViewModel.swift; sourceTree = ""; }; 1A26A2602A77FB3C00BC6988 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = SOURCE_ROOT; }; - 1A2B04DC2AAFE5E60085188A /* Entity.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Entity.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1A2B04DE2AAFE5E60085188A /* Entity.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Entity.h; sourceTree = ""; }; 1A30D0A728F5BFB500C4012E /* HomeMenuCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMenuCollectionCell.swift; sourceTree = ""; }; 1A30D0AD28F6D79800C4012E /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = ""; }; 1A30D0AF28F6D7BC00C4012E /* Web.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Web.storyboard; sourceTree = ""; }; @@ -241,10 +178,6 @@ 1A625CFD2AFE1020007CA0FE /* CreditsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditsViewModelTests.swift; sourceTree = ""; }; 1A63062B2944B48600205C7C /* SettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = ""; }; 1A6A0C602A8B1DD500342186 /* LibraryCalendarWebScraper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibraryCalendarWebScraper.swift; sourceTree = ""; }; - 1A6B56602AFF8CBD00C1771F /* Features.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Features.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1A6B56622AFF8CBD00C1771F /* Features.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Features.h; sourceTree = ""; }; - 1A6B567A2AFF91B800C1771F /* AkidonComponents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AkidonComponents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1A6B567C2AFF91B800C1771F /* AkidonComponents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AkidonComponents.h; sourceTree = ""; }; 1A6C51AF2904E82900A3E85A /* Home.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Home.storyboard; sourceTree = ""; }; 1A6C51B52904ED2400A3E85A /* Settings.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = ""; }; 1A6C51B72905072500A3E85A /* NewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsViewController.swift; sourceTree = ""; }; @@ -328,39 +261,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 1A2B04D92AAFE5E50085188A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B565D2AFF8CBD00C1771F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 0308162845A03F8D8FE6E237 /* Pods_All_Features.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B56772AFF91B800C1771F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1AA056C626BD2AE100343005 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1A2B04E22AAFE5E60085188A /* Entity.framework in Frameworks */, - 1A6B56662AFF8CBD00C1771F /* Features.framework in Frameworks */, 1A46BF202B99EEDB00EE247A /* FirebaseAnalytics in Frameworks */, 1A46BF222B99EEDB00EE247A /* FirebaseAnalyticsOnDeviceConversion in Frameworks */, 1A46BF242B99EEDB00EE247A /* FirebaseAnalyticsSwift in Frameworks */, 1AB8EF4C2B99EC350048ADEB /* FirebaseCrashlytics in Frameworks */, - 1A6B56802AFF91B800C1771F /* AkidonComponents.framework in Frameworks */, 289B97577FB6928B87B3976A /* Pods_All_univIP.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -431,7 +339,6 @@ 1A2B04DD2AAFE5E60085188A /* Entity */ = { isa = PBXGroup; children = ( - 1A2B04DE2AAFE5E60085188A /* Entity.h */, 1A3B75B22A93BBAF00E96B60 /* ActivityIndicatorState.swift */, 1A1A4E102A09FE75003A343B /* AdItem.swift */, 1A11C4002A971C3500D95122 /* AdItems.swift */, @@ -516,7 +423,6 @@ 1A6B56612AFF8CBD00C1771F /* Features */ = { isa = PBXGroup; children = ( - 1A6B56622AFF8CBD00C1771F /* Features.h */, 1A3A75F92916792600069818 /* AdItemsAPI.swift */, 1A0230182A8F96490084DD0B /* CurrentTermVersionAPI.swift */, 1A762FCA2A9381D900F60DFA /* GenericAPI.swift */, @@ -533,7 +439,6 @@ 1A6B567B2AFF91B800C1771F /* AkidonComponents */ = { isa = PBXGroup; children = ( - 1A6B567C2AFF91B800C1771F /* AkidonComponents.h */, 1A41EAE2272914CC0064CDB7 /* AKLibrary.swift */, 1A6EF50E27BA5C63004D0B2C /* DateFormatter+Exetnsion.swift */, 1A556D912963BD4B00A650B2 /* String+Exetnsion.swift */, @@ -585,9 +490,6 @@ 1AA056C026BD2AE100343005 = { isa = PBXGroup; children = ( - 1A6B567B2AFF91B800C1771F /* AkidonComponents */, - 1A2B04DD2AAFE5E60085188A /* Entity */, - 1A6B56612AFF8CBD00C1771F /* Features */, 1AA056CB26BD2AE100343005 /* univIP */, 1AB37B6D26FDFCEA008A2D2F /* univIPTests */, 1C91199C2DFA8E4D8B3EBE6D /* Frameworks */, @@ -602,9 +504,6 @@ 1AA056C926BD2AE100343005 /* univIP.app */, 1AB37B6C26FDFCEA008A2D2F /* univIPTests.xctest */, 1AB37B7A26FDFCF4008A2D2F /* univIPUITests.xctest */, - 1A2B04DC2AAFE5E60085188A /* Entity.framework */, - 1A6B56602AFF8CBD00C1771F /* Features.framework */, - 1A6B567A2AFF91B800C1771F /* AkidonComponents.framework */, ); name = Products; sourceTree = ""; @@ -612,6 +511,9 @@ 1AA056CB26BD2AE100343005 /* univIP */ = { isa = PBXGroup; children = ( + 1A6B567B2AFF91B800C1771F /* AkidonComponents */, + 1A2B04DD2AAFE5E60085188A /* Entity */, + 1A6B56612AFF8CBD00C1771F /* Features */, 1A22378D2AB7EDF900A65301 /* Settings */, 1A19730D27C4BCB200F36FE7 /* AppDelegate.swift */, 1ABE8BE627B10590001EEA79 /* LaunchScreen.storyboard */, @@ -753,89 +655,7 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 1A2B04D72AAFE5E50085188A /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A2B04DF2AAFE5E60085188A /* Entity.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B565B2AFF8CBD00C1771F /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A6B56632AFF8CBD00C1771F /* Features.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B56752AFF91B800C1771F /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A6B567D2AFF91B800C1771F /* AkidonComponents.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - 1A2B04DB2AAFE5E50085188A /* Entity */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1A2B04E42AAFE5E60085188A /* Build configuration list for PBXNativeTarget "Entity" */; - buildPhases = ( - 1A2B04D72AAFE5E50085188A /* Headers */, - 1A2B04D82AAFE5E50085188A /* Sources */, - 1A2B04D92AAFE5E50085188A /* Frameworks */, - 1A2B04DA2AAFE5E50085188A /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Entity; - productName = Entity; - productReference = 1A2B04DC2AAFE5E60085188A /* Entity.framework */; - productType = "com.apple.product-type.framework"; - }; - 1A6B565F2AFF8CBD00C1771F /* Features */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1A6B566A2AFF8CBD00C1771F /* Build configuration list for PBXNativeTarget "Features" */; - buildPhases = ( - D5E2DCE707EA4357CC889D00 /* [CP] Check Pods Manifest.lock */, - 1A6B565B2AFF8CBD00C1771F /* Headers */, - 1A6B565C2AFF8CBD00C1771F /* Sources */, - 1A6B565D2AFF8CBD00C1771F /* Frameworks */, - 1A6B565E2AFF8CBD00C1771F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Features; - productName = Features; - productReference = 1A6B56602AFF8CBD00C1771F /* Features.framework */; - productType = "com.apple.product-type.framework"; - }; - 1A6B56792AFF91B800C1771F /* AkidonComponents */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1A6B56822AFF91B900C1771F /* Build configuration list for PBXNativeTarget "AkidonComponents" */; - buildPhases = ( - 1A6B56752AFF91B800C1771F /* Headers */, - 1A6B56762AFF91B800C1771F /* Sources */, - 1A6B56772AFF91B800C1771F /* Frameworks */, - 1A6B56782AFF91B800C1771F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = AkidonComponents; - productName = AkidonComponents; - productReference = 1A6B567A2AFF91B800C1771F /* AkidonComponents.framework */; - productType = "com.apple.product-type.framework"; - }; 1AA056C826BD2AE100343005 /* univIP */ = { isa = PBXNativeTarget; buildConfigurationList = 1AA056DD26BD2AE500343005 /* Build configuration list for PBXNativeTarget "univIP" */; @@ -852,9 +672,6 @@ buildRules = ( ); dependencies = ( - 1A2B04E12AAFE5E60085188A /* PBXTargetDependency */, - 1A6B56652AFF8CBD00C1771F /* PBXTargetDependency */, - 1A6B567F2AFF91B800C1771F /* PBXTargetDependency */, ); name = univIP; packageProductDependencies = ( @@ -914,15 +731,6 @@ LastSwiftUpdateCheck = 1250; LastUpgradeCheck = 1500; TargetAttributes = { - 1A2B04DB2AAFE5E50085188A = { - CreatedOnToolsVersion = 14.2; - }; - 1A6B565F2AFF8CBD00C1771F = { - CreatedOnToolsVersion = 15.0.1; - }; - 1A6B56792AFF91B800C1771F = { - CreatedOnToolsVersion = 15.0.1; - }; 1AA056C826BD2AE100343005 = { CreatedOnToolsVersion = 12.5.1; }; @@ -956,35 +764,11 @@ 1AA056C826BD2AE100343005 /* univIP */, 1AB37B6B26FDFCEA008A2D2F /* univIPTests */, 1AB37B7926FDFCF4008A2D2F /* univIPUITests */, - 1A2B04DB2AAFE5E50085188A /* Entity */, - 1A6B565F2AFF8CBD00C1771F /* Features */, - 1A6B56792AFF91B800C1771F /* AkidonComponents */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 1A2B04DA2AAFE5E50085188A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B565E2AFF8CBD00C1771F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B56782AFF91B800C1771F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1AA056C726BD2AE100343005 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1130,79 +914,9 @@ 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; }; - D5E2DCE707EA4357CC889D00 /* [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-All-Features-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; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 1A2B04D82AAFE5E50085188A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A2B04EF2AAFE6120085188A /* NewsItemModel.swift in Sources */, - 1A2B04E92AAFE6120085188A /* HomeMiniSettingsItem.swift in Sources */, - 1A2B04ED2AAFE6120085188A /* MenuDetailItem.swift in Sources */, - 1A2B04EA2AAFE6120085188A /* HomeEventInfos.swift in Sources */, - 1A2B04E72AAFE6120085188A /* CreditItemModel.swift in Sources */, - 1A2B04EC2AAFE6120085188A /* MenuItem.swift in Sources */, - 1A2B04F22AAFE6120085188A /* ActivityIndicatorState.swift in Sources */, - 1A2B04F12AAFE6120085188A /* AdItems.swift in Sources */, - 1A2B04EE2AAFE6120085188A /* WebScrapeError.swift in Sources */, - 1A2B04E82AAFE6120085188A /* AdItem.swift in Sources */, - 1A2B04EB2AAFE6120085188A /* UnivAuth.swift in Sources */, - 1A2B04F02AAFE6120085188A /* SettingsItem.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B565C2AFF8CBD00C1771F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A6B566C2AFF8CC800C1771F /* GenericAPI.swift in Sources */, - 1A6B566F2AFF8CC800C1771F /* NumberOfUsersAPI.swift in Sources */, - 1A6B56712AFF8CC800C1771F /* CurrentTermVersionAPI.swift in Sources */, - 1A6B56732AFF8CD700C1771F /* LibraryCalendarWebScraper.swift in Sources */, - 1A6B56702AFF8CC800C1771F /* HelpmessegeAgreeAPI.swift in Sources */, - 1A6B56722AFF8CC800C1771F /* AdItemsAPI.swift in Sources */, - 1A6B566B2AFF8CC800C1771F /* NewsItemsRSS.swift in Sources */, - 1A6B566E2AFF8CC800C1771F /* HomeEventInfosAPI.swift in Sources */, - 1A6B566D2AFF8CC800C1771F /* TermTextAPI.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1A6B56762AFF91B800C1771F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1A6B56872AFF91F500C1771F /* DateFormatter+Exetnsion.swift in Sources */, - 1A6B56892AFF91F500C1771F /* String+Exetnsion.swift in Sources */, - 1A6B56852AFF91D100C1771F /* AKLibrary.swift in Sources */, - 1A9A15732BA41DE7008BB77E /* CustomDuoButton.swift in Sources */, - 1A6B56882AFF91F500C1771F /* UIImageView+Exetnsion.swift in Sources */, - 1A6B56862AFF91F500C1771F /* UIColor+Exetnsion.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1AA056C526BD2AE100343005 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1283,21 +997,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1A2B04E12AAFE5E60085188A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1A2B04DB2AAFE5E50085188A /* Entity */; - targetProxy = 1A2B04E02AAFE5E60085188A /* PBXContainerItemProxy */; - }; - 1A6B56652AFF8CBD00C1771F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1A6B565F2AFF8CBD00C1771F /* Features */; - targetProxy = 1A6B56642AFF8CBD00C1771F /* PBXContainerItemProxy */; - }; - 1A6B567F2AFF91B800C1771F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1A6B56792AFF91B800C1771F /* AkidonComponents */; - targetProxy = 1A6B567E2AFF91B800C1771F /* PBXContainerItemProxy */; - }; 1AB37B7226FDFCEA008A2D2F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1AA056C826BD2AE100343005 /* univIP */; @@ -1322,256 +1021,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 1A2B04E52AAFE5E60085188A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.univip.Entity; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 1A2B04E62AAFE5E60085188A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.univip.Entity; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 1A6B56682AFF8CBD00C1771F /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 96634126A18EF2A407864954 /* Pods-All-Features.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.Features.Features; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 1A6B56692AFF8CBD00C1771F /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BE0A13FC2ACFA9BDA7B6F397 /* Pods-All-Features.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.Features.Features; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 1A6B56832AFF91B900C1771F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.univIP.AkidonComponents; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 1A6B56842AFF91B900C1771F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = XSC9AJPSP3; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - PRODUCT_BUNDLE_IDENTIFIER = com.akidon0000.univIP.AkidonComponents; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 1AA056DB26BD2AE500343005 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1913,33 +1362,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1A2B04E42AAFE5E60085188A /* Build configuration list for PBXNativeTarget "Entity" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1A2B04E52AAFE5E60085188A /* Debug */, - 1A2B04E62AAFE5E60085188A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1A6B566A2AFF8CBD00C1771F /* Build configuration list for PBXNativeTarget "Features" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1A6B56682AFF8CBD00C1771F /* Debug */, - 1A6B56692AFF8CBD00C1771F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1A6B56822AFF91B900C1771F /* Build configuration list for PBXNativeTarget "AkidonComponents" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1A6B56832AFF91B900C1771F /* Debug */, - 1A6B56842AFF91B900C1771F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 1AA056C426BD2AE100343005 /* Build configuration list for PBXProject "univIP" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/AkidonComponents/AKLibrary.swift b/univIP/AkidonComponents/AKLibrary.swift similarity index 93% rename from AkidonComponents/AKLibrary.swift rename to univIP/AkidonComponents/AKLibrary.swift index b47c77b6..815cfb5c 100644 --- a/AkidonComponents/AKLibrary.swift +++ b/univIP/AkidonComponents/AKLibrary.swift @@ -7,7 +7,7 @@ import Foundation -public enum AKLogLevel { +enum AKLogLevel { case DEBUG // システムの動作状況に関する詳細な情報。 case WARN // 異常とは言い切れないが正常とも異なる何らかの問題。 case ERROR // 予期しないその他の実行時エラー。 @@ -22,13 +22,13 @@ public enum AKLogLevel { /// - function: メソッド /// - level: ログ・レベル /// - message: メッセージ -public func AKLog(file: String = #file, +func AKLog(file: String = #file, line: Int = #line, function: String = #function, level: AKLogLevel, message: Any ){ - #if DEBUG +#if DEBUG let levelString: String switch level { case .DEBUG: levelString = "DEBUG" @@ -36,13 +36,13 @@ public func AKLog(file: String = #file, case .ERROR: levelString = "ERROR" case .FATAL: levelString = "FATAL" } - + let fileName = NSString(string: file).lastPathComponent let datetime = DateFormatter() datetime.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS" let now = datetime.string(from: Date()) - + // コンソール出力 print("AKLog: " + now + " \(levelString) \(fileName)(\(line)) \(function) \(message)") - #endif +#endif } diff --git a/AkidonComponents/CustomDuoButton.swift b/univIP/AkidonComponents/CustomDuoButton.swift similarity index 81% rename from AkidonComponents/CustomDuoButton.swift rename to univIP/AkidonComponents/CustomDuoButton.swift index 373d1092..efc0e3cb 100644 --- a/AkidonComponents/CustomDuoButton.swift +++ b/univIP/AkidonComponents/CustomDuoButton.swift @@ -7,19 +7,19 @@ import UIKit -public class CustomDuoButton: UIButton { - public var onTap: ((Int) -> Void)? - - public init(title: String, - textColor: UIColor = .black, - backgroundColor: UIColor = .white, - borderColor: UIColor = .systemBlue, - fontSize: CGFloat = 18, - tag: Int = 0, - verticalMargin: CGFloat = 25, - horizontalMargin: CGFloat = 50) { +class CustomDuoButton: UIButton { + var onTap: ((Int) -> Void)? + + init(title: String, + textColor: UIColor = .black, + backgroundColor: UIColor = .white, + borderColor: UIColor = .systemBlue, + fontSize: CGFloat = 18, + tag: Int = 0, + verticalMargin: CGFloat = 25, + horizontalMargin: CGFloat = 50) { super.init(frame: .zero) - + self.setTitle(title, for: .normal) self.setTitleColor(textColor, for: .normal) self.titleLabel?.font = .systemFont(ofSize: fontSize, weight: .semibold) @@ -34,35 +34,35 @@ public class CustomDuoButton: UIButton { self.layer.shadowOpacity = 1 self.translatesAutoresizingMaskIntoConstraints = false self.sizeToFit() - + NSLayoutConstraint.activate([ self.widthAnchor.constraint(equalToConstant: self.frame.width + horizontalMargin), self.heightAnchor.constraint(equalToConstant: self.frame.height + verticalMargin), ]) - + self.addTarget(self, action: #selector(buttonPressed), for: .touchDown) self.addTarget(self, action: #selector(buttonReleased), for: [.touchUpInside, .touchUpOutside]) self.addTarget(self, action: #selector(buttonTapped(_:)), for: .touchUpInside) } - + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - + @objc private func buttonPressed() { UIView.animate(withDuration: 0.2) { self.layer.shadowOpacity = 0 self.transform = CGAffineTransform(translationX: 0, y: 2) } } - + @objc private func buttonReleased() { UIView.animate(withDuration: 0.2) { self.layer.shadowOpacity = 1 self.transform = CGAffineTransform.identity } } - + @objc func buttonTapped(_ sender: UIButton) { onTap?(sender.tag) } diff --git a/AkidonComponents/DateFormatter+Exetnsion.swift b/univIP/AkidonComponents/DateFormatter+Exetnsion.swift similarity index 100% rename from AkidonComponents/DateFormatter+Exetnsion.swift rename to univIP/AkidonComponents/DateFormatter+Exetnsion.swift diff --git a/AkidonComponents/String+Exetnsion.swift b/univIP/AkidonComponents/String+Exetnsion.swift similarity index 100% rename from AkidonComponents/String+Exetnsion.swift rename to univIP/AkidonComponents/String+Exetnsion.swift diff --git a/AkidonComponents/UIColor+Exetnsion.swift b/univIP/AkidonComponents/UIColor+Exetnsion.swift similarity index 100% rename from AkidonComponents/UIColor+Exetnsion.swift rename to univIP/AkidonComponents/UIColor+Exetnsion.swift diff --git a/AkidonComponents/UIImageView+Exetnsion.swift b/univIP/AkidonComponents/UIImageView+Exetnsion.swift similarity index 100% rename from AkidonComponents/UIImageView+Exetnsion.swift rename to univIP/AkidonComponents/UIImageView+Exetnsion.swift diff --git a/Entity/ActivityIndicatorState.swift b/univIP/Entity/ActivityIndicatorState.swift similarity index 78% rename from Entity/ActivityIndicatorState.swift rename to univIP/Entity/ActivityIndicatorState.swift index 9f9848c3..5871e9e1 100644 --- a/Entity/ActivityIndicatorState.swift +++ b/univIP/Entity/ActivityIndicatorState.swift @@ -5,7 +5,7 @@ // Created by Akihiro Matsuyama on 2023/08/22. // -public enum ActivityIndicatorState { +enum ActivityIndicatorState { case start case stop } diff --git a/Entity/AdItem.swift b/univIP/Entity/AdItem.swift similarity index 68% rename from Entity/AdItem.swift rename to univIP/Entity/AdItem.swift index beeea27e..caf50e4e 100644 --- a/Entity/AdItem.swift +++ b/univIP/Entity/AdItem.swift @@ -5,26 +5,26 @@ // Created by Akihiro Matsuyama on 2023/05/09. // -public struct AdItem: Decodable { - public let id: Int - public let clientName: String - public let imageUrlStr: String - public let targetUrlStr: String - public let imageDescription: String - - public init(id: Int, clientName: String, imageUrlStr: String, targetUrlStr: String, imageDescription: String) { +struct AdItem: Decodable { + let id: Int + let clientName: String + let imageUrlStr: String + let targetUrlStr: String + let imageDescription: String + + init(id: Int, clientName: String, imageUrlStr: String, targetUrlStr: String, imageDescription: String) { self.id = id self.clientName = clientName self.imageUrlStr = imageUrlStr self.targetUrlStr = targetUrlStr self.imageDescription = imageDescription } - - public enum ParsingError: Error { + + enum ParsingError: Error { case invalidData } - - public init(dictionary: [String: Any]) throws { + + init(dictionary: [String: Any]) throws { guard let id = dictionary["id"] as? Int, let clientName = dictionary["clientName"] as? String, let imageUrlStr = dictionary["imageUrlStr"] as? String, diff --git a/Entity/AdItems.swift b/univIP/Entity/AdItems.swift similarity index 51% rename from Entity/AdItems.swift rename to univIP/Entity/AdItems.swift index 34083134..bce9926c 100644 --- a/Entity/AdItems.swift +++ b/univIP/Entity/AdItems.swift @@ -5,11 +5,11 @@ // Created by Akihiro Matsuyama on 2023/08/24. // -public struct AdItems { - public var prItems:[AdItem] - public var univItems:[AdItem] - - public init(prItems: [AdItem], univItems: [AdItem]) { +struct AdItems { + var prItems:[AdItem] + var univItems:[AdItem] + + init(prItems: [AdItem], univItems: [AdItem]) { self.prItems = prItems self.univItems = univItems } diff --git a/Entity/CreditItemModel.swift b/univIP/Entity/CreditItemModel.swift similarity index 50% rename from Entity/CreditItemModel.swift rename to univIP/Entity/CreditItemModel.swift index ab5e67be..3f6401a3 100644 --- a/Entity/CreditItemModel.swift +++ b/univIP/Entity/CreditItemModel.swift @@ -5,12 +5,12 @@ // Created by Akihiro Matsuyama on 2023/08/23. // -public struct CreditItemModel: Equatable { - public let title: String - public let license: String - public let contentsText: String - - public init(title: String, license: String, contentsText: String) { +struct CreditItemModel: Equatable { + let title: String + let license: String + let contentsText: String + + init(title: String, license: String, contentsText: String) { self.title = title self.license = license self.contentsText = contentsText diff --git a/Entity/HomeEventInfos.swift b/univIP/Entity/HomeEventInfos.swift similarity index 61% rename from Entity/HomeEventInfos.swift rename to univIP/Entity/HomeEventInfos.swift index 11a74fed..5586f680 100644 --- a/Entity/HomeEventInfos.swift +++ b/univIP/Entity/HomeEventInfos.swift @@ -5,33 +5,33 @@ // Created by Akihiro Matsuyama on 2023/08/29. // -public struct HomeEventInfos: Decodable { - public let popupItems: [PopupItem] - public let buttonItems: [ButtonItem] - - public init(popupItems: [PopupItem], buttonItems: [ButtonItem]) { +struct HomeEventInfos: Decodable { + let popupItems: [PopupItem] + let buttonItems: [ButtonItem] + + init(popupItems: [PopupItem], buttonItems: [ButtonItem]) { self.popupItems = popupItems self.buttonItems = buttonItems } - - public struct PopupItem: Decodable { - public let id: Int - public let clientName: String - public let titleName: String - public let description: String - - public init(id: Int, clientName: String, titleName: String, description: String) { + + struct PopupItem: Decodable { + let id: Int + let clientName: String + let titleName: String + let description: String + + init(id: Int, clientName: String, titleName: String, description: String) { self.id = id self.clientName = clientName self.titleName = titleName self.description = description } - - public enum ParsingError: Error { + + enum ParsingError: Error { case invalidData } - - public init(dictionary: [String: Any]) throws { + + init(dictionary: [String: Any]) throws { guard let id = dictionary["id"] as? Int, let clientName = dictionary["clientName"] as? String, let titleName = dictionary["titleName"] as? String, @@ -44,24 +44,24 @@ public struct HomeEventInfos: Decodable { self.description = description } } - - - public struct ButtonItem: Decodable { - public let id: Int - public let titleName: String - public let targetUrlStr: String - - public init(id: Int, titleName: String, targetUrlStr: String) { + + + struct ButtonItem: Decodable { + let id: Int + let titleName: String + let targetUrlStr: String + + init(id: Int, titleName: String, targetUrlStr: String) { self.id = id self.titleName = titleName self.targetUrlStr = targetUrlStr } - - public enum ParsingError: Error { + + enum ParsingError: Error { case invalidData } - - public init(dictionary: [String: Any]) throws { + + init(dictionary: [String: Any]) throws { guard let id = dictionary["id"] as? Int, let titleName = dictionary["titleName"] as? String, let targetUrlStr = dictionary["targetUrlStr"] as? String else { @@ -72,5 +72,5 @@ public struct HomeEventInfos: Decodable { self.targetUrlStr = targetUrlStr } } - + } diff --git a/Entity/HomeMiniSettingsItem.swift b/univIP/Entity/HomeMiniSettingsItem.swift similarity index 62% rename from Entity/HomeMiniSettingsItem.swift rename to univIP/Entity/HomeMiniSettingsItem.swift index dbb42e61..27ad81e4 100644 --- a/Entity/HomeMiniSettingsItem.swift +++ b/univIP/Entity/HomeMiniSettingsItem.swift @@ -7,8 +7,8 @@ import Foundation -public struct HomeMiniSettingsItem { - public enum type { +struct HomeMiniSettingsItem { + enum type { case review case prApplication case contactUs @@ -16,12 +16,12 @@ public struct HomeMiniSettingsItem { case termsOfService case privacyPolicy } - - public let title: String - public let id: type - public let targetUrl: URLRequest? - - public init(title: String, id: type, targetUrl: URLRequest?) { + + let title: String + let id: type + let targetUrl: URLRequest? + + init(title: String, id: type, targetUrl: URLRequest?) { self.title = title self.id = id self.targetUrl = targetUrl diff --git a/Entity/MenuDetailItem.swift b/univIP/Entity/MenuDetailItem.swift similarity index 89% rename from Entity/MenuDetailItem.swift rename to univIP/Entity/MenuDetailItem.swift index 62b4ef11..b4dc59a6 100644 --- a/Entity/MenuDetailItem.swift +++ b/univIP/Entity/MenuDetailItem.swift @@ -7,8 +7,8 @@ import Foundation -public struct MenuDetailItem { - public enum type { +struct MenuDetailItem { + enum type { case timeTable // 時間割 case currentTermPerformance // 今年の成績表 case syllabus // シラバス @@ -20,7 +20,7 @@ public struct MenuDetailItem { case courseRegistration // 履修登録 case universityWeb // 大学サイト case portal // 統合認証ポータル - + case libraryWebHomePC // 図書館Webサイト常三島 case libraryWebHomeKuraPC // 図書館Webサイト蔵本 case libraryWebHomeMobile @@ -29,7 +29,7 @@ public struct MenuDetailItem { case libraryBookPurchaseRequest // 図書館本購入リクエスト case libraryCalendarMain // 図書館カレンダー case libraryCalendarKura - + case coopCalendar // 徳島大学生活共同組合 case cafeteria // 徳島大学食堂 case careerCenter // キャリアセンター @@ -37,12 +37,12 @@ public struct MenuDetailItem { case disasterPrevention // 上月研究室防災情報 case superEnglish // スーパー英語 } - - public let title: String - public let id: type - public let targetUrl: URLRequest? - - public init(title: String, id: type, targetUrl: URLRequest?) { + + let title: String + let id: type + let targetUrl: URLRequest? + + init(title: String, id: type, targetUrl: URLRequest?) { self.title = title self.id = id self.targetUrl = targetUrl diff --git a/Entity/MenuItem.swift b/univIP/Entity/MenuItem.swift similarity index 59% rename from Entity/MenuItem.swift rename to univIP/Entity/MenuItem.swift index 84df9e20..43c20426 100644 --- a/Entity/MenuItem.swift +++ b/univIP/Entity/MenuItem.swift @@ -7,8 +7,8 @@ import UIKit -public struct MenuItem { - public enum type { +struct MenuItem { + enum type { case courseManagement case manaba case mail @@ -16,13 +16,13 @@ public struct MenuItem { case libraryRelated case etc } - - public let title: String - public let id: type - public let icon: UIImage? - public let targetUrl: URLRequest? - - public init(title: String, id: type, icon: UIImage?, targetUrl: URLRequest?) { + + let title: String + let id: type + let icon: UIImage? + let targetUrl: URLRequest? + + init(title: String, id: type, icon: UIImage?, targetUrl: URLRequest?) { self.title = title self.id = id self.icon = icon diff --git a/Entity/NewsItemModel.swift b/univIP/Entity/NewsItemModel.swift similarity index 50% rename from Entity/NewsItemModel.swift rename to univIP/Entity/NewsItemModel.swift index 892e77f2..062bee59 100644 --- a/Entity/NewsItemModel.swift +++ b/univIP/Entity/NewsItemModel.swift @@ -5,12 +5,12 @@ // Created by Akihiro Matsuyama on 2023/08/09. // -public struct NewsItemModel { - public let title: String - public let targetUrlStr: String - public let createdAt: String +struct NewsItemModel { + let title: String + let targetUrlStr: String + let createdAt: String - public init(title: String, targetUrlStr: String, createdAt: String) { + init(title: String, targetUrlStr: String, createdAt: String) { self.title = title self.targetUrlStr = targetUrlStr self.createdAt = createdAt diff --git a/Entity/SettingsItem.swift b/univIP/Entity/SettingsItem.swift similarity index 68% rename from Entity/SettingsItem.swift rename to univIP/Entity/SettingsItem.swift index cb02678c..f9d09805 100644 --- a/Entity/SettingsItem.swift +++ b/univIP/Entity/SettingsItem.swift @@ -7,8 +7,8 @@ import Foundation -public struct SettingsItem { - public enum type { +struct SettingsItem { + enum type { case password case aboutThisApp case contactUs @@ -20,12 +20,12 @@ public struct SettingsItem { case review case acknowledgements } - - public let title: String - public let id: type - public let targetUrl: URLRequest? - - public init(title: String, id: type, targetUrl: URLRequest?) { + + let title: String + let id: type + let targetUrl: URLRequest? + + init(title: String, id: type, targetUrl: URLRequest?) { self.title = title self.id = id self.targetUrl = targetUrl diff --git a/Entity/UnivAuth.swift b/univIP/Entity/UnivAuth.swift similarity index 52% rename from Entity/UnivAuth.swift rename to univIP/Entity/UnivAuth.swift index 38cfbdc9..d089b4f8 100644 --- a/Entity/UnivAuth.swift +++ b/univIP/Entity/UnivAuth.swift @@ -5,11 +5,11 @@ // Created by Akihiro Matsuyama on 2023/08/19. // -public struct UnivAuth { - public let accountCID: String - public let password: String - - public init(accountCID: String, password: String) { +struct UnivAuth { + let accountCID: String + let password: String + + init(accountCID: String, password: String) { self.accountCID = accountCID self.password = password } diff --git a/Entity/WebScrapeError.swift b/univIP/Entity/WebScrapeError.swift similarity index 86% rename from Entity/WebScrapeError.swift rename to univIP/Entity/WebScrapeError.swift index 4dc5b119..96efa083 100644 --- a/Entity/WebScrapeError.swift +++ b/univIP/Entity/WebScrapeError.swift @@ -5,7 +5,7 @@ // Created by Akihiro Matsuyama on 2023/08/21. // -public enum WebScrapeError: Error { +enum WebScrapeError: Error { case networkError(Error) case noDataAvailable(statusCode: Int?) case parsingError(Error) diff --git a/Features/AdItemsAPI.swift b/univIP/Features/AdItemsAPI.swift similarity index 74% rename from Features/AdItemsAPI.swift rename to univIP/Features/AdItemsAPI.swift index 8e2d4226..28a3ad24 100644 --- a/Features/AdItemsAPI.swift +++ b/univIP/Features/AdItemsAPI.swift @@ -12,14 +12,14 @@ import Entity /// AdItemはPRアイテムとUnivアイテムで使用する /// PRアイテムは大学生が大学生に向けて告知したい内容。比較的掲載が簡単 /// Univアイテムは教員や学生が、大学生に向けて有用な情報だと判断した内容。 -public protocol AdItemsAPIInterface { +protocol AdItemsAPIInterface { func getAdItems() -> Single } -public struct AdItemsAPI: AdItemsAPIInterface { - public init() {} +struct AdItemsAPI: AdItemsAPIInterface { + init() {} - public func getAdItems() -> RxSwift.Single { + func getAdItems() -> RxSwift.Single { let request = AdItemsGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -37,38 +37,38 @@ public struct AdItemsAPI: AdItemsAPIInterface { } } -public struct AdItemsGetRequest: Request { - public struct ResponseBody { - public let adItems:AdItems - - public init(object: Any) throws { +struct AdItemsGetRequest: Request { + struct ResponseBody { + let adItems:AdItems + + init(object: Any) throws { guard let dictionary = object as? [String: Any], let prItemsArray = dictionary["prItems"] as? [[String: Any]], let univItemsArray = dictionary["univItems"] as? [[String: Any]] else { throw ResponseError.unexpectedObject(object) } - + let prItems = try prItemsArray.map { try AdItem(dictionary: $0) } let univItems = try univItemsArray.map { try AdItem(dictionary: $0) } adItems = AdItems(prItems: prItems, univItems: univItems) } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/ad_items.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } diff --git a/Features/CurrentTermVersionAPI.swift b/univIP/Features/CurrentTermVersionAPI.swift similarity index 66% rename from Features/CurrentTermVersionAPI.swift rename to univIP/Features/CurrentTermVersionAPI.swift index 053afc3f..ccbd180f 100644 --- a/Features/CurrentTermVersionAPI.swift +++ b/univIP/Features/CurrentTermVersionAPI.swift @@ -8,14 +8,14 @@ import APIKit import RxSwift -public protocol CurrentTermVersionAPIInterface { +protocol CurrentTermVersionAPIInterface { func getCurrentTermVersion() -> Single } -public struct CurrentTermVersionAPI: CurrentTermVersionAPIInterface { - public init() {} +struct CurrentTermVersionAPI: CurrentTermVersionAPIInterface { + init() {} - public func getCurrentTermVersion() -> RxSwift.Single { + func getCurrentTermVersion() -> RxSwift.Single { let request = CurrentTermVersionGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -33,10 +33,10 @@ public struct CurrentTermVersionAPI: CurrentTermVersionAPIInterface { } } -public struct CurrentTermVersionGetRequest: Request { - public struct ResponseBody: Decodable { - public let currentTermVersion: String - +struct CurrentTermVersionGetRequest: Request { + struct ResponseBody: Decodable { + let currentTermVersion: String + init(object: Any) throws { guard let dictionary = object as? [String: Any], let termVersion = dictionary["currentTermVersion"] as? String else { @@ -45,22 +45,22 @@ public struct CurrentTermVersionGetRequest: Request { currentTermVersion = termVersion } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/current_term_version.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } diff --git a/Features/GenericAPI.swift b/univIP/Features/GenericAPI.swift similarity index 100% rename from Features/GenericAPI.swift rename to univIP/Features/GenericAPI.swift diff --git a/Features/HelpmessegeAgreeAPI.swift b/univIP/Features/HelpmessegeAgreeAPI.swift similarity index 65% rename from Features/HelpmessegeAgreeAPI.swift rename to univIP/Features/HelpmessegeAgreeAPI.swift index aa4a5194..933483a4 100644 --- a/Features/HelpmessegeAgreeAPI.swift +++ b/univIP/Features/HelpmessegeAgreeAPI.swift @@ -8,14 +8,14 @@ import APIKit import RxSwift -public protocol HelpmessegeAgreeAPIInterface { +protocol HelpmessegeAgreeAPIInterface { func getHelpmessegeAgree() -> Single } -public struct HelpmessegeAgreeAPI: HelpmessegeAgreeAPIInterface { - public init() {} +struct HelpmessegeAgreeAPI: HelpmessegeAgreeAPIInterface { + init() {} - public func getHelpmessegeAgree() -> RxSwift.Single { + func getHelpmessegeAgree() -> RxSwift.Single { let request = HelpmessegeAgreeGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -33,11 +33,11 @@ public struct HelpmessegeAgreeAPI: HelpmessegeAgreeAPIInterface { } } -public struct HelpmessegeAgreeGetRequest: Request { - public struct ResponseBody: Decodable { - public let helpmessageAgreeText: String - - public init(object: Any) throws { +struct HelpmessegeAgreeGetRequest: Request { + struct ResponseBody: Decodable { + let helpmessageAgreeText: String + + init(object: Any) throws { guard let dictionary = object as? [String: Any], let helpmessageAgree = dictionary["helpmessageAgree"] as? String else { throw ResponseError.unexpectedObject(object) @@ -45,22 +45,22 @@ public struct HelpmessegeAgreeGetRequest: Request { helpmessageAgreeText = helpmessageAgree } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/helpmessage_agree.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } diff --git a/Features/HomeEventInfosAPI.swift b/univIP/Features/HomeEventInfosAPI.swift similarity index 70% rename from Features/HomeEventInfosAPI.swift rename to univIP/Features/HomeEventInfosAPI.swift index d9f243f5..786cc86b 100644 --- a/Features/HomeEventInfosAPI.swift +++ b/univIP/Features/HomeEventInfosAPI.swift @@ -9,14 +9,14 @@ import APIKit import RxSwift import Entity -public protocol HomeEventInfosAPIInterface { +protocol HomeEventInfosAPIInterface { func getHomeEventInfos() -> Single } -public struct HomeEventInfosAPI: HomeEventInfosAPIInterface { - public init() {} - - public func getHomeEventInfos() -> RxSwift.Single { +struct HomeEventInfosAPI: HomeEventInfosAPIInterface { + init() {} + + func getHomeEventInfos() -> RxSwift.Single { let request = HomeEventInfosGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -34,38 +34,38 @@ public struct HomeEventInfosAPI: HomeEventInfosAPIInterface { } } -public struct HomeEventInfosGetRequest: Request { - public struct ResponseBody: Decodable { - public let homeEventInfos: HomeEventInfos - - public init(object: Any) throws { +struct HomeEventInfosGetRequest: Request { + struct ResponseBody: Decodable { + let homeEventInfos: HomeEventInfos + + init(object: Any) throws { guard let dictionary = object as? [String: Any], let popupArray = dictionary["popupItems"] as? [[String: Any]], let buttonArray = dictionary["buttonItems"] as? [[String: Any]] else { throw ResponseError.unexpectedObject(object) } - + let popupItems = try popupArray.map { try HomeEventInfos.PopupItem(dictionary: $0) } let buttonItems = try buttonArray.map { try HomeEventInfos.ButtonItem(dictionary: $0) } homeEventInfos = HomeEventInfos(popupItems: popupItems, buttonItems: buttonItems) } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/home_event_infos.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } diff --git a/Features/LibraryCalendarWebScraper.swift b/univIP/Features/LibraryCalendarWebScraper.swift similarity index 85% rename from Features/LibraryCalendarWebScraper.swift rename to univIP/Features/LibraryCalendarWebScraper.swift index 9f2a8e2f..e4fa1a90 100644 --- a/Features/LibraryCalendarWebScraper.swift +++ b/univIP/Features/LibraryCalendarWebScraper.swift @@ -9,27 +9,27 @@ import Kanna import RxSwift import Entity -public protocol LibraryCalendarWebScraperInterface { +protocol LibraryCalendarWebScraperInterface { func getLibraryCalendarURL(libraryUrl: URL) -> Single } -public struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { - public init() {} - +struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { + init() {} + private let baseURLString = "https://www.lib.tokushima-u.ac.jp/" - - public func getLibraryCalendarURL(libraryUrl: URL) -> RxSwift.Single { + + func getLibraryCalendarURL(libraryUrl: URL) -> RxSwift.Single { return .create { observer in let task = URLSession.shared.dataTask(with: libraryUrl) { (data, response , error) in if let error = error { return observer(.failure(WebScrapeError.networkError(error))) } - + guard let data = data else { let statusCode = (response as? HTTPURLResponse)?.statusCode return observer(.failure(WebScrapeError.noDataAvailable(statusCode: statusCode))) } - + var urlStr = self.baseURLString do { let doc = try HTML(html: data, encoding: String.Encoding.utf8) @@ -41,14 +41,14 @@ public struct LibraryCalendarWebScraper: LibraryCalendarWebScraperInterface { } catch let parseError { return observer(.failure(WebScrapeError.parsingError(parseError))) } - + guard let url = URL(string: urlStr) else { return observer(.failure(WebScrapeError.invalidURL(urlStr))) } observer(.success(URLRequest(url: url))) } task.resume() - + return Disposables.create { task.cancel() } } } diff --git a/Features/NewsItemsRSS.swift b/univIP/Features/NewsItemsRSS.swift similarity index 89% rename from Features/NewsItemsRSS.swift rename to univIP/Features/NewsItemsRSS.swift index 875b7a82..96f66ac6 100644 --- a/Features/NewsItemsRSS.swift +++ b/univIP/Features/NewsItemsRSS.swift @@ -9,32 +9,32 @@ import Kanna import RxSwift import Entity -public protocol NewsItemsRSSInterface { +protocol NewsItemsRSSInterface { func getNewsItems() -> Single<[NewsItemModel]> } -public struct NewsItemsRSS: NewsItemsRSSInterface { - public init() {} - +struct NewsItemsRSS: NewsItemsRSSInterface { + init() {} + private let baseURLString = "https://www.tokushima-u.ac.jp/recent/rss.xml" - - public func getNewsItems() -> RxSwift.Single<[NewsItemModel]> { + + func getNewsItems() -> RxSwift.Single<[NewsItemModel]> { return .create { observer in guard let url = URL(string: baseURLString) else { observer(.failure(WebScrapeError.invalidURL(baseURLString))) return Disposables.create() } - + let task = URLSession.shared.dataTask(with: url) { (data, response, error) in if let error = error { return observer(.failure(WebScrapeError.networkError(error))) } - + guard let data = data else { let statusCode = (response as? HTTPURLResponse)?.statusCode return observer(.failure(WebScrapeError.noDataAvailable(statusCode: statusCode))) } - + var newsItems:[NewsItemModel] = [] do { let doc = try Kanna.XML(xml: data, encoding: .utf8) @@ -44,7 +44,7 @@ public struct NewsItemsRSS: NewsItemsRSSInterface { let pubDate = element.at_xpath("pubDate")?.text ?? "" // dcDateを取得できない。使わないデータなので放置 // let dcDate = element.at_xpath("dc:date")?.text ?? "" - + let item = NewsItemModel(title: title, targetUrlStr: link, createdAt: pubDate) newsItems.append(item) } @@ -54,7 +54,7 @@ public struct NewsItemsRSS: NewsItemsRSSInterface { observer(.success(newsItems)) } task.resume() - + return Disposables.create { task.cancel() } } } diff --git a/Features/NumberOfUsersAPI.swift b/univIP/Features/NumberOfUsersAPI.swift similarity index 65% rename from Features/NumberOfUsersAPI.swift rename to univIP/Features/NumberOfUsersAPI.swift index 150cee9b..19a79565 100644 --- a/Features/NumberOfUsersAPI.swift +++ b/univIP/Features/NumberOfUsersAPI.swift @@ -8,14 +8,14 @@ import APIKit import RxSwift -public protocol NumberOfUsersAPIInterface { +protocol NumberOfUsersAPIInterface { func getNumberOfUsers() -> Single } -public struct NumberOfUsersAPI: NumberOfUsersAPIInterface { - public init() {} +struct NumberOfUsersAPI: NumberOfUsersAPIInterface { + init() {} - public func getNumberOfUsers() -> RxSwift.Single { + func getNumberOfUsers() -> RxSwift.Single { let request = NumberOfUsersGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -33,11 +33,11 @@ public struct NumberOfUsersAPI: NumberOfUsersAPIInterface { } } -public struct NumberOfUsersGetRequest: Request { - public struct ResponseBody: Decodable { - public let numberOfUsers: String - - public init(object: Any) throws { +struct NumberOfUsersGetRequest: Request { + struct ResponseBody: Decodable { + let numberOfUsers: String + + init(object: Any) throws { guard let dictionary = object as? [String: Any], let users = dictionary["numberOfUsers"] as? String else { throw ResponseError.unexpectedObject(object) @@ -45,22 +45,22 @@ public struct NumberOfUsersGetRequest: Request { numberOfUsers = users } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/number_of_users.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } diff --git a/Features/TermTextAPI.swift b/univIP/Features/TermTextAPI.swift similarity index 65% rename from Features/TermTextAPI.swift rename to univIP/Features/TermTextAPI.swift index ae16a929..ba644dba 100644 --- a/Features/TermTextAPI.swift +++ b/univIP/Features/TermTextAPI.swift @@ -8,14 +8,14 @@ import APIKit import RxSwift -public protocol TermTextAPIInterface { +protocol TermTextAPIInterface { func getTermText() -> Single } -public struct TermTextAPI: TermTextAPIInterface { - public init() {} +struct TermTextAPI: TermTextAPIInterface { + init() {} - public func getTermText() -> RxSwift.Single { + func getTermText() -> RxSwift.Single { let request = TermTextGetRequest() return .create { observer in let session = Session.send(request) { result in @@ -33,11 +33,11 @@ public struct TermTextAPI: TermTextAPIInterface { } } -public struct TermTextGetRequest: Request { - public struct ResponseBody: Decodable { - public let termText: String - - public init(object: Any) throws { +struct TermTextGetRequest: Request { + struct ResponseBody: Decodable { + let termText: String + + init(object: Any) throws { guard let dictionary = object as? [String: Any], let text = dictionary["termText"] as? String else { throw ResponseError.unexpectedObject(object) @@ -45,22 +45,22 @@ public struct TermTextGetRequest: Request { termText = text } } - - public typealias Response = ResponseBody - - public var baseURL: URL { + + typealias Response = ResponseBody + + var baseURL: URL { return URL(string: "https://tokudai0000.github.io")! } - - public var method: HTTPMethod { + + var method: HTTPMethod { return .get } - - public var path: String { + + var path: String { return "/tokumemo_resource/api/v1/term_text.json" } - - public func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { + + func response(from object: Any, urlResponse: HTTPURLResponse) throws -> Response { return try Response(object: object) } } From 3d465f5760bbf18f53fbcdeb4cc78963955cbfe4 Mon Sep 17 00:00:00 2001 From: akidon0000 Date: Sat, 21 Sep 2024 11:53:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[196]=E4=B8=8D=E8=A6=81=E3=81=AAimport?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 9 +- Podfile.lock | 4 +- univIP.xcodeproj/project.pbxproj | 54 ++++++++++++ univIP/Common/AppConstants.swift | 2 - univIP/Features/AdItemsAPI.swift | 1 - univIP/Features/HomeEventInfosAPI.swift | 1 - .../Features/LibraryCalendarWebScraper.swift | 1 - univIP/Features/NewsItemsRSS.swift | 1 - univIP/Module/Agreement/AgreementRouter.swift | 1 - .../Module/Agreement/AgreementViewModel.swift | 2 - .../Credits/CreditsViewController.swift | 1 - univIP/Module/Credits/CreditsViewModel.swift | 2 - .../Module/Credits/ThirdPartyCreditCell.swift | 1 - .../HelpmessageAgreeRouter.swift | 1 - .../HelpmessageAgreeViewModel.swift | 1 - .../Banner/BannerScrollViewController.swift | 1 - .../Home/Banner/UnivNewsTableCell.swift | 1 - .../Module/Home/HomeMenuCollectionCell.swift | 1 - univIP/Module/Home/HomeRouter.swift | 2 - univIP/Module/Home/HomeViewController.swift | 2 - univIP/Module/Home/HomeViewModel.swift | 3 - univIP/Module/Input/InputViewController.swift | 1 - univIP/Module/Input/InputViewModel.swift | 1 - univIP/Module/News/NewsRouter.swift | 1 - univIP/Module/News/NewsViewController.swift | 1 - univIP/Module/News/NewsViewModel.swift | 3 - univIP/Module/PRDetail/PRRouter.swift | 1 - univIP/Module/PRDetail/PRViewModel.swift | 1 - univIP/Module/Splash/SplashRouter.swift | 1 - .../Module/Splash/SplashViewController.swift | 1 - univIP/Module/Splash/SplashViewModel.swift | 3 - univIP/Module/Web/WebViewController.swift | 1 - univIP/Module/Web/WebViewModel.swift | 2 - univIP/Repository/UnivAuthRepository.swift | 29 +++--- univIP/Settings/Acknowledgements.plist | 88 +++++++++---------- univIP/UseCase/UnivAuthStoreUseCase.swift | 17 ++-- 36 files changed, 125 insertions(+), 118 deletions(-) diff --git a/Podfile b/Podfile index bc4d9835..2cb7910b 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,9 @@ abstract_target 'All' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! inhibit_all_warnings! - + + pod 'APIKit' , '~> 5' + pod 'Kanna' , '~> 5' pod 'R.swift' , '~> 7' pod 'RxCocoa' , '~> 6' pod 'RxGesture' , '~> 4' @@ -19,11 +21,6 @@ abstract_target 'All' do target 'univIP' do end - target 'Features' do - pod 'APIKit' , '~> 5' - pod 'Kanna' , '~> 5' - end - target 'univIPTests' do inherit! :search_paths end diff --git a/Podfile.lock b/Podfile.lock index 5440e655..54dc0f7e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -51,6 +51,6 @@ SPEC CHECKSUMS: RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6 RxSwift: a4b44f7d24599f674deebd1818eab82e58410632 -PODFILE CHECKSUM: 887c7c6b279b9fdab6afb1b01f895f53c8c33205 +PODFILE CHECKSUM: 04058d42c6658d2f7c18cb436a43b85af1415adf -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/univIP.xcodeproj/project.pbxproj b/univIP.xcodeproj/project.pbxproj index 8e8d8831..ac6929bb 100644 --- a/univIP.xcodeproj/project.pbxproj +++ b/univIP.xcodeproj/project.pbxproj @@ -9,6 +9,33 @@ /* Begin PBXBuildFile section */ 15768A932C9DDE70006F81C1 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 15768A922C9DDE70006F81C1 /* GoogleService-Info.plist */; }; 15768A952C9DE129006F81C1 /* GoogleService-Info.template.plist in Resources */ = {isa = PBXBuildFile; fileRef = 15768A942C9DE129006F81C1 /* GoogleService-Info.template.plist */; }; + 15C670032C9E6AD2004AC48A /* AKLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A41EAE2272914CC0064CDB7 /* AKLibrary.swift */; }; + 15C670042C9E6AD2004AC48A /* DateFormatter+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6EF50E27BA5C63004D0B2C /* DateFormatter+Exetnsion.swift */; }; + 15C670052C9E6AD2004AC48A /* String+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A556D912963BD4B00A650B2 /* String+Exetnsion.swift */; }; + 15C670062C9E6AD2004AC48A /* UIColor+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADE675D2A77A13E00B79D69 /* UIColor+Exetnsion.swift */; }; + 15C670072C9E6AD2004AC48A /* UIImageView+Exetnsion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A30D0B128F6ED2E00C4012E /* UIImageView+Exetnsion.swift */; }; + 15C670082C9E6AD2004AC48A /* CustomDuoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9A15722BA41DE7008BB77E /* CustomDuoButton.swift */; }; + 15C670092C9E6ADE004AC48A /* ActivityIndicatorState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A3B75B22A93BBAF00E96B60 /* ActivityIndicatorState.swift */; }; + 15C6700A2C9E6ADE004AC48A /* AdItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A1A4E102A09FE75003A343B /* AdItem.swift */; }; + 15C6700B2C9E6ADE004AC48A /* AdItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C4002A971C3500D95122 /* AdItems.swift */; }; + 15C6700C2C9E6ADE004AC48A /* CreditItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3DB2A952B7400D95122 /* CreditItemModel.swift */; }; + 15C6700D2C9E6ADE004AC48A /* HomeEventInfos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8E6C52A9DA153001EF99F /* HomeEventInfos.swift */; }; + 15C6700E2C9E6ADE004AC48A /* HomeMiniSettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A58F67A2A85551E0025737A /* HomeMiniSettingsItem.swift */; }; + 15C6700F2C9E6ADE004AC48A /* MenuDetailItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A58F6762A8532520025737A /* MenuDetailItem.swift */; }; + 15C670102C9E6ADE004AC48A /* MenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A085CEB2A694AD200D31183 /* MenuItem.swift */; }; + 15C670112C9E6ADE004AC48A /* NewsItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AE816B72A836D9F00B8DA64 /* NewsItemModel.swift */; }; + 15C670122C9E6ADE004AC48A /* SettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A085CED2A694B9300D31183 /* SettingsItem.swift */; }; + 15C670132C9E6ADE004AC48A /* UnivAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AED5D052A90C2DB0090B8DE /* UnivAuth.swift */; }; + 15C670142C9E6ADE004AC48A /* WebScrapeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A762FCD2A93947200F60DFA /* WebScrapeError.swift */; }; + 15C670152C9E6AE4004AC48A /* AdItemsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A3A75F92916792600069818 /* AdItemsAPI.swift */; }; + 15C670162C9E6AE4004AC48A /* CurrentTermVersionAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0230182A8F96490084DD0B /* CurrentTermVersionAPI.swift */; }; + 15C670172C9E6AE4004AC48A /* GenericAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A762FCA2A9381D900F60DFA /* GenericAPI.swift */; }; + 15C670182C9E6AE4004AC48A /* HelpmessegeAgreeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AED5D0E2A9119180090B8DE /* HelpmessegeAgreeAPI.swift */; }; + 15C670192C9E6AE4004AC48A /* HomeEventInfosAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8E6C12A9DA038001EF99F /* HomeEventInfosAPI.swift */; }; + 15C6701A2C9E6AE4004AC48A /* LibraryCalendarWebScraper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A0C602A8B1DD500342186 /* LibraryCalendarWebScraper.swift */; }; + 15C6701B2C9E6AE4004AC48A /* NewsItemsRSS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AE816BE2A838C0100B8DA64 /* NewsItemsRSS.swift */; }; + 15C6701C2C9E6AE4004AC48A /* NumberOfUsersAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0230162A8F94680084DD0B /* NumberOfUsersAPI.swift */; }; + 15C6701D2C9E6AE4004AC48A /* TermTextAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A02301A2A8F98BF0084DD0B /* TermTextAPI.swift */; }; 1A11C3D12A95240500D95122 /* CreditsRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3D02A95240500D95122 /* CreditsRouter.swift */; }; 1A11C3D32A9524DA00D95122 /* CreditsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3D22A9524DA00D95122 /* CreditsViewController.swift */; }; 1A11C3D52A95251D00D95122 /* CreditsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3D42A95251D00D95122 /* CreditsViewModel.swift */; }; @@ -921,6 +948,33 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15C670152C9E6AE4004AC48A /* AdItemsAPI.swift in Sources */, + 15C670162C9E6AE4004AC48A /* CurrentTermVersionAPI.swift in Sources */, + 15C670172C9E6AE4004AC48A /* GenericAPI.swift in Sources */, + 15C670182C9E6AE4004AC48A /* HelpmessegeAgreeAPI.swift in Sources */, + 15C670192C9E6AE4004AC48A /* HomeEventInfosAPI.swift in Sources */, + 15C6701A2C9E6AE4004AC48A /* LibraryCalendarWebScraper.swift in Sources */, + 15C6701B2C9E6AE4004AC48A /* NewsItemsRSS.swift in Sources */, + 15C6701C2C9E6AE4004AC48A /* NumberOfUsersAPI.swift in Sources */, + 15C6701D2C9E6AE4004AC48A /* TermTextAPI.swift in Sources */, + 15C670092C9E6ADE004AC48A /* ActivityIndicatorState.swift in Sources */, + 15C6700A2C9E6ADE004AC48A /* AdItem.swift in Sources */, + 15C6700B2C9E6ADE004AC48A /* AdItems.swift in Sources */, + 15C6700C2C9E6ADE004AC48A /* CreditItemModel.swift in Sources */, + 15C6700D2C9E6ADE004AC48A /* HomeEventInfos.swift in Sources */, + 15C6700E2C9E6ADE004AC48A /* HomeMiniSettingsItem.swift in Sources */, + 15C6700F2C9E6ADE004AC48A /* MenuDetailItem.swift in Sources */, + 15C670102C9E6ADE004AC48A /* MenuItem.swift in Sources */, + 15C670112C9E6ADE004AC48A /* NewsItemModel.swift in Sources */, + 15C670122C9E6ADE004AC48A /* SettingsItem.swift in Sources */, + 15C670132C9E6ADE004AC48A /* UnivAuth.swift in Sources */, + 15C670142C9E6ADE004AC48A /* WebScrapeError.swift in Sources */, + 15C670032C9E6AD2004AC48A /* AKLibrary.swift in Sources */, + 15C670042C9E6AD2004AC48A /* DateFormatter+Exetnsion.swift in Sources */, + 15C670052C9E6AD2004AC48A /* String+Exetnsion.swift in Sources */, + 15C670062C9E6AD2004AC48A /* UIColor+Exetnsion.swift in Sources */, + 15C670072C9E6AD2004AC48A /* UIImageView+Exetnsion.swift in Sources */, + 15C670082C9E6AD2004AC48A /* CustomDuoButton.swift in Sources */, 1A2B04CC2AAF5DEF0085188A /* ThirdPartyCreditCell.swift in Sources */, 1A2B04D02AAF5DEF0085188A /* UnivNewsTableCell.swift in Sources */, 1A2B04D42AAF5DEF0085188A /* UnivBannerView.swift in Sources */, diff --git a/univIP/Common/AppConstants.swift b/univIP/Common/AppConstants.swift index c8377c3b..287da3b5 100644 --- a/univIP/Common/AppConstants.swift +++ b/univIP/Common/AppConstants.swift @@ -5,8 +5,6 @@ // Created by Akihiro Matsuyama on 2023/09/17. // -import Entity - struct AppConstants { public let menuItems: [MenuItem] diff --git a/univIP/Features/AdItemsAPI.swift b/univIP/Features/AdItemsAPI.swift index 28a3ad24..cee7598b 100644 --- a/univIP/Features/AdItemsAPI.swift +++ b/univIP/Features/AdItemsAPI.swift @@ -7,7 +7,6 @@ import APIKit import RxSwift -import Entity /// AdItemはPRアイテムとUnivアイテムで使用する /// PRアイテムは大学生が大学生に向けて告知したい内容。比較的掲載が簡単 diff --git a/univIP/Features/HomeEventInfosAPI.swift b/univIP/Features/HomeEventInfosAPI.swift index 786cc86b..cff49c14 100644 --- a/univIP/Features/HomeEventInfosAPI.swift +++ b/univIP/Features/HomeEventInfosAPI.swift @@ -7,7 +7,6 @@ import APIKit import RxSwift -import Entity protocol HomeEventInfosAPIInterface { func getHomeEventInfos() -> Single diff --git a/univIP/Features/LibraryCalendarWebScraper.swift b/univIP/Features/LibraryCalendarWebScraper.swift index e4fa1a90..33c006af 100644 --- a/univIP/Features/LibraryCalendarWebScraper.swift +++ b/univIP/Features/LibraryCalendarWebScraper.swift @@ -7,7 +7,6 @@ import Kanna import RxSwift -import Entity protocol LibraryCalendarWebScraperInterface { func getLibraryCalendarURL(libraryUrl: URL) -> Single diff --git a/univIP/Features/NewsItemsRSS.swift b/univIP/Features/NewsItemsRSS.swift index 96f66ac6..a5b50db6 100644 --- a/univIP/Features/NewsItemsRSS.swift +++ b/univIP/Features/NewsItemsRSS.swift @@ -7,7 +7,6 @@ import Kanna import RxSwift -import Entity protocol NewsItemsRSSInterface { func getNewsItems() -> Single<[NewsItemModel]> diff --git a/univIP/Module/Agreement/AgreementRouter.swift b/univIP/Module/Agreement/AgreementRouter.swift index 280b7108..77ae904d 100644 --- a/univIP/Module/Agreement/AgreementRouter.swift +++ b/univIP/Module/Agreement/AgreementRouter.swift @@ -6,7 +6,6 @@ // import Foundation -import Features enum AgreementNavigationDestination { case goWeb(URLRequest) diff --git a/univIP/Module/Agreement/AgreementViewModel.swift b/univIP/Module/Agreement/AgreementViewModel.swift index 71908b3a..0cf814ca 100644 --- a/univIP/Module/Agreement/AgreementViewModel.swift +++ b/univIP/Module/Agreement/AgreementViewModel.swift @@ -9,8 +9,6 @@ import Foundation import RxRelay import RxSwift -import Features -import AkidonComponents protocol AgreementViewModelInterface: AnyObject { var input: AgreementViewModel.Input { get } diff --git a/univIP/Module/Credits/CreditsViewController.swift b/univIP/Module/Credits/CreditsViewController.swift index 3323af95..9e49fd8f 100644 --- a/univIP/Module/Credits/CreditsViewController.swift +++ b/univIP/Module/Credits/CreditsViewController.swift @@ -7,7 +7,6 @@ import UIKit import RxSwift -import Entity final class CreditsViewController: UIViewController { @IBOutlet var tableView: UITableView! diff --git a/univIP/Module/Credits/CreditsViewModel.swift b/univIP/Module/Credits/CreditsViewModel.swift index fc64e29d..c3a36eb3 100644 --- a/univIP/Module/Credits/CreditsViewModel.swift +++ b/univIP/Module/Credits/CreditsViewModel.swift @@ -9,8 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity -import AkidonComponents protocol CreditsViewModelInterface: AnyObject { var input: CreditsViewModel.Input { get } diff --git a/univIP/Module/Credits/ThirdPartyCreditCell.swift b/univIP/Module/Credits/ThirdPartyCreditCell.swift index c6b8aec2..9441f359 100644 --- a/univIP/Module/Credits/ThirdPartyCreditCell.swift +++ b/univIP/Module/Credits/ThirdPartyCreditCell.swift @@ -6,7 +6,6 @@ // import UIKit -import Entity import NorthLayout final class ThirdPartyCreditCell: UITableViewCell { diff --git a/univIP/Module/HelpmessageAgree/HelpmessageAgreeRouter.swift b/univIP/Module/HelpmessageAgree/HelpmessageAgreeRouter.swift index 15b03f03..20166aeb 100644 --- a/univIP/Module/HelpmessageAgree/HelpmessageAgreeRouter.swift +++ b/univIP/Module/HelpmessageAgree/HelpmessageAgreeRouter.swift @@ -6,7 +6,6 @@ // import UIKit -import Features enum HelpmessageAgreeNavigationDestination { case back diff --git a/univIP/Module/HelpmessageAgree/HelpmessageAgreeViewModel.swift b/univIP/Module/HelpmessageAgree/HelpmessageAgreeViewModel.swift index 52339fa4..819fd782 100644 --- a/univIP/Module/HelpmessageAgree/HelpmessageAgreeViewModel.swift +++ b/univIP/Module/HelpmessageAgree/HelpmessageAgreeViewModel.swift @@ -9,7 +9,6 @@ import Foundation import RxRelay import RxSwift -import Features protocol HelpmessageAgreeViewModelInterface: AnyObject { var input: HelpmessageAgreeViewModel.Input { get } diff --git a/univIP/Module/Home/Banner/BannerScrollViewController.swift b/univIP/Module/Home/Banner/BannerScrollViewController.swift index 04196045..888d4efd 100644 --- a/univIP/Module/Home/Banner/BannerScrollViewController.swift +++ b/univIP/Module/Home/Banner/BannerScrollViewController.swift @@ -6,7 +6,6 @@ // import UIKit -import Entity protocol BannerScrollViewControllerDelegate: AnyObject { /// pageIndexが変わったときに呼ばれる diff --git a/univIP/Module/Home/Banner/UnivNewsTableCell.swift b/univIP/Module/Home/Banner/UnivNewsTableCell.swift index b7c134fd..cdb789ef 100644 --- a/univIP/Module/Home/Banner/UnivNewsTableCell.swift +++ b/univIP/Module/Home/Banner/UnivNewsTableCell.swift @@ -6,7 +6,6 @@ // import UIKit -import Entity import NorthLayout final class UnivNewsTableCell: UITableViewCell { diff --git a/univIP/Module/Home/HomeMenuCollectionCell.swift b/univIP/Module/Home/HomeMenuCollectionCell.swift index 189ee03e..6ef00d0b 100644 --- a/univIP/Module/Home/HomeMenuCollectionCell.swift +++ b/univIP/Module/Home/HomeMenuCollectionCell.swift @@ -6,7 +6,6 @@ // import UIKit -import Entity import NorthLayout final class HomeMenuCollectionCell: UICollectionViewCell { diff --git a/univIP/Module/Home/HomeRouter.swift b/univIP/Module/Home/HomeRouter.swift index dde3a3ed..0f5d6abf 100644 --- a/univIP/Module/Home/HomeRouter.swift +++ b/univIP/Module/Home/HomeRouter.swift @@ -6,8 +6,6 @@ // import Foundation -import Entity -import Features enum HomeNavigationDestination { case goWeb(URLRequest) diff --git a/univIP/Module/Home/HomeViewController.swift b/univIP/Module/Home/HomeViewController.swift index 772cc333..5b83c248 100644 --- a/univIP/Module/Home/HomeViewController.swift +++ b/univIP/Module/Home/HomeViewController.swift @@ -8,8 +8,6 @@ import UIKit import WebKit import RxSwift -import Entity -import AkidonComponents final class HomeViewController: UIViewController { @IBOutlet private weak var numberOfUsersLabel: UILabel! diff --git a/univIP/Module/Home/HomeViewModel.swift b/univIP/Module/Home/HomeViewModel.swift index ad279797..b1d1eaa3 100644 --- a/univIP/Module/Home/HomeViewModel.swift +++ b/univIP/Module/Home/HomeViewModel.swift @@ -9,9 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity -import Features -import AkidonComponents protocol HomeViewModelInterface: AnyObject { var input: HomeViewModel.Input { get } diff --git a/univIP/Module/Input/InputViewController.swift b/univIP/Module/Input/InputViewController.swift index 2916e496..5b91eea6 100644 --- a/univIP/Module/Input/InputViewController.swift +++ b/univIP/Module/Input/InputViewController.swift @@ -9,7 +9,6 @@ import UIKit import RxSwift import RxGesture -import AkidonComponents final class InputViewController: UIViewController { @IBOutlet private weak var titleLabel1: UILabel! diff --git a/univIP/Module/Input/InputViewModel.swift b/univIP/Module/Input/InputViewModel.swift index 578ac32f..30c39f94 100644 --- a/univIP/Module/Input/InputViewModel.swift +++ b/univIP/Module/Input/InputViewModel.swift @@ -9,7 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity protocol InputViewModelInterface: AnyObject { var input: InputViewModel.Input { get } diff --git a/univIP/Module/News/NewsRouter.swift b/univIP/Module/News/NewsRouter.swift index b061fa36..df2571ab 100644 --- a/univIP/Module/News/NewsRouter.swift +++ b/univIP/Module/News/NewsRouter.swift @@ -6,7 +6,6 @@ // import Foundation -import Features enum NewsNavigationDestination { case goWeb(URLRequest) diff --git a/univIP/Module/News/NewsViewController.swift b/univIP/Module/News/NewsViewController.swift index 8865de03..67b4636f 100644 --- a/univIP/Module/News/NewsViewController.swift +++ b/univIP/Module/News/NewsViewController.swift @@ -7,7 +7,6 @@ import UIKit import RxSwift -import Entity class NewsViewController: UIViewController { private var tableView = UITableView() diff --git a/univIP/Module/News/NewsViewModel.swift b/univIP/Module/News/NewsViewModel.swift index 43d7b7b6..c3459856 100644 --- a/univIP/Module/News/NewsViewModel.swift +++ b/univIP/Module/News/NewsViewModel.swift @@ -9,9 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity -import Features -import AkidonComponents protocol NewsViewModelInterface: AnyObject { var input: NewsViewModel.Input { get } diff --git a/univIP/Module/PRDetail/PRRouter.swift b/univIP/Module/PRDetail/PRRouter.swift index 25e3140d..415b4d2f 100644 --- a/univIP/Module/PRDetail/PRRouter.swift +++ b/univIP/Module/PRDetail/PRRouter.swift @@ -6,7 +6,6 @@ // import Foundation -import Entity enum PRNavigationDestination { case goWeb(URLRequest) diff --git a/univIP/Module/PRDetail/PRViewModel.swift b/univIP/Module/PRDetail/PRViewModel.swift index 568c9b3f..c58f9af6 100644 --- a/univIP/Module/PRDetail/PRViewModel.swift +++ b/univIP/Module/PRDetail/PRViewModel.swift @@ -9,7 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity protocol PRViewModelInterface: AnyObject { var input: PRViewModel.Input { get } diff --git a/univIP/Module/Splash/SplashRouter.swift b/univIP/Module/Splash/SplashRouter.swift index ac5a3215..9da23046 100644 --- a/univIP/Module/Splash/SplashRouter.swift +++ b/univIP/Module/Splash/SplashRouter.swift @@ -6,7 +6,6 @@ // import Foundation -import Features enum SplashNavigationDestination { case agree(String) diff --git a/univIP/Module/Splash/SplashViewController.swift b/univIP/Module/Splash/SplashViewController.swift index 228983e6..b6b4ba6b 100644 --- a/univIP/Module/Splash/SplashViewController.swift +++ b/univIP/Module/Splash/SplashViewController.swift @@ -8,7 +8,6 @@ import UIKit import WebKit import RxSwift -import Entity import NorthLayout final class SplashViewController: UIViewController { diff --git a/univIP/Module/Splash/SplashViewModel.swift b/univIP/Module/Splash/SplashViewModel.swift index a83302f4..4263ee0c 100644 --- a/univIP/Module/Splash/SplashViewModel.swift +++ b/univIP/Module/Splash/SplashViewModel.swift @@ -9,9 +9,6 @@ import Foundation import RxRelay import RxSwift -import Entity -import Features -import AkidonComponents protocol SplashViewModelInterface: AnyObject { var input: SplashViewModel.Input { get } diff --git a/univIP/Module/Web/WebViewController.swift b/univIP/Module/Web/WebViewController.swift index ce17d53f..d01d2670 100644 --- a/univIP/Module/Web/WebViewController.swift +++ b/univIP/Module/Web/WebViewController.swift @@ -9,7 +9,6 @@ import UIKit import WebKit import RxSwift import StoreKit -import Entity final class WebViewController: UIViewController { @IBOutlet private weak var closeButton: UIButton! diff --git a/univIP/Module/Web/WebViewModel.swift b/univIP/Module/Web/WebViewModel.swift index d8ec0cbb..03c3f633 100644 --- a/univIP/Module/Web/WebViewModel.swift +++ b/univIP/Module/Web/WebViewModel.swift @@ -8,8 +8,6 @@ import Foundation import RxRelay import RxSwift -import Entity -import AkidonComponents protocol WebViewModelInterface: AnyObject { var input: WebViewModel.Input { get } diff --git a/univIP/Repository/UnivAuthRepository.swift b/univIP/Repository/UnivAuthRepository.swift index ee6e2ff2..7b5c3f58 100644 --- a/univIP/Repository/UnivAuthRepository.swift +++ b/univIP/Repository/UnivAuthRepository.swift @@ -7,37 +7,36 @@ import Foundation import KeychainAccess -import Entity -public protocol UnivAuthRepositoryInterface { +protocol UnivAuthRepositoryInterface { func fetchUnivAuth() -> UnivAuth func setUnivAuth(_ items: UnivAuth) } -public final class UnivAuthOnKeyChainRepository: UnivAuthRepositoryInterface { - public static let shared = UnivAuthOnKeyChainRepository() - - public init() {} +final class UnivAuthOnKeyChainRepository: UnivAuthRepositoryInterface { + static let shared = UnivAuthOnKeyChainRepository() + + init() {} private let KEY_cAccount = "KEY_cAccount" private var accountCID: String { get { return getKeyChain(key: KEY_cAccount) } set(v) { setKeyChain(key: KEY_cAccount, value: v) } } - + private let KEY_password = "KEY_password" private var password: String { get { return getKeyChain(key: KEY_password) } set(v) { setKeyChain(key: KEY_password, value: v) } } - - public func fetchUnivAuth() -> UnivAuth { + + func fetchUnivAuth() -> UnivAuth { let accountCID = Self.shared.accountCID let password = Self.shared.password return UnivAuth(accountCID: accountCID, password: password) } - - public func setUnivAuth(_ items: UnivAuth) { + + func setUnivAuth(_ items: UnivAuth) { Self.shared.accountCID = items.accountCID Self.shared.password = items.password } @@ -52,23 +51,23 @@ extension UnivAuthOnKeyChainRepository { } return Keychain(service: identifier) } - + private func getKeyChain(key:String) -> String { do { if let value = try keychain.get(key) { return value } } catch { -// AKLog(level: .ERROR, message: "DataManager.getKeyChain catch") + // AKLog(level: .ERROR, message: "DataManager.getKeyChain catch") } return "" } - + private func setKeyChain(key:String, value:String) { do { try keychain .accessibility(Accessibility.alwaysThisDeviceOnly) // 常時アクセス可能、デバイス限定 .set(value, key: key) } catch { -// AKLog(level: .ERROR, message: "DataManager.setKeyChain catch") + // AKLog(level: .ERROR, message: "DataManager.setKeyChain catch") } } } diff --git a/univIP/Settings/Acknowledgements.plist b/univIP/Settings/Acknowledgements.plist index 62c27b1c..c8d2b79f 100644 --- a/univIP/Settings/Acknowledgements.plist +++ b/univIP/Settings/Acknowledgements.plist @@ -12,6 +12,20 @@ Type PSGroupSpecifier + + FooterText + Copyright (c) 2015 - 2016 Yosuke Ishikawa +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + License + MIT + Title + APIKit + Type + PSGroupSpecifier + FooterText The MIT License (MIT) @@ -47,6 +61,36 @@ SOFTWARE. FooterText The MIT License (MIT) +Copyright (c) 2014 - 2015 Atsushi Kiwaki (@_tid_) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + License + MIT + Title + Kanna + Type + PSGroupSpecifier + + + FooterText + The MIT License (MIT) + Copyright (c) 2014 kishikawa katsumi Permission is hereby granted, free of charge, to any person obtaining a copy @@ -221,50 +265,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI Type PSGroupSpecifier - - FooterText - Copyright (c) 2015 - 2016 Yosuke Ishikawa -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - License - MIT - Title - APIKit - Type - PSGroupSpecifier - - - FooterText - The MIT License (MIT) - -Copyright (c) 2014 - 2015 Atsushi Kiwaki (@_tid_) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - License - MIT - Title - Kanna - Type - PSGroupSpecifier - FooterText Generated by CocoaPods - https://cocoapods.org diff --git a/univIP/UseCase/UnivAuthStoreUseCase.swift b/univIP/UseCase/UnivAuthStoreUseCase.swift index 70cfb08f..6bd36d60 100644 --- a/univIP/UseCase/UnivAuthStoreUseCase.swift +++ b/univIP/UseCase/UnivAuthStoreUseCase.swift @@ -6,27 +6,26 @@ // import Foundation -import Entity -public protocol UnivAuthStoreUseCaseInterface { +protocol UnivAuthStoreUseCaseInterface { func fetchUnivAuth() -> UnivAuth func setUnivAuth(_ items: UnivAuth) } -public struct UnivAuthStoreUseCase: UnivAuthStoreUseCaseInterface { +struct UnivAuthStoreUseCase: UnivAuthStoreUseCaseInterface { private let univAuthRepository: UnivAuthRepositoryInterface - - public init( + + init( univAuthRepository: UnivAuthRepositoryInterface ) { self.univAuthRepository = univAuthRepository } - - public func fetchUnivAuth() -> UnivAuth { + + func fetchUnivAuth() -> UnivAuth { return univAuthRepository.fetchUnivAuth() } - - public func setUnivAuth(_ items: UnivAuth) { + + func setUnivAuth(_ items: UnivAuth) { univAuthRepository.setUnivAuth(items) } }