mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes for MFViewController

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-11-05 09:02:49 -05:00
parent 37e1cb9e36
commit a7473e2079
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MVMCoreUI/BaseControllers/MFViewController+Model.swift
View File

@ -10,7 +10,7 @@ import Foundation
public extension MFViewController { public extension MFViewController {
@objc func parsePageJSON() { @objc func parsePageJSON() {
guard let pageJSON = loadObject?.pageJSON as? [String: AnyHashable] else { guard let pageJSON = loadObject?.pageJSON as? [String: AnyHashable] else {
return return
} }
@ -20,8 +20,7 @@ public extension MFViewController {
let pageModel = try decoder.decode(PageModel.self, from: pageData) let pageModel = try decoder.decode(PageModel.self, from: pageData)
self.pageModel = pageModel self.pageModel = pageModel
} catch { } catch {
print("error: \(error)") MVMCoreUILoggingHandler.logDebugMessage(withDelegate: "error: \(error)")
} }
} }
} }

3
MVMCoreUI/BaseControllers/MFViewController.h
View File

@ -29,7 +29,6 @@
#import <MVMCoreUI/MVMCoreUIDetailViewProtocol.h> #import <MVMCoreUI/MVMCoreUIDetailViewProtocol.h>
#import <MVMCoreUI/MoleculeDelegateProtocol.h> #import <MVMCoreUI/MoleculeDelegateProtocol.h>
@class MainMenuViewController; @class MainMenuViewController;
@class MVMCoreUITabBarPageControlViewController; @class MVMCoreUITabBarPageControlViewController;
@class MVMAnimationManager; @class MVMAnimationManager;
@ -43,8 +42,6 @@
@property (nullable, strong, nonatomic) PageModel *pageModel; @property (nullable, strong, nonatomic) PageModel *pageModel;
//@property (nonatomic) PageModel pageModel;
// The current selected text field. // The current selected text field.
@property (nullable, weak, nonatomic) __block id selectedField; @property (nullable, weak, nonatomic) __block id selectedField;

3
MVMCoreUI/BaseControllers/MFViewController.m
View File

@ -37,7 +37,6 @@
#import "MVMCoreUITabBarPageControlViewController.h" #import "MVMCoreUITabBarPageControlViewController.h"
#import "MVMCoreUINavigationController.h" #import "MVMCoreUINavigationController.h"
#import <MVMCoreUI/MVMCoreUI-Swift.h> #import <MVMCoreUI/MVMCoreUI-Swift.h>
@import MVMAnimationFramework; @import MVMAnimationFramework;
@interface MFViewController() <FormValidationProtocol> @interface MFViewController() <FormValidationProtocol>
@ -97,6 +96,7 @@
self.pageType = loadObject.pageType; self.pageType = loadObject.pageType;
self.loadObject = loadObject; self.loadObject = loadObject;
[self parsePageJSON]; [self parsePageJSON];
// Verifies all modules needed are loaded. // Verifies all modules needed are loaded.
return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error]; return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error];
} }
@ -249,6 +249,7 @@
- (BOOL)newPageLoaded:(nonnull NSDictionary *)page { - (BOOL)newPageLoaded:(nonnull NSDictionary *)page {
self.loadObject.pageJSON = page; self.loadObject.pageJSON = page;
[self parsePageJSON];
return YES; return YES;
} }