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

header changes

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-11-04 15:34:32 -05:00
parent b5a97de183
commit 52f31eff42
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/BaseControllers/MFViewController.m
View File

@ -35,7 +35,6 @@
#import "MVMCoreUISession.h" #import "MVMCoreUISession.h"
#import "MVMCoreUILoggingHandler.h" #import "MVMCoreUILoggingHandler.h"
#import "MVMCoreUITabBarPageControlViewController.h" #import "MVMCoreUITabBarPageControlViewController.h"
#import "MVMCoreUINavigationController.h"
#import <MVMCoreUI/MVMCoreUI-Swift.h> #import <MVMCoreUI/MVMCoreUI-Swift.h>
@import MVMAnimationFramework; @import MVMAnimationFramework;

15
MVMCoreUI/Containers/NavigationController.swift
View File

@ -9,25 +9,26 @@
import UIKit import UIKit
@objcMembers open class NavigationController: UINavigationController { @objcMembers open class NavigationController: UINavigationController {
var separatorView: SeparatorView? public var separatorView: SeparatorView?
static func navigationController() -> Self? { public static func navigationController() -> Self? {
return MVMCoreActionUtility.initializerClassCheck(MVMCoreUISession.sharedGlobal()?.navigationController, classToVerify: self) as? Self return MVMCoreActionUtility.initializerClassCheck(MVMCoreUISession.sharedGlobal()?.navigationController, classToVerify: self) as? Self
} }
/*static func setupNavigationController() -> Self? { public static func setupNavigationController() -> Self? {
let navigationController = NavigationController() let navigationController = self.init()
UIColor.mfSetBackgroundColor(forNavigationBar: .white, navigationBar: navigationController.navigationBar, transparent: false) UIColor.mfSetBackgroundColor(forNavigationBar: .white, navigationBar: navigationController.navigationBar, transparent: false)
navigationController.navigationBar.shadowImage = UIImage() navigationController.navigationBar.shadowImage = UIImage()
navigationController.navigationBar.isOpaque = true navigationController.navigationBar.isOpaque = true
navigationController.navigationBar.tintColor = .black navigationController.navigationBar.tintColor = .black
navigationController.separatorView = SeparatorView.separatorAdd(to: navigationController.navigationBar, position: SeparatorPositionBot, withHorizontalPadding: 0) navigationController.separatorView = SeparatorView.separatorAdd(to: navigationController.navigationBar, position: SeparatorPositionBot, withHorizontalPadding: 0)
navigationController.separatorView?.setAsLight() navigationController.separatorView?.setAsLight()
navigationController.navigationBar.titleTextAttributes = [NSAttributedString.Key.font: MFFonts.mfFont75Bd(MFSizeObject(standardSize: 14, standardiPadPortraitSize: 16, iPadProLandscapeSize: 18)?.getValueBasedOnScreenSize() ?? 14)] if let font = MFFonts.mfFont75Bd(MFSizeObject(standardSize: 14, standardiPadPortraitSize: 16, iPadProLandscapeSize: 18)?.getValueBasedOnScreenSize() ?? 14) {
navigationController.navigationBar.titleTextAttributes = [NSAttributedString.Key.font: font];
}
MVMCoreUISession.sharedGlobal()?.navigationController = navigationController MVMCoreUISession.sharedGlobal()?.navigationController = navigationController
MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = navigationController MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = navigationController
MVMCoreNavigationHandler.shared()?.navigationController = navigationController MVMCoreNavigationHandler.shared()?.navigationController = navigationController
return navigationController return navigationController
}*/ }
} }

5
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
View File

@ -11,10 +11,9 @@
@import MVMCore.MVMCoreActionDelegateProtocol; @import MVMCore.MVMCoreActionDelegateProtocol;
#import <MVMCoreUI/MVMCoreUIPanelProtocol.h> #import <MVMCoreUI/MVMCoreUIPanelProtocol.h>
#import <MVMCoreUI/MVMCoreUIPanelButtonProtocol.h> #import <MVMCoreUI/MVMCoreUIPanelButtonProtocol.h>
@class MVMCoreUINavigationController;
@class MVMCoreUITopAlertView; @class MVMCoreUITopAlertView;
@class MFViewController; @class MFViewController;
@class NavigationController;
typedef NS_ENUM(NSInteger, MFNumberOfDrawers) { typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
MFNoDrawer = 0, MFNoDrawer = 0,
@ -34,7 +33,7 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
@property (nullable, strong, nonatomic) UIBarButtonItem *backButton; @property (nullable, strong, nonatomic) UIBarButtonItem *backButton;
@property (nullable, weak, nonatomic, readonly) MVMCoreUINavigationController *navigationController; @property (nullable, weak, nonatomic, readonly) NavigationController *navigationController;
// Reference to the top alert view // Reference to the top alert view
@property (nullable, weak, nonatomic) MVMCoreUITopAlertView *topAlertView; @property (nullable, weak, nonatomic) MVMCoreUITopAlertView *topAlertView;

6
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
View File

@ -23,7 +23,7 @@
#import "MVMCoreUIConstants.h" #import "MVMCoreUIConstants.h"
#import "MVMCoreUICommonViewsUtility.h" #import "MVMCoreUICommonViewsUtility.h"
#import "MVMCoreUITopAlertView.h" #import "MVMCoreUITopAlertView.h"
#import "MVMCoreUINavigationController.h" #import <MVMCoreUI/MVMCoreUI-Swift.h>
@interface MVMCoreUISplitViewController () @interface MVMCoreUISplitViewController ()
@ -50,7 +50,7 @@ typedef NS_OPTIONS(NSInteger, MFExtendedDrawer) {
@property (weak, nonatomic, readwrite) UIViewController <MVMCoreUIPanelProtocol> *leftPanel; @property (weak, nonatomic, readwrite) UIViewController <MVMCoreUIPanelProtocol> *leftPanel;
@property (weak, nonatomic, readwrite) UIViewController <MVMCoreUIPanelProtocol> *rightPanel; @property (weak, nonatomic, readwrite) UIViewController <MVMCoreUIPanelProtocol> *rightPanel;
@property (weak, nonatomic, readwrite) MVMCoreUINavigationController *navigationController; @property (weak, nonatomic, readwrite) NavigationController *navigationController;
// A view that covers the detail view when the master is out. // A view that covers the detail view when the master is out.
@property (weak, nonatomic) IBOutlet UIView *mainViewCoverView; @property (weak, nonatomic) IBOutlet UIView *mainViewCoverView;
@ -802,7 +802,7 @@ CGFloat const PanelAnimationDuration = 0.2;
} }
// The main view. // The main view.
MVMCoreUINavigationController *navigationController = [MVMCoreUINavigationController setupNavigationController]; NavigationController *navigationController = [NavigationController setupNavigationController];
self.navigationController = navigationController; self.navigationController = navigationController;
self.automaticallyAdjustsScrollViewInsets = NO; self.automaticallyAdjustsScrollViewInsets = NO;

2
MVMCoreUI/MVMCoreUI.h
View File

@ -58,8 +58,6 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[];
#import <MVMCoreUI/TopLabelsAndBottomButtonsTableViewController.h> #import <MVMCoreUI/TopLabelsAndBottomButtonsTableViewController.h>
#pragma mark - Containers #pragma mark - Containers
#import <MVMCoreUI/MVMCoreUINavigationController.h>
#import <MVMCoreUI/MVMCoreUIPanelProtocol.h> #import <MVMCoreUI/MVMCoreUIPanelProtocol.h>
#import <MVMCoreUI/MVMCoreUIDetailViewProtocol.h> #import <MVMCoreUI/MVMCoreUIDetailViewProtocol.h>
#import <MVMCoreUI/MVMCoreUIPanelButtonProtocol.h> #import <MVMCoreUI/MVMCoreUIPanelButtonProtocol.h>

4
MVMCoreUI/OtherHandlers/MVMCoreUISession.h
View File

@ -11,15 +11,15 @@
@class MVMCoreUITopAlertView; @class MVMCoreUITopAlertView;
@class MVMCoreUISplitViewController; @class MVMCoreUISplitViewController;
@class MFViewController; @class MFViewController;
@class MVMCoreUINavigationController;
@class MFLoadingViewController; @class MFLoadingViewController;
@class NavigationController;
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface MVMCoreUISession : MVMCoreSessionObject @interface MVMCoreUISession : MVMCoreSessionObject
@property (weak, nonatomic, nullable) MVMCoreUITopAlertView *topAlertView; @property (weak, nonatomic, nullable) MVMCoreUITopAlertView *topAlertView;
@property (weak, nonatomic, nullable) MVMCoreUISplitViewController *splitViewController; @property (weak, nonatomic, nullable) MVMCoreUISplitViewController *splitViewController;
@property (weak, nonatomic, nullable) MVMCoreUINavigationController *navigationController; @property (weak, nonatomic, nullable) NavigationController *navigationController;
@property (weak, nonatomic, nullable) MFLoadingViewController *loadingViewController; @property (weak, nonatomic, nullable) MFLoadingViewController *loadingViewController;
/// Tracks the current page type the user is currently viewing. KVO compliant. /// Tracks the current page type the user is currently viewing. KVO compliant.

1
MVMCoreUI/Utility/MVMCoreUIUtility.m
View File

@ -9,7 +9,6 @@
#import "MVMCoreUIUtility.h" #import "MVMCoreUIUtility.h"
#import "MVMCoreUIConstants.h" #import "MVMCoreUIConstants.h"
#import "MVMCoreUISession.h" #import "MVMCoreUISession.h"
#import "MVMCoreUINavigationController.h"
#import "MVMCoreUISplitViewController.h" #import "MVMCoreUISplitViewController.h"
@import MVMCore.MVMCoreNavigationHandler; @import MVMCore.MVMCoreNavigationHandler;
@import MVMCore.MVMCoreGetterUtility; @import MVMCore.MVMCoreGetterUtility;