diff --git a/MVMCoreUI/BaseControllers/MFViewController+Model.swift b/MVMCoreUI/BaseControllers/MFViewController+Model.swift index 05c9790d..924ce4c7 100644 --- a/MVMCoreUI/BaseControllers/MFViewController+Model.swift +++ b/MVMCoreUI/BaseControllers/MFViewController+Model.swift @@ -10,7 +10,7 @@ import Foundation public extension MFViewController { - @objc func parsePageJSON() { + @objc func parsePageJSON() { guard let pageJSON = loadObject?.pageJSON as? [String: AnyHashable] else { return } @@ -20,8 +20,7 @@ public extension MFViewController { let pageModel = try decoder.decode(PageModel.self, from: pageData) self.pageModel = pageModel } catch { - print("error: \(error)") + MVMCoreUILoggingHandler.logDebugMessage(withDelegate: "error: \(error)") } - } } diff --git a/MVMCoreUI/BaseControllers/MFViewController.h b/MVMCoreUI/BaseControllers/MFViewController.h index ded7446f..be8c3bd2 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.h +++ b/MVMCoreUI/BaseControllers/MFViewController.h @@ -29,7 +29,6 @@ #import #import - @class MainMenuViewController; @class MVMCoreUITabBarPageControlViewController; @class MVMAnimationManager; @@ -43,8 +42,6 @@ @property (nullable, strong, nonatomic) PageModel *pageModel; -//@property (nonatomic) PageModel pageModel; - // The current selected text field. @property (nullable, weak, nonatomic) __block id selectedField; diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m index 3b68ef7d..1cde71f2 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.m +++ b/MVMCoreUI/BaseControllers/MFViewController.m @@ -37,7 +37,6 @@ #import "MVMCoreUITabBarPageControlViewController.h" #import "MVMCoreUINavigationController.h" #import - @import MVMAnimationFramework; @interface MFViewController() @@ -97,6 +96,7 @@ self.pageType = loadObject.pageType; self.loadObject = loadObject; [self parsePageJSON]; + // Verifies all modules needed are loaded. return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error]; } @@ -249,6 +249,7 @@ - (BOOL)newPageLoaded:(nonnull NSDictionary *)page { self.loadObject.pageJSON = page; + [self parsePageJSON]; return YES; }