Remove CYOAPageView which subclasses the Content Page. This subclass …

…is not needed.

godtools.xcodeproj/project.pbxproj

@@ -625,8 +625,6 @@
 		457FEEFC2CBEA3C90092E84B /* CYOAToolSettingsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457FEEF82CBEA3C90092E84B /* CYOAToolSettingsObserver.swift */; };
 		457FEEFD2CBEA3C90092E84B /* RemoteShareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457FEEF62CBEA3C90092E84B /* RemoteShareable.swift */; };
 		457FEEFE2CBEA3C90092E84B /* LinkShareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457FEEF52CBEA3C90092E84B /* LinkShareable.swift */; };
-		457FEF032CBEA43B0092E84B /* CYOAPageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457FEF002CBEA43B0092E84B /* CYOAPageViewModel.swift */; };
-		457FEF042CBEA43B0092E84B /* CYOAPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457FEEFF2CBEA43B0092E84B /* CYOAPageView.swift */; };
 		4581657626F4DD4D000D660F /* MobileContentRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4581657526F4DD4D000D660F /* MobileContentRowView.swift */; };
 		4581696F2CDD011600039D03 /* PersistUserToolLanguageSettingsDataLayerDependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4581696C2CDD011600039D03 /* PersistUserToolLanguageSettingsDataLayerDependencies.swift */; };
 		458169702CDD011600039D03 /* PersistUserToolLanguageSettingsDiContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4581696D2CDD011600039D03 /* PersistUserToolLanguageSettingsDiContainer.swift */; };
@@ -2320,8 +2318,6 @@
 		457FEEF62CBEA3C90092E84B /* RemoteShareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteShareable.swift; sourceTree = "<group>"; };
 		457FEEF82CBEA3C90092E84B /* CYOAToolSettingsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CYOAToolSettingsObserver.swift; sourceTree = "<group>"; };
 		457FEEF92CBEA3C90092E84B /* TractToolSettingsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TractToolSettingsObserver.swift; sourceTree = "<group>"; };
-		457FEEFF2CBEA43B0092E84B /* CYOAPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CYOAPageView.swift; sourceTree = "<group>"; };
-		457FEF002CBEA43B0092E84B /* CYOAPageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CYOAPageViewModel.swift; sourceTree = "<group>"; };
 		4581657526F4DD4D000D660F /* MobileContentRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MobileContentRowView.swift; sourceTree = "<group>"; };
 		4581696C2CDD011600039D03 /* PersistUserToolLanguageSettingsDataLayerDependencies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistUserToolLanguageSettingsDataLayerDependencies.swift; sourceTree = "<group>"; };
 		4581696D2CDD011600039D03 /* PersistUserToolLanguageSettingsDiContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistUserToolLanguageSettingsDiContainer.swift; sourceTree = "<group>"; };
@@ -6653,7 +6649,6 @@
 			isa = PBXGroup;
 			children = (
 				4578176D279C7CC800ED50F2 /* ViewFactory */,
-				457FEF022CBEA43B0092E84B /* Views */,
 			);
 			path = ChooseYourOwnAdventure;
 			sourceTree = "<group>";
@@ -6744,23 +6739,6 @@
 			path = Subclasses;
 			sourceTree = "<group>";
 		};
-		457FEF012CBEA43B0092E84B /* Page */ = {
-			isa = PBXGroup;
-			children = (
-				457FEEFF2CBEA43B0092E84B /* CYOAPageView.swift */,
-				457FEF002CBEA43B0092E84B /* CYOAPageViewModel.swift */,
-			);
-			path = Page;
-			sourceTree = "<group>";
-		};
-		457FEF022CBEA43B0092E84B /* Views */ = {
-			isa = PBXGroup;
-			children = (
-				457FEF012CBEA43B0092E84B /* Page */,
-			);
-			path = Views;
-			sourceTree = "<group>";
-		};
 		4581657426F4DD42000D660F /* ContentRow */ = {
 			isa = PBXGroup;
 			children = (
@@ -13730,8 +13708,6 @@
 				45AE974127C97A9400C2CB33 /* Video+MobileContentRenderableModel.swift in Sources */,
 				45F267A128907F5D006679F2 /* RealmResourcesCacheSync.swift in Sources */,
 				45558352269F2D1000C3FF14 /* LessonPageView.swift in Sources */,
-				457FEF032CBEA43B0092E84B /* CYOAPageViewModel.swift in Sources */,
-				457FEF042CBEA43B0092E84B /* CYOAPageView.swift in Sources */,
 				45FB1CC2295F4184002BACD9 /* LayoutDirection+LanguageDirectionDomainModel.swift in Sources */,
 				45B338372AF4381600D18C63 /* TutorialPageMediaDomainModel.swift in Sources */,
 				450D63AB2AC8A84600B90319 /* TrackExitLinkAnalyticsPropertiesDomainModel.swift in Sources */,

godtools/App/Services/Renderer/Views/ChooseYourOwnAdventure/ViewFactory/ChooseYourOwnAdventurePageViewFactory.swift

@@ -11,6 +11,9 @@ import GodToolsToolParser
 
 class ChooseYourOwnAdventurePageViewFactory: MobileContentPageViewFactoryType {
 
+    private static let introPageId: String = "intro"
+    private static let categoriesPageId: String = "categories"
+
     private let trackScreenViewAnalyticsUseCase: TrackScreenViewAnalyticsUseCase
     private let mobileContentAnalytics: MobileContentRendererAnalytics
 
@@ -25,15 +28,12 @@ class ChooseYourOwnAdventurePageViewFactory: MobileContentPageViewFactoryType {
         if let contentPage = renderableModel as? ContentPage {
 
             let contentInsets: UIEdgeInsets
-
-            let isIntroPage: Bool = contentPage.id == "intro"
-            let isCategoriesPage: Bool = contentPage.id == "categories"
-
-            if isIntroPage {
+
+            if contentPage.id == Self.introPageId {
 
                 contentInsets = UIEdgeInsets(top: 0, left: 60, bottom: 0, right: 60)
             }
-            else if isCategoriesPage {
+            else if contentPage.id == Self.categoriesPageId {
 
                 contentInsets = UIEdgeInsets(top: 30, left: 20, bottom: 0, right: 20)
             }
@@ -42,32 +42,20 @@ class ChooseYourOwnAdventurePageViewFactory: MobileContentPageViewFactoryType {
                 contentInsets = .zero
             }
 
-            let viewModel = CYOAPageViewModel(
+            let viewModel = MobileContentContentPageViewModel(
                 contentPage: contentPage,
                 renderedPageContext: renderedPageContext,
                 mobileContentAnalytics: mobileContentAnalytics,
                 trackScreenViewAnalyticsUseCase: trackScreenViewAnalyticsUseCase
             )
 
-            let view = CYOAPageView(
+            let view = MobileContentContentPageView(
                 viewModel: viewModel,
                 contentInsets: contentInsets
             )
 
             return view
         }
-        else if let contentFlow = renderableModel as? GodToolsToolParser.Flow {
-
-            let viewModel = MobileContentFlowViewModel(
-                contentFlow: contentFlow,
-                renderedPageContext: renderedPageContext,
-                mobileContentAnalytics: mobileContentAnalytics
-            )
-
-            let view = MobileContentFlowView(viewModel: viewModel)
-
-            return view
-        }
 
         return nil
     }