From 1a6521d5299fe07496b8fe876e67553a9d7d8fa7 Mon Sep 17 00:00:00 2001
From: Andrea Busi <busi.andrea@gmail.com>
Date: Tue, 28 Jul 2020 21:17:39 +0200
Subject: [PATCH] refactor: Reorganize some classes

---
 .../project.pbxproj                           | 22 ++++++++++++++++---
 .../Menu/MenuHeaderTableViewCell.swift        |  0
 .../Menu/MenuItemTableViewCell.swift          |  0
 .../Menu/MenuViewController.swift             |  0
 .../IAPHelper.swift                           |  0
 .../VersioneProProducts.swift                 |  0
 .../Storyboards/Base.lproj/Main.storyboard    | 18 +++++++--------
 7 files changed, 28 insertions(+), 12 deletions(-)
 rename Sources/Earthquake Network/{ViewController => Controllers}/Menu/MenuHeaderTableViewCell.swift (100%)
 rename Sources/Earthquake Network/{ViewController => Controllers}/Menu/MenuItemTableViewCell.swift (100%)
 rename Sources/Earthquake Network/{ViewController => Controllers}/Menu/MenuViewController.swift (100%)
 rename Sources/Earthquake Network/{Acquisti in App => Models}/IAPHelper.swift (100%)
 rename Sources/Earthquake Network/{Acquisti in App => Models}/VersioneProProducts.swift (100%)

diff --git a/Sources/Earthquake Network.xcodeproj/project.pbxproj b/Sources/Earthquake Network.xcodeproj/project.pbxproj
index 1a3d9d2..921cc36 100644
--- a/Sources/Earthquake Network.xcodeproj/project.pbxproj	
+++ b/Sources/Earthquake Network.xcodeproj/project.pbxproj	
@@ -416,8 +416,6 @@
 				8CEAE3D822114D1700AF948F /* faq.txt */,
 				8CEAE3D522114D1600AF948F /* info.txt */,
 				8CEAE3D622114D1600AF948F /* privacy.txt */,
-				8C483CB721FDACD300259FD2 /* IAPHelper.swift */,
-				8C483CBB21FDACE500259FD2 /* VersioneProProducts.swift */,
 				8C483CBF21FDACEE00259FD2 /* DetailViewController.swift */,
 				8C483CC321FDACF400259FD2 /* ProductCell.swift */,
 				8C483CCC21FDB52500259FD2 /* MasterViewController1.swift */,
@@ -442,7 +440,6 @@
 		8C5EA22E217645C8002DC156 /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
-				DCAB01E124CEBFD500E8B54C /* Menu */,
 				8CCE164521E69A9300173CD9 /* impostazioniNotifiche */,
 				8C602247218D9DBF00C799C2 /* Dettagli mappa */,
 				8CF05B4A218C41E60055012B /* inputView */,
@@ -547,6 +544,8 @@
 				8CBD3DC62149B9AD0070C963 /* AppDelegate.m */,
 				8C483CB021FDA8C700259FD2 /* Earthquake Network-Bridging-Header.h */,
 				8CBD3DCE2149B9AD0070C963 /* Earthquake_Network.xcdatamodeld */,
+				DCB6FBEA24D0B11300ED23B8 /* Controllers */,
+				DCB6FBE924D0B0DF00ED23B8 /* Models */,
 				DC3ADD3024CB1F1E00737919 /* Storyboards */,
 				DC3ADD2F24CB1EFB00737919 /* Libs */,
 				DC3ADD2D24CB1EAF00737919 /* Resources */,
@@ -765,6 +764,23 @@
 			path = Menu;
 			sourceTree = "<group>";
 		};
+		DCB6FBE924D0B0DF00ED23B8 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				8C483CBB21FDACE500259FD2 /* VersioneProProducts.swift */,
+				8C483CB721FDACD300259FD2 /* IAPHelper.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		DCB6FBEA24D0B11300ED23B8 /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				DCAB01E124CEBFD500E8B54C /* Menu */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
diff --git a/Sources/Earthquake Network/ViewController/Menu/MenuHeaderTableViewCell.swift b/Sources/Earthquake Network/Controllers/Menu/MenuHeaderTableViewCell.swift
similarity index 100%
rename from Sources/Earthquake Network/ViewController/Menu/MenuHeaderTableViewCell.swift
rename to Sources/Earthquake Network/Controllers/Menu/MenuHeaderTableViewCell.swift
diff --git a/Sources/Earthquake Network/ViewController/Menu/MenuItemTableViewCell.swift b/Sources/Earthquake Network/Controllers/Menu/MenuItemTableViewCell.swift
similarity index 100%
rename from Sources/Earthquake Network/ViewController/Menu/MenuItemTableViewCell.swift
rename to Sources/Earthquake Network/Controllers/Menu/MenuItemTableViewCell.swift
diff --git a/Sources/Earthquake Network/ViewController/Menu/MenuViewController.swift b/Sources/Earthquake Network/Controllers/Menu/MenuViewController.swift
similarity index 100%
rename from Sources/Earthquake Network/ViewController/Menu/MenuViewController.swift
rename to Sources/Earthquake Network/Controllers/Menu/MenuViewController.swift
diff --git a/Sources/Earthquake Network/Acquisti in App/IAPHelper.swift b/Sources/Earthquake Network/Models/IAPHelper.swift
similarity index 100%
rename from Sources/Earthquake Network/Acquisti in App/IAPHelper.swift
rename to Sources/Earthquake Network/Models/IAPHelper.swift
diff --git a/Sources/Earthquake Network/Acquisti in App/VersioneProProducts.swift b/Sources/Earthquake Network/Models/VersioneProProducts.swift
similarity index 100%
rename from Sources/Earthquake Network/Acquisti in App/VersioneProProducts.swift
rename to Sources/Earthquake Network/Models/VersioneProProducts.swift
diff --git a/Sources/Earthquake Network/Storyboards/Base.lproj/Main.storyboard b/Sources/Earthquake Network/Storyboards/Base.lproj/Main.storyboard
index 68e10cf..c0f70e5 100644
--- a/Sources/Earthquake Network/Storyboards/Base.lproj/Main.storyboard	
+++ b/Sources/Earthquake Network/Storyboards/Base.lproj/Main.storyboard	
@@ -254,7 +254,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Rtx-9s-3xD" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1468.125" y="1213.7323943661972"/>
+            <point key="canvasLocation" x="-1403" y="1915"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="P9F-yE-H1d">
@@ -1638,7 +1638,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fcy-2W-4PR" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="292" y="-299"/>
+            <point key="canvasLocation" x="-2760" y="-379"/>
         </scene>
         <!--Rete Smartphone-->
         <scene sceneID="9EN-d8-bt2">
@@ -2254,7 +2254,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="EZu-e2-SOI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="967.5" y="-300"/>
+            <point key="canvasLocation" x="966" y="507"/>
         </scene>
         <!--Abbonamenti View Controller-->
         <scene sceneID="M5N-kR-wzH">
@@ -2469,7 +2469,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2ln-J3-Hej" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1709.5999999999999" y="-299.10044977511245"/>
+            <point key="canvasLocation" x="-90" y="1914"/>
         </scene>
         <!--Dettagli Abbonamento View Controller-->
         <scene sceneID="esm-8E-IZn">
@@ -2630,7 +2630,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="SKO-PB-krH" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2620" y="-137"/>
+            <point key="canvasLocation" x="1019" y="1914"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="wgJ-Ql-baW">
@@ -2666,7 +2666,7 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="XfN-WY-JiD" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1017" y="472"/>
+            <point key="canvasLocation" x="2323" y="939"/>
         </scene>
         <!--Pastquakes Dettagli Mappa-->
         <scene sceneID="YDE-4Y-R8w">
@@ -2743,7 +2743,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Q8y-Fc-DjQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1757.5999999999999" y="471.8140929535233"/>
+            <point key="canvasLocation" x="3188" y="940"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="pK6-is-2fg">
@@ -4538,7 +4538,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FEQ-R5-XxM" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-694" y="1214"/>
+            <point key="canvasLocation" x="-2139" y="410"/>
         </scene>
         <!--Detail-->
         <scene sceneID="cF1-tQ-Ug4">
@@ -4572,7 +4572,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="th3-sN-8wo" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="137" y="1214"/>
+            <point key="canvasLocation" x="-1238" y="410"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="ugg-0S-WiU">