From 8415c0f3f5fd0fb9ec6ea040b6dac9e24e1ee478 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 25 Mar 2020 14:47:15 -0400 Subject: [PATCH 1/7] more accessibility stuff. --- .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index eb9fba9..efa33b6 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG #if ENABLE_HARD_CODED_RESPONSE From 992a06ee8d004da4ca42c0948ea6329e8962a474 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 1 Jul 2020 21:08:28 -0400 Subject: [PATCH 2/7] return --- .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index efa33b6..eb9fba9 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG #if ENABLE_HARD_CODED_RESPONSE From dc16cfecd4ee4d0f9415ef2a92e22318462965f6 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 19 Nov 2020 09:17:01 -0500 Subject: [PATCH 3/7] excluding architecture arm64 --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index fc17f77..5d06f8b 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -906,6 +906,7 @@ 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; @@ -967,6 +968,7 @@ 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; From 57f5bd94aa28c255edd60dedf3a9bd54d0aeb8ff Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 2 Dec 2020 11:40:36 -0500 Subject: [PATCH 4/7] updates made. --- .../MVMCore/Models/ActionType/ActionModelProtocol.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift index a5d3229..028af05 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift @@ -12,12 +12,18 @@ public protocol ActionModelProtocol: ModelProtocol { var actionType: String { get } var extraParameters: JSONValueDictionary? { get set } var analyticsData: JSONValueDictionary? { get set } + var accessibilityIdentifier: String? { get set } } public extension ActionModelProtocol { var actionType: String { - get { return Self.identifier } + get { Self.identifier } + } + + var accessibilityIdentifier: String? { + get { nil } + set { } } static var categoryCodingKey: String { From 2eb5cc9254664d105551d63c69db7bbc0ac65596 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 3 Dec 2020 14:22:05 -0500 Subject: [PATCH 5/7] formatting updates. Adding identifier for easier testing. --- .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index eb9fba9..efa33b6 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG #if ENABLE_HARD_CODED_RESPONSE From 85401e583d2294a67a4762e2701786c4d4089e54 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 15 Dec 2020 14:56:18 -0500 Subject: [PATCH 6/7] added script to improve test page access and separate from release compilation. Formatting updates. --- .../MFHardCodedServerResponse.m | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m index e32ec74..ed2feee 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.m @@ -69,16 +69,16 @@ - (NSDictionary *) getHardCodedResponseForRequest:(MVMCoreRequestParameters *)request { NSDictionary *cannedResponse = nil; - if(_jsonDictionary) { + if (_jsonDictionary) { BOOL matchesQuery = NO; - for(NSString *urlKey in _sortedKeys) { + for (NSString *urlKey in _sortedKeys) { NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithString:urlKey]; - if([urlComponents.path isEqualToString:request.pageType]) { + if ([urlComponents.path isEqualToString:request.pageType]) { matchesQuery = YES; - if(urlComponents.query) { - for(NSURLQueryItem *item in urlComponents.queryItems) { + if (urlComponents.query) { + for (NSURLQueryItem *item in urlComponents.queryItems) { NSString *requestVal = [request.parameters stringForKey:item.name]; - if(!requestVal || ![requestVal isEqualToString:item.value]) { + if (!requestVal || ![requestVal isEqualToString:item.value]) { matchesQuery = NO; break; } @@ -88,7 +88,7 @@ cannedResponse = _jsonDictionary[urlKey]; // keep searching to see if there is a more exact match on parameters } - if(matchesQuery) { + if (matchesQuery) { cannedResponse = _jsonDictionary[urlKey]; // found a request parameters match, accept as the best result and break out break; @@ -101,7 +101,6 @@ cannedResponse = [self getHardCodedResponseForPageType:request.pageType]; } - return cannedResponse; } From 02cbfb702c81882fca1f2a579317207823803ecd Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Fri, 22 Jan 2021 10:03:28 -0500 Subject: [PATCH 7/7] reset --- .../Utility/HardCodedServerResponse/MFHardCodedServerResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h index efa33b6..eb9fba9 100644 --- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h +++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h @@ -9,7 +9,7 @@ #import #import "MVMCoreRequestParameters.h" -#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG +#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG #if ENABLE_HARD_CODED_RESPONSE