From 3d465f5760bbf18f53fbcdeb4cc78963955cbfe4 Mon Sep 17 00:00:00 2001 From: akidon0000 <akidon0000@akidon0000noMacBook-Pro.local> Date: Sat, 21 Sep 2024 11:53:10 +0900 Subject: [PATCH] =?UTF-8?q?[196]=E4=B8=8D=E8=A6=81=E3=81=AAimport=E5=89=8A?= =?UTF-8?q?=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<HomeEventInfosGetRequest.Response> 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<URLRequest> 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 @@ <key>Type</key> <string>PSGroupSpecifier</string> </dict> + <dict> + <key>FooterText</key> + <string>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. +</string> + <key>License</key> + <string>MIT</string> + <key>Title</key> + <string>APIKit</string> + <key>Type</key> + <string>PSGroupSpecifier</string> + </dict> <dict> <key>FooterText</key> <string>The MIT License (MIT) @@ -47,6 +61,36 @@ SOFTWARE. <key>FooterText</key> <string>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.</string> + <key>License</key> + <string>MIT</string> + <key>Title</key> + <string>Kanna</string> + <key>Type</key> + <string>PSGroupSpecifier</string> + </dict> + <dict> + <key>FooterText</key> + <string>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 <key>Type</key> <string>PSGroupSpecifier</string> </dict> - <dict> - <key>FooterText</key> - <string>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. -</string> - <key>License</key> - <string>MIT</string> - <key>Title</key> - <string>APIKit</string> - <key>Type</key> - <string>PSGroupSpecifier</string> - </dict> - <dict> - <key>FooterText</key> - <string>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.</string> - <key>License</key> - <string>MIT</string> - <key>Title</key> - <string>Kanna</string> - <key>Type</key> - <string>PSGroupSpecifier</string> - </dict> <dict> <key>FooterText</key> <string>Generated by CocoaPods - https://cocoapods.org</string> 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) } }