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

Merge branch 'bugfix/scripts' into 'develop'

Browse Source 
Bugfix/scripts

See merge request BPHV_MIPS/mvm_core_ui!760
This commit is contained in:
Pfeil, Scott Robert 2022-07-06 15:08:43 +00:00
commit e80ce2444b
27 changed files with 124 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -197,7 +197,6 @@
9445891F2385D2E900DE9FD4 /* CaretViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9445891E2385D2E900DE9FD4 /* CaretViewModel.swift */; };
944589212385D6E900DE9FD4 /* DashLineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944589202385D6E900DE9FD4 /* DashLineModel.swift */; };
944589232385DA9600DE9FD4 /* ImageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944589222385DA9500DE9FD4 /* ImageViewModel.swift */; };
9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */; };
9458C3172406C8FD00930963 /* UIFont+FontWrapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9458C3152406C8FD00930963 /* UIFont+FontWrapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
9458C3182406C8FD00930963 /* UIFont+FontWrapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 9458C3162406C8FD00930963 /* UIFont+FontWrapping.m */; };
948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948DB67D2326DCD90011F916 /* MultiProgress.swift */; };
@ -276,6 +275,7 @@
AAE7270E24AC8B9300A3ED0E /* HeadersH2CaretLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7270D24AC8B9300A3ED0E /* HeadersH2CaretLink.swift */; };
AAE96FA225341F6A0037A989 /* ListStoreLocatorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE96FA125341F6A0037A989 /* ListStoreLocatorModel.swift */; };
AAE96FA525341F7D0037A989 /* ListStoreLocator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE96FA425341F7D0037A989 /* ListStoreLocator.swift */; };
AF81F990287498F4006F7F11 /* MVMAnimationFramework.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF81F98F287498F3006F7F11 /* MVMAnimationFramework.xcframework */; };
AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */; };
AFE4A1D627DFBB6F00C458D0 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */; };
BB105859248DEFF70069D008 /* UICollectionViewLeftAlignedLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */; };
@ -789,7 +789,6 @@
9445891E2385D2E900DE9FD4 /* CaretViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaretViewModel.swift; sourceTree = "<group>"; };
944589202385D6E900DE9FD4 /* DashLineModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashLineModel.swift; sourceTree = "<group>"; };
944589222385DA9500DE9FD4 /* ImageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewModel.swift; sourceTree = "<group>"; };
9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
9458C3152406C8FD00930963 /* UIFont+FontWrapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIFont+FontWrapping.h"; sourceTree = "<group>"; };
9458C3162406C8FD00930963 /* UIFont+FontWrapping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIFont+FontWrapping.m"; sourceTree = "<group>"; };
948DB67D2326DCD90011F916 /* MultiProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiProgress.swift; sourceTree = "<group>"; };
@ -867,6 +866,7 @@
AAE7270D24AC8B9300A3ED0E /* HeadersH2CaretLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2CaretLink.swift; sourceTree = "<group>"; };
AAE96FA125341F6A0037A989 /* ListStoreLocatorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListStoreLocatorModel.swift; sourceTree = "<group>"; };
AAE96FA425341F7D0037A989 /* ListStoreLocator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListStoreLocator.swift; sourceTree = "<group>"; };
AF81F98F287498F3006F7F11 /* MVMAnimationFramework.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MVMAnimationFramework.xcframework; path = ../SharedFrameworks/MVMAnimationFramework.xcframework; sourceTree = "<group>"; };
AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = ../SharedFrameworks/VDSColorTokens.xcframework; sourceTree = "<group>"; };
AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Extension.swift"; sourceTree = "<group>"; };
BB105858248DEFF60069D008 /* UICollectionViewLeftAlignedLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICollectionViewLeftAlignedLayout.swift; sourceTree = "<group>"; };
@ -1194,8 +1194,8 @@
files = (
D29DF0E621E4F3C7003B2FB9 /* MVMCore.framework in Frameworks */,
AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */,
9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */,
187FEB2A2844D2A600BF29C2 /* VDSFormControlsTokens.xcframework in Frameworks */,
AF81F990287498F4006F7F11 /* MVMAnimationFramework.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2028,10 +2028,10 @@
D29DF0E421E4F3C7003B2FB9 /* Frameworks */ = {
isa = PBXGroup;
children = (
AF81F98F287498F3006F7F11 /* MVMAnimationFramework.xcframework */,
187FEB292844D2A600BF29C2 /* VDSFormControlsTokens.xcframework */,
AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */,
D29DF0E521E4F3C7003B2FB9 /* MVMCore.framework */,
9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */,
D29DF0E521E4F3C7003B2FB9 /* MVMCore.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@ -2581,7 +2581,7 @@
D29DF0C321E404D4003B2FB9 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1010;
LastUpgradeCheck = 1320;
ORGANIZATIONNAME = "Verizon Wireless";
TargetAttributes = {
D29DF0CB21E404D4003B2FB9 = {
@ -3185,7 +3185,9 @@
D29DF0D221E404D4003B2FB9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@ -3209,6 +3211,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3221,7 +3224,6 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
@ -3236,7 +3238,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -3251,7 +3253,9 @@
D29DF0D321E404D4003B2FB9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@ -3275,6 +3279,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@ -3287,7 +3292,6 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -3296,7 +3300,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -3323,7 +3327,7 @@
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
INFOPLIST_FILE = MVMCoreUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -3354,7 +3358,7 @@
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
INFOPLIST_FILE = MVMCoreUI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",

8
MVMCoreUI/Alerts/MVMCoreAlertHandler.m
View File

@ -8,12 +8,12 @@
#import "MVMCoreAlertHandler.h"
#import "MVMCoreAlertObject.h"
#import <MVMCore/MVMCoreAlertController.h>
@import MVMCore.MVMCoreAlertController;
#import "MVMCoreAlertOperation.h"
#import "MVMCoreTopAlertOperation.h"
#import <MVMCore/MVMCoreJSONConstants.h>
#import <MVMCore/NSDictionary+MFConvenience.h>
#import <MVMCore/NSArray+MFConvenience.h>
@import MVMCore.MVMCoreJSONConstants;
@import MVMCore.NSDictionary_MFConvenience;
@import MVMCore.NSArray_MFConvenience;
#import <MVMCoreUI/MVMCoreUI-Swift.h>
@interface MVMCoreAlertHandler ()

6
MVMCoreUI/Alerts/MVMCoreAlertObject.h
View File

@ -8,9 +8,9 @@
// An object for keeping track of all alert variables. Easier to pass around.
#import <Foundation/Foundation.h>
#import <MVMCore/MVMCoreActionDelegateProtocol.h>
#import <MVMCore/MVMCoreLoadDelegateProtocol.h>
#import <MVMCore/MVMCorePresentationDelegateProtocol.h>
@import MVMCore.MVMCoreActionDelegateProtocol;
@import MVMCore.MVMCoreLoadDelegateProtocol;
@import MVMCore.MVMCorePresentationDelegateProtocol;
#import <MVMCoreUI/MVMCoreAlertDelegateProtocol.h>
@class MVMCoreErrorObject;

20
MVMCoreUI/Alerts/MVMCoreAlertObject.m
View File

@ -9,16 +9,16 @@
#import "MVMCoreAlertObject.h"
#import "MVMCoreAlertHandler.h"
#import "MVMCoreTopAlertObject.h"
#import <MVMCore/MVMCoreCache.h>
#import <MVMCore/MVMCoreErrorConstants.h>
#import <MVMCore/MVMCoreErrorObject.h>
#import <MVMCore/MVMCoreLoadObject.h>
#import <MVMCore/MVMCoreGetterUtility.h>
#import <MVMCore/NSDictionary+MFConvenience.h>
#import <MVMCore/MVMCoreHardcodedStringsConstants.h>
#import <MVMCore/MVMCoreJSONConstants.h>
#import <MVMCore/MVMCoreActionHandler.h>
#import <MVMCore/MVMCore-Swift.h>
@import MVMCore.MVMCoreCache;
@import MVMCore.MVMCoreErrorConstants;
@import MVMCore.MVMCoreErrorObject;
@import MVMCore.MVMCoreLoadObject;
@import MVMCore.MVMCoreGetterUtility;
@import MVMCore.NSDictionary_MFConvenience;
@import MVMCore.MVMCoreHardcodedStringsConstants;
@import MVMCore.MVMCoreJSONConstants;
@import MVMCore.MVMCoreActionHandler;
@import MVMCore.Swift;
#import <MVMCoreUI/MVMCoreUI-Swift.h>
@interface MVMCoreAlertObject ()

2
MVMCoreUI/Alerts/MVMCoreAlertOperation.h
View File

@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <MVMCore/MVMCoreOperation.h>
@import MVMCore.MVMCoreOperation;
#import <MVMCoreUI/MVMCoreAlertDelegateProtocol.h>
@interface MVMCoreAlertOperation : MVMCoreOperation

4
MVMCoreUI/Alerts/MVMCoreAlertOperation.m
View File

@ -8,8 +8,8 @@
#import "MVMCoreAlertOperation.h"
#import <MVMCoreUI/MVMCoreAlertHandler.h>
#import <MVMCore/MVMCoreAlertController.h>
#import <MVMCore/MVMCoreNavigationHandler.h>
@import MVMCore.MVMCoreAlertController;
@import MVMCore.MVMCoreNavigationHandler;
@interface MVMCoreAlertOperation () {
__block BOOL _paused;

2
MVMCoreUI/Atomic/Atoms/Selectors/RadioBoxes.swift
View File

@ -8,7 +8,7 @@
import Foundation
public protocol RadioBoxSelectionDelegate: class {
public protocol RadioBoxSelectionDelegate: AnyObject {
func selected(radioBox: RadioBoxModel)
}

1
MVMCoreUI/Atomic/Extensions/UIPickerView+Extension.swift
View File

@ -15,7 +15,6 @@ public extension UIPickerView {
let picker = UIPickerView(frame: .zero)
picker.backgroundColor = .mvmWhite
picker.showsSelectionIndicator = true
return picker
}

2
MVMCoreUI/BaseClasses/TextField.swift
View File

@ -8,7 +8,7 @@
import UIKit
public protocol TextInputDidDeleteProtocol: class {
public protocol TextInputDidDeleteProtocol: AnyObject {
func textInputDidDelete()
}

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

@ -1069,7 +1069,7 @@ CGFloat const PanelAnimationDuration = 0.2;
// Returns the desired view or falls back. Hot fix until we can get away from using these functions...
+ (CGRect)getBounds:(UIView *)desiredView {
UIView *view = desiredView ?: [MVMCoreNavigationHandler sharedNavigationHandler].navigationController.view ?: [UIApplication sharedApplication].keyWindow.rootViewController.view;
UIView *view = desiredView ?: [MVMCoreNavigationHandler sharedNavigationHandler].navigationController.view ?: [MVMCoreGetterUtility getKeyWindow].rootViewController.view;
return view ? view.bounds : [UIScreen mainScreen].bounds;
}
@ -1094,7 +1094,7 @@ CGFloat const PanelAnimationDuration = 0.2;
}
- (UIViewController *)getCurrentVisibleController {
UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn ?: [UIApplication sharedApplication].keyWindow.rootViewController;
UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn ?: [MVMCoreGetterUtility getKeyWindow].rootViewController;
UIViewController *viewController = nil;
while (baseViewController.presentedViewController && !baseViewController.presentedViewController.isBeingDismissed) {
viewController = baseViewController.presentedViewController;

2
MVMCoreUI/OtherHandlers/MVMCoreUIActionDelegateProtocol.h
View File

@ -5,7 +5,7 @@
// Created by Scott Pfeil on 10/28/20.
// Copyright © 2020 Verizon Wireless. All rights reserved.
//
#import <MVMCore/MVMCoreActionDelegateProtocol.h>
@import MVMCore.MVMCoreActionDelegateProtocol;
@class MVMCoreAlertObject;
@protocol MVMCoreUIActionDelegateProtocol <MVMCoreActionDelegateProtocol>

2
MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h
View File

@ -6,7 +6,7 @@
// Copyright © 2020 Verizon Wireless. All rights reserved.
//
#import <MVMCore/MVMCoreActionHandler.h>
@import MVMCore.MVMCoreActionHandler;
NS_ASSUME_NONNULL_BEGIN

2
MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.h
View File

@ -6,7 +6,7 @@
// Copyright © 2019 Verizon Wireless. All rights reserved.
//
#import <MVMCore/MVMCore.h>
@import MVMCore.MVMCoreViewControllerMappingObject;
NS_ASSUME_NONNULL_BEGIN

2
MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m
View File

@ -7,7 +7,7 @@
//
#import "MVMCoreUIViewControllerMappingObject.h"
#import <MVMCore/MVMCoreViewControllerProgrammaticMappingObject.h>
@import MVMCore.MVMCoreViewControllerProgrammaticMappingObject;
#import <MVMCoreUI/MVMCoreUI-Swift.h>
@implementation MVMCoreUIViewControllerMappingObject

6
MVMCoreUI/TopAlert/MVMCoreTopAlertObject.m
View File

@ -7,9 +7,9 @@
//
#import "MVMCoreTopAlertObject.h"
#import <MVMCore/NSDictionary+MFConvenience.h>
#import <MVMCore/MVMCoreGetterUtility.h>
#import <MVMCore/MVMCoreJSONConstants.h>
@import MVMCore.NSDictionary_MFConvenience;
@import MVMCore.MVMCoreGetterUtility;
@import MVMCore.MVMCoreJSONConstants;
#import "MVMCoreAlertHandler.h"
NSUInteger const TopAlertDismissTime = 5;

2
MVMCoreUI/TopAlert/MVMCoreTopAlertOperation.h
View File

@ -6,7 +6,7 @@
// Copyright © 2016 Verizon Wireless. All rights reserved.
//
#import <MVMCore/MVMCoreOperation.h>
@import MVMCore.MVMCoreOperation;
#import <MVMCoreUI/MVMCoreTopAlertAnimationDelegateProtocol.h>
@class MVMCoreTopAlertObject;

2
MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.h
View File

@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
#import <MVMCoreUI/MVMCoreTopAlertAnimationDelegateProtocol.h>
#import <MVMCore/MVMCoreViewProtocol.h>
@import MVMCore.MVMCoreViewProtocol;
@class Button;

10
MVMCoreUI/TopAlert/MVMCoreUITopAlertBaseView.m
View File

@ -7,13 +7,13 @@
//
#import "MVMCoreUITopAlertBaseView.h"
#import <MVMCore/MVMCoreActionHandler.h>
@import MVMCore.MVMCoreActionHandler;
#import "MVMCoreUISplitViewController.h"
#import <MVMCore/MVMCoreLoadObject.h>
#import <MVMCore/MVMCoreRequestParameters.h>
@import MVMCore.MVMCoreLoadObject;
@import MVMCore.MVMCoreRequestParameters;
#import "MVMCoreUITopAlertView.h"
#import <MVMCore/MVMCoreJSONConstants.h>
#import <MVMCore/NSDictionary+MFConvenience.h>
@import MVMCore.MVMCoreJSONConstants;
@import MVMCore.NSDictionary_MFConvenience;
#import "UIColor+MFConvenience.h"
#import "MVMCoreUICommonViewsUtility.h"
#import "MFStyler.h"

6
MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
View File

@ -9,11 +9,11 @@
#import "MVMCoreUITopAlertExpandableView.h"
#import "MVMCoreUITopAlertShortView.h"
#import "MVMCoreUITopAlertMainView.h"
#import <MVMCore/MVMCoreDispatchUtility.h>
@import MVMCore.MVMCoreDispatchUtility;
#import <MVMCoreUI/MVMCoreTopAlertObject.h>
#import <MVMCoreUI/MVMCoreAlertHandler.h>
#import <MVMCore/MVMCoreBlockOperation.h>
#import <MVMCore/MVMCoreNavigationHandler.h>
@import MVMCore.MVMCoreBlockOperation;
@import MVMCore.MVMCoreNavigationHandler;
#import "MFStyler.h"
#import "NSLayoutConstraint+MFConvenience.h"
#import "MVMCoreUIUtility.h"

6
MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m
View File

@ -9,13 +9,13 @@
#import "MVMCoreUITopAlertMainView.h"
#import "MFStyler.h"
#import "NSLayoutConstraint+MFConvenience.h"
#import <MVMCore/NSDictionary+MFConvenience.h>
#import <MVMCore/MVMCoreDispatchUtility.h>
@import MVMCore.NSDictionary_MFConvenience;
@import MVMCore.MVMCoreDispatchUtility;
#import <MVMCoreUI/MVMCoreTopAlertObject.h>
#import "UIColor+MFConvenience.h"
#import <MVMCoreUI/MVMCoreAlertHandler.h>
#import <MVMCoreUI/MVMCoreUI-Swift.h>
#import <MVMCore/MVMCoreJSONConstants.h>
@import MVMCore.MVMCoreJSONConstants;
#import "MVMCoreUICommonViewsUtility.h"
#import "MVMCoreUITopAlertView.h"
#import <MVMCoreUI/MVMCoreUI-Swift.h>

1
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
View File

@ -217,7 +217,6 @@ static const CGFloat VertialShadowOffset = 6;
+ (UIPickerView *)commonPickerView {
UIPickerView *picker = [[UIPickerView alloc] initWithFrame:CGRectZero];
picker.backgroundColor = [UIColor whiteColor];
picker.showsSelectionIndicator = YES;
return picker;
}

12
MVMCoreUI/Utility/MVMCoreUIUtility.m
View File

@ -52,7 +52,7 @@
}
+ (UIViewController *)getCurrentVisibleController {
UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn ?: [UIApplication sharedApplication].keyWindow.rootViewController;
UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn ?: [MVMCoreGetterUtility getKeyWindow].rootViewController;
UIViewController *viewController = nil;
while (baseViewController.presentedViewController && !baseViewController.presentedViewController.isBeingDismissed) {
viewController = baseViewController.presentedViewController;
@ -201,10 +201,10 @@
}
+ (CGFloat)getTopSpaceWithStatusBarForView:(UIView *)view {
CGPoint viewStartPointInWindowSpace = [[UIApplication sharedApplication].keyWindow convertPoint:CGPointMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame)) fromView:[view superview]];
if (CGRectGetMaxY([UIApplication sharedApplication].statusBarFrame) > viewStartPointInWindowSpace.y) {
return CGRectGetMaxY([UIApplication sharedApplication].statusBarFrame) - viewStartPointInWindowSpace.y;
CGPoint viewStartPointInWindowSpace = [[MVMCoreGetterUtility getKeyWindow] convertPoint:CGPointMake(CGRectGetMinX(view.frame), CGRectGetMinY(view.frame)) fromView:[view superview]];
CGFloat maxY = CGRectGetMaxY([[[[MVMCoreGetterUtility getKeyWindow] windowScene] statusBarManager] statusBarFrame]);
if (maxY > viewStartPointInWindowSpace.y) {
return maxY - viewStartPointInWindowSpace.y;
} else {
return 0;
}
@ -277,7 +277,7 @@
CGRect keyboardRect = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
// Gets the scrollview end point in the window coordinate space to see if the keyboard will cover the scroll view at all. (This conversion allows the scrollview to be anyhwere in the hierarchy).
CGPoint scrollEndPointInWindowSpace = [[UIApplication sharedApplication].keyWindow convertPoint:CGPointMake(CGRectGetMinX(scrollView.frame), CGRectGetMaxY(scrollView.frame)) fromView:[scrollView superview]];
CGPoint scrollEndPointInWindowSpace = [[MVMCoreGetterUtility getKeyWindow] convertPoint:CGPointMake(CGRectGetMinX(scrollView.frame), CGRectGetMaxY(scrollView.frame)) fromView:[scrollView superview]];
// Also takes into account the current content inset. (Even if the keyboard covers the frame, it might not matter if the bottom content inset is set to above the keyboard anyway).
if (scrollEndPointInWindowSpace.y - scrollView.contentInset.bottom > CGRectGetMinY(keyboardRect)) {

5
MVMCoreUI/Utility/Sizing/MFSizeObject.m
View File

@ -9,6 +9,7 @@
#import <MVMCoreUI/MFSizeObject.h>
#import "MVMCoreUISplitViewController.h"
@import MVMCore.MVMCoreGetterUtility;
@import MVMCore.Swift;
CGFloat const MFSizeiPhone4HeightThreshold = 490;
CGFloat const MFSizeiPhone5HeightThreshold = 578;
@ -145,7 +146,7 @@ CGFloat const MFSizeMostlySweetSpotThreshold = 750;
- (CGFloat)getValueBasedOnScreenSize {
CGRect screenFrame = [[UIScreen mainScreen] bounds];
if ([MVMCoreGetterUtility isOnIPad]) {
if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
if (UIInterfaceOrientationIsLandscape([[[MVMCoreGetterUtility getKeyWindow] windowScene] interfaceOrientation])) {
return [self getValueBasedOnSize:CGRectGetWidth(screenFrame)];
} else {
return [self getValueBasedOnSize:CGRectGetHeight(screenFrame)];
@ -198,7 +199,7 @@ CGFloat const MFSizeMostlySweetSpotThreshold = 750;
- (void)performBlockBaseOnScreenSize {
CGRect screenFrame = [[UIScreen mainScreen] bounds];
if ([MVMCoreGetterUtility isOnIPad]) {
if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
if (UIInterfaceOrientationIsLandscape([[[MVMCoreGetterUtility getKeyWindow] windowScene] interfaceOrientation])) {
[self performBlockBaseOnSize:CGRectGetWidth(screenFrame)];
} else {
[self performBlockBaseOnSize:CGRectGetHeight(screenFrame)];

63
Scripts/build_aggregate.sh
View File

@ -2,32 +2,57 @@
unset TOOLCHAINS #Xcode 7.3 BUG FIX http://stackoverflow.com/questions/36184930/xcodebuild-7-3-cant-enable-bitcode
# define output folder environment variable
# define variables
C_PROJECT_NAME="MVMCoreUI"
PHONE_CONFIGURATION="Release"
BUILD_DIR=$(xcodebuild -showBuildSettings -project ./${C_PROJECT_NAME}.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-)
PHONE_ARCHIVE_PATH="${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}.xcarchive"
SIMULATOR_CONFIGURATION="Debug"
BUILD_DIR=$(xcodebuild -showBuildSettings -project ./MVMCoreUI.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-)
SIMULATOR_LIBRARY_PATH="${BUILD_DIR}/${SIMULATOR_CONFIGURATION}-iphonesimulator/${C_PROJECT_NAME}.framework"
SIMULATOR_ARCHIVE_PATH="${BUILD_DIR}/${SIMULATOR_CONFIGURATION}-iphonesimulator/${C_PROJECT_NAME}.xcarchive"
FRAMEWORKS_DIR=$BUILD_DIR/../../../Frameworks/MVMCoreUI
UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/universal
UNIVERSAL_OUTPUTFOLDER="${BUILD_DIR}/universal"
# Step 1. Build Device and Simulator versions
xcodebuild -scheme "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${PHONE_CONFIGURATION} -sdk iphoneos -archivePath "${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}" archive SKIP_INSTALL=false FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true
xcodebuild -target "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${SIMULATOR_CONFIGURATION} -sdk iphonesimulator BUILD_DIR=$BUILD_DIR FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=true
# Update to use .xcframework
sed -i '' 's|MVMCore.framework \*\/ = {isa.*};|MVMCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MVMCore.xcframework; path = ../SharedFrameworks/MVMCore.xcframework; sourceTree = "<group>"; };|g' ./MVMCoreUI.xcodeproj/project.pbxproj
sed -i '' 's/MVMCore.framework/MVMCore.xcframework/g' ./MVMCoreUI.xcodeproj/project.pbxproj
sed -i '' "s|path = \.\.\/SharedFrameworks|path = ${FRAMEWORKS_DIR}|g" ./MVMCoreUI.xcodeproj/project.pbxproj
# Build device archive
xcodebuild archive \
-scheme "${C_PROJECT_NAME}" \
-configuration ${PHONE_CONFIGURATION} \
-archivePath "${PHONE_ARCHIVE_PATH}" \
-sdk iphoneos \
-destination 'generic/platform=iOS' \
-quiet \
SKIP_INSTALL=NO \
ONLY_ACTIVE_ARCH=NO \
FRAMEWORK_SEARCH_PATHS="$FRAMEWORKS_DIR" \
ALWAYS_SEARCH_USER_PATHS=true
# Build simulator archive
xcodebuild archive \
-scheme "${C_PROJECT_NAME}" \
-configuration ${SIMULATOR_CONFIGURATION} \
-archivePath "${SIMULATOR_ARCHIVE_PATH}" \
-sdk iphonesimulator \
-destination 'generic/platform=iOS Simulator' \
-quiet \
SKIP_INSTALL=NO \
ONLY_ACTIVE_ARCH=NO \
FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR \
ALWAYS_SEARCH_USER_PATHS=true
mkdir -p "${UNIVERSAL_OUTPUTFOLDER}"
rm -rf ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework
cp -R "${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}.xcarchive/Products/Library/Frameworks/${C_PROJECT_NAME}.framework" ${UNIVERSAL_OUTPUTFOLDER}
# Remove any existing xc framework.
rm -rf ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.xcframework
# Step 2. Create universal binary file using lipo
# Create the xcframework in the universal output folder.
xcodebuild -create-xcframework \
-framework "${PHONE_ARCHIVE_PATH}/Products/Library/Frameworks/${C_PROJECT_NAME}.framework" \
-framework "${SIMULATOR_ARCHIVE_PATH}/Products/Library/Frameworks/${C_PROJECT_NAME}.framework" \
-output ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.xcframework
lipo -create -output "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}" "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}" "${SIMULATOR_LIBRARY_PATH}/${C_PROJECT_NAME}"
mv ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME} ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}
# For Swift framework, Swiftmodule needs to be copied in the universal framework
if [ -d "${SIMULATOR_LIBRARY_PATH}/Modules/${C_PROJECT_NAME}.swiftmodule/" ]; then
cp -a "${SIMULATOR_LIBRARY_PATH}/Modules/${C_PROJECT_NAME}.swiftmodule/" "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/Modules/${C_PROJECT_NAME}.swiftmodule/"
fi
# Copy the dSYM file as well.
ditto "${PHONE_ARCHIVE_PATH}/dSYMs/${C_PROJECT_NAME}.framework.dSYM" "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.xcframework.dSYM"

8
Scripts/download_dependencies.sh
View File

@ -18,6 +18,10 @@ if [ ! -d $FRAMEWORKS_DIR ]; then
mkdir -p $FRAMEWORKS_DIR
fi
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/1.0/MVMCore-1.0-Debug-SNAPSHOT.zip
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMCore.xcframework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/3.0/MVMCore-3.0-Debug-SNAPSHOT.zip
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMAnimationFramework.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMAnimationFramework.framework/1.9/MVMAnimationFramework.framework-1.9.zip
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMAnimationFramework.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMAnimationFramework.framework/3.0/MVMAnimationFramework.framework-3.0.zip
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/VDSColorTokens.xcframework" GVJV_VDS_Maven/%40vds-tokens/ios/VDSColorTokens.1.0.6.xcframework.zip
./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/VDSFormControlsTokens.xcframework" GVJV_VDS_Maven/@vds-tokens/ios/VDSFormControlsTokens.1.0.7.xcframework.zip

7
Scripts/upload_core_ui_frameworks.sh
View File

@ -7,7 +7,8 @@
# Copied from Hedden, Kyle Matthew on 3/2/18.
#
FRAMEWORK_VERSION=$(cd .. && agvtool vers -terse)
BUILD_SETTINGS=$(xcodebuild -showBuildSettings -project ../MVMCoreUI.xcodeproj)
FRAMEWORK_VERSION=$(echo "$BUILD_SETTINGS" | grep -w -o 'MARKETING_VERSION = .*' | cut -d\ -f3-)
if [ $(git tag --list | grep "v${FRAMEWORK_VERSION}") ]; then
echo This version tag has already been committed! Aborting!
exit 1
@ -20,5 +21,5 @@ if [ -z $ARTIFACTORY_URL ]; then
fi
# Upload
BUILD_DIR=$(xcodebuild -showBuildSettings -project ../MVMCoreUI.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-)
./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCoreUI.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCoreUI/[VER]/MVMCoreUI-[VER]-Debug-SNAPSHOT
BUILD_DIR=$(echo "$BUILD_SETTINGS" | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-)
./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCoreUI.xcframework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCoreUI/[VER]/MVMCoreUI-[VER]-Debug-SNAPSHOT $FRAMEWORK_VERSION

5
Scripts/upload_framework.sh
View File

@ -14,6 +14,7 @@
URL=$1
LOCALPATH=$2
REMOTEPATH=$3
FRAMEWORKVER=$4
if [ -z $URL ]; then
echo "The artifactory instance url must be specified as the first argument!"
@ -29,10 +30,6 @@ cat "${LOCALPATH}/Info.plist"
LOCALBASE=$(basename "${LOCALPATH}")
LOCALDIR=$(dirname "${LOCALPATH}")
# Grab the framework version from the bundled Info.plist.
FRAMEWORKVER=$(/usr/libexec/plistbuddy -c "Print :CFBundleShortVersionString" "${LOCALPATH}/Info.plist")
echo -e "\nFramework version: \t${FRAMEWORKVER}"
# Replace the [VER] placeholders with the found version.
REMOTEPATH="${REMOTEPATH//\[VER\]/$FRAMEWORKVER}"
echo -e "Resolved path: \t\t${REMOTEPATH}"