Merge pull request #202 from tokudai0000/195-fix-file-hierarchy

195 fix file hierarchy

Podfile

@@ -29,7 +29,7 @@ end
 post_install do | installer |
   require 'fileutils'
   # 謝辞
-  FileUtils.cp_r('Pods/Target Support Files/Pods-All-univIP/Pods-All-univIP-Acknowledgements.plist', 'univIP/Settings/Acknowledgements.plist', :remove_destination => true)
+  FileUtils.cp_r('Pods/Target Support Files/Pods-All-univIP/Pods-All-univIP-Acknowledgements.plist', 'App/SupportingFiles/Acknowledgements.plist', :remove_destination => true)
 
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|

Podfile.lock

@@ -51,6 +51,6 @@ SPEC CHECKSUMS:
   RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6
   RxSwift: a4b44f7d24599f674deebd1818eab82e58410632
 
-PODFILE CHECKSUM: 04058d42c6658d2f7c18cb436a43b85af1415adf
+PODFILE CHECKSUM: 15fa5f2b398fd1583cae284af9a5f3c3d61e8095
 
 COCOAPODS: 1.15.2

univIP.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1515B1902C9FDE5800D73B78 /* R.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1515B18F2C9FDE5800D73B78 /* R.generated.swift */; };
 		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 */; };
@@ -47,7 +48,6 @@
 		1A2237982AB7EDF900A65301 /* Acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1A2237922AB7EDF900A65301 /* Acknowledgements.plist */; };
 		1A239B5A2A84A90D0085BA46 /* PRRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A239B592A84A90D0085BA46 /* PRRouter.swift */; };
 		1A239B5C2A84A9C30085BA46 /* PRViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A239B5B2A84A9C30085BA46 /* PRViewModel.swift */; };
-		1A26A2612A77FB3C00BC6988 /* R.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A26A2602A77FB3C00BC6988 /* R.generated.swift */; };
 		1A2B04B12AAF5C9B0085188A /* UnivAuthRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ACD66372A867C0300244DC0 /* UnivAuthRepository.swift */; };
 		1A2B04B22AAF5C9B0085188A /* AcceptedTermVersionRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD00BF22A8BFE55008C7EFC /* AcceptedTermVersionRepository.swift */; };
 		1A2B04B32AAF5C9B0085188A /* WebViewCloseCountRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A11C3DF2A96577100D95122 /* WebViewCloseCountRepository.swift */; };
@@ -151,6 +151,7 @@
 		0BB7E36B74A1A0E77D5455CE /* Pods-All-Repository.stub.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-All-Repository.stub.xcconfig"; path = "Target Support Files/Pods-All-Repository/Pods-All-Repository.stub.xcconfig"; sourceTree = "<group>"; };
 		0C52338841603C078A18CD71 /* Pods_All_Common.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_All_Common.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1419D184B669A4B8094BEA0C /* Pods-All-Core.stub.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-All-Core.stub.xcconfig"; path = "Target Support Files/Pods-All-Core/Pods-All-Core.stub.xcconfig"; sourceTree = "<group>"; };
+		1515B18F2C9FDE5800D73B78 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = "<group>"; };
 		15768A922C9DDE70006F81C1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		15768A942C9DE129006F81C1 /* GoogleService-Info.template.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.template.plist"; sourceTree = "<group>"; };
 		1A0230162A8F94680084DD0B /* NumberOfUsersAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOfUsersAPI.swift; sourceTree = "<group>"; };
@@ -179,7 +180,6 @@
 		1A2237942AB7EDF900A65301 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1A239B592A84A90D0085BA46 /* PRRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PRRouter.swift; sourceTree = "<group>"; };
 		1A239B5B2A84A9C30085BA46 /* PRViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PRViewModel.swift; sourceTree = "<group>"; };
-		1A26A2602A77FB3C00BC6988 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = SOURCE_ROOT; };
 		1A30D0A728F5BFB500C4012E /* HomeMenuCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMenuCollectionCell.swift; sourceTree = "<group>"; };
 		1A30D0AD28F6D79800C4012E /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
 		1A30D0AF28F6D7BC00C4012E /* Web.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Web.storyboard; sourceTree = "<group>"; };
@@ -318,6 +318,31 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		1527EDA32C9FD4ED000606C4 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				1A7EBFC02A9C6EB60042AACA /* Core */,
+				1A2B04DD2AAFE5E60085188A /* Entity */,
+				1A8E3B332A972AB50060254E /* Repository */,
+				1A6B56612AFF8CBD00C1771F /* Requests */,
+				1A026B002A9AFC8C00ADD541 /* UseCase */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		15DD41A22C9FCB8000E2516C /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				1A19730D27C4BCB200F36FE7 /* AppDelegate.swift */,
+				1ACC54BB2AB7F4C6005A5CAA /* Colors.xcassets */,
+				1A026B312A9B03A900ADD541 /* Images.xcassets */,
+				1A22378E2AB7EDF900A65301 /* Localizable.strings */,
+				1ABE8BE627B10590001EEA79 /* LaunchScreen.storyboard */,
+				1515B18F2C9FDE5800D73B78 /* R.generated.swift */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		1A026B002A9AFC8C00ADD541 /* UseCase */ = {
 			isa = PBXGroup;
 			children = (
@@ -328,14 +353,16 @@
 			path = UseCase;
 			sourceTree = "<group>";
 		};
-		1A026B1D2A9B028600ADD541 /* Common */ = {
+		1A026B1D2A9B028600ADD541 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				1A41EAE2272914CC0064CDB7 /* AKLibrary.swift */,
 				1A2237872AB6C58200A65301 /* AppConstants.swift */,
 				1AFC67CC2732BFA80059A053 /* Url.swift */,
 				1A154F282A8C809900E6D3CB /* URLCheckers.swift */,
+				1A6B567B2AFF91B800C1771F /* Extensions */,
 			);
-			path = Common;
+			path = Utils;
 			sourceTree = "<group>";
 		};
 		1A11C3CF2A9523BC00D95122 /* Credits */ = {
@@ -350,17 +377,16 @@
 			path = Credits;
 			sourceTree = "<group>";
 		};
-		1A22378D2AB7EDF900A65301 /* Settings */ = {
+		1A22378D2AB7EDF900A65301 /* SupportingFiles */ = {
 			isa = PBXGroup;
 			children = (
 				1A2237922AB7EDF900A65301 /* Acknowledgements.plist */,
 				15768A922C9DDE70006F81C1 /* GoogleService-Info.plist */,
 				15768A942C9DE129006F81C1 /* GoogleService-Info.template.plist */,
 				1A2237942AB7EDF900A65301 /* Info.plist */,
-				1A22378E2AB7EDF900A65301 /* Localizable.strings */,
 				1A2237932AB7EDF900A65301 /* Root.plist */,
 			);
-			path = Settings;
+			path = SupportingFiles;
 			sourceTree = "<group>";
 		};
 		1A2B04DD2AAFE5E60085188A /* Entity */ = {
@@ -447,7 +473,7 @@
 			path = Splash;
 			sourceTree = "<group>";
 		};
-		1A6B56612AFF8CBD00C1771F /* Features */ = {
+		1A6B56612AFF8CBD00C1771F /* Requests */ = {
 			isa = PBXGroup;
 			children = (
 				1A3A75F92916792600069818 /* AdItemsAPI.swift */,
@@ -460,20 +486,19 @@
 				1A0230162A8F94680084DD0B /* NumberOfUsersAPI.swift */,
 				1A02301A2A8F98BF0084DD0B /* TermTextAPI.swift */,
 			);
-			path = Features;
+			path = Requests;
 			sourceTree = "<group>";
 		};
-		1A6B567B2AFF91B800C1771F /* AkidonComponents */ = {
+		1A6B567B2AFF91B800C1771F /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				1A41EAE2272914CC0064CDB7 /* AKLibrary.swift */,
+				1A9A15722BA41DE7008BB77E /* CustomDuoButton.swift */,
 				1A6EF50E27BA5C63004D0B2C /* DateFormatter+Exetnsion.swift */,
 				1A556D912963BD4B00A650B2 /* String+Exetnsion.swift */,
 				1ADE675D2A77A13E00B79D69 /* UIColor+Exetnsion.swift */,
 				1A30D0B128F6ED2E00C4012E /* UIImageView+Exetnsion.swift */,
-				1A9A15722BA41DE7008BB77E /* CustomDuoButton.swift */,
 			);
-			path = AkidonComponents;
+			path = Extensions;
 			sourceTree = "<group>";
 		};
 		1A7EBFC02A9C6EB60042AACA /* Core */ = {
@@ -517,7 +542,7 @@
 		1AA056C026BD2AE100343005 = {
 			isa = PBXGroup;
 			children = (
-				1AA056CB26BD2AE100343005 /* univIP */,
+				1AA056CB26BD2AE100343005 /* App */,
 				1AB37B6D26FDFCEA008A2D2F /* univIPTests */,
 				1C91199C2DFA8E4D8B3EBE6D /* Frameworks */,
 				1AA056CA26BD2AE100343005 /* Products */,
@@ -535,43 +560,34 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		1AA056CB26BD2AE100343005 /* univIP */ = {
+		1AA056CB26BD2AE100343005 /* App */ = {
 			isa = PBXGroup;
 			children = (
-				1A6B567B2AFF91B800C1771F /* AkidonComponents */,
-				1A2B04DD2AAFE5E60085188A /* Entity */,
-				1A6B56612AFF8CBD00C1771F /* Features */,
-				1A22378D2AB7EDF900A65301 /* Settings */,
-				1A19730D27C4BCB200F36FE7 /* AppDelegate.swift */,
-				1ABE8BE627B10590001EEA79 /* LaunchScreen.storyboard */,
-				1A26A2602A77FB3C00BC6988 /* R.generated.swift */,
-				1AC4BE922A7DE91200598EED /* RootViewController.swift */,
-				1A026B312A9B03A900ADD541 /* Images.xcassets */,
-				1ACC54BB2AB7F4C6005A5CAA /* Colors.xcassets */,
-				1A026B1D2A9B028600ADD541 /* Common */,
-				1A7EBFC02A9C6EB60042AACA /* Core */,
+				1527EDA32C9FD4ED000606C4 /* Models */,
 				1AA056E926BD2DCA00343005 /* Module */,
-				1A8E3B332A972AB50060254E /* Repository */,
-				1A026B002A9AFC8C00ADD541 /* UseCase */,
+				15DD41A22C9FCB8000E2516C /* Resources */,
+				1A22378D2AB7EDF900A65301 /* SupportingFiles */,
+				1A026B1D2A9B028600ADD541 /* Utils */,
 			);
-			path = univIP;
+			path = App;
 			sourceTree = "<group>";
 		};
 		1AA056E926BD2DCA00343005 /* Module */ = {
 			isa = PBXGroup;
 			children = (
 				1A50CDAC2A832AE70079A090 /* MainRouter.swift */,
 				1A50CDAE2A832D170079A090 /* MainViewController.swift */,
+				1AC4BE922A7DE91200598EED /* RootViewController.swift */,
 				1ABDE75326DE530300D4B04E /* Agreement */,
 				1A384F9228FD5D5C00A1F52E /* ClubLists */,
 				1A11C3CF2A9523BC00D95122 /* Credits */,
-				1A49B0AC2A893F8500D6F69A /* Splash */,
 				1AED5D102A91A3E20090B8DE /* HelpmessageAgree */,
 				1A384F9028FD5D1E00A1F52E /* Home */,
 				1ABE8BCB27B10489001EEA79 /* Input */,
 				1A384F9128FD5D4E00A1F52E /* News */,
 				1AC1332B294C2D1000E3DC16 /* PRDetail */,
 				1A30D0B728F9BED600C4012E /* Settings */,
+				1A49B0AC2A893F8500D6F69A /* Splash */,
 				1A30D0AC28F6D75000C4012E /* Web */,
 			);
 			path = Module;
@@ -891,11 +907,11 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				$SRCROOT/R.generated.swift,
+				$SRCROOT/App/Resources/R.generated.swift,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"$PODS_ROOT/R.swift/rswift\" generate \"$SRCROOT/R.generated.swift\"\n";
+			shellScript = "\"$PODS_ROOT/R.swift/rswift\" generate \"$SRCROOT/App/Resources/R.generated.swift\"\n";
 		};
 		6BC3F9ADAE1ED57107C2EC77 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -968,6 +984,7 @@
 				15C670112C9E6ADE004AC48A /* NewsItemModel.swift in Sources */,
 				15C670122C9E6ADE004AC48A /* SettingsItem.swift in Sources */,
 				15C670132C9E6ADE004AC48A /* UnivAuth.swift in Sources */,
+				1515B1902C9FDE5800D73B78 /* R.generated.swift in Sources */,
 				15C670142C9E6ADE004AC48A /* WebScrapeError.swift in Sources */,
 				15C670032C9E6AD2004AC48A /* AKLibrary.swift in Sources */,
 				15C670042C9E6AD2004AC48A /* DateFormatter+Exetnsion.swift in Sources */,
@@ -1015,7 +1032,6 @@
 				1AD00BEB2A8BD457008C7EFC /* SplashViewModel.swift in Sources */,
 				1A58F6812A8645120025737A /* InputRouter.swift in Sources */,
 				1A6C51BA2905077E00A3E85A /* ClubListsViewController.swift in Sources */,
-				1A26A2612A77FB3C00BC6988 /* R.generated.swift in Sources */,
 				1AD00BE92A8BD44A008C7EFC /* SplashViewController.swift in Sources */,
 				1A20C4612A809A970063B5D6 /* HomeRouter.swift in Sources */,
 				1A239B5A2A84A90D0085BA46 /* PRRouter.swift in Sources */,
@@ -1216,7 +1232,7 @@
 					"\"${PODS_ROOT}/Headers/Public/mailcore2-ios\"",
 					"\"${PODS_ROOT}/Headers/Public/mailcore2-ios/MailCore\"",
 				);
-				INFOPLIST_FILE = univIP/Settings/Info.plist;
+				INFOPLIST_FILE = App/SupportingFiles/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "トクメモ＋";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -1285,7 +1301,7 @@
 					"\"${PODS_ROOT}/Headers/Public/mailcore2-ios\"",
 					"\"${PODS_ROOT}/Headers/Public/mailcore2-ios/MailCore\"",
 				);
-				INFOPLIST_FILE = univIP/Settings/Info.plist;
+				INFOPLIST_FILE = App/SupportingFiles/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "トクメモ＋";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;