From 725d4e3cd72bf613a1fcb7d9d8d39f1b81b731ea Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Fri, 14 Jun 2024 13:49:18 -0400 Subject: [PATCH 1/2] Digital PCT265 defect CXTDT-573370: Expose VDS bundle helper in MVMCoreUI. --- MVMCoreUI/Utility/MVMCoreUIUtility.h | 3 +++ MVMCoreUI/Utility/MVMCoreUIUtility.m | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility.h b/MVMCoreUI/Utility/MVMCoreUIUtility.h index c6959723..daba0310 100644 --- a/MVMCoreUI/Utility/MVMCoreUIUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUIUtility.h @@ -22,6 +22,9 @@ NS_ASSUME_NONNULL_BEGIN // The bundle for this framework + (nullable NSBundle *)bundleForMVMCoreUI; +/// The bundle for the VDS frameowrk. Handy for accessing VDS resources such as fonts. ++ (nullable NSBundle *)bundleForVDS; + // Returns the hardcoded string from the string file. + (nullable NSString *)hardcodedStringWithKey:(nonnull NSString *)key; diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility.m b/MVMCoreUI/Utility/MVMCoreUIUtility.m index ad7366df..c8e57888 100644 --- a/MVMCoreUI/Utility/MVMCoreUIUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUIUtility.m @@ -22,6 +22,10 @@ return [NSBundle bundleWithIdentifier:@"com.vzw.MVMCoreUI"]; } ++ (nullable NSBundle *)bundleForVDS { + return [NSBundle bundleWithIdentifier:@"com.vzw.vds"]; +} + + (nullable NSString *)hardcodedStringWithKey:(nonnull NSString *)key { // Redirect key with relevant module. return [MVMCoreGetterUtility hardcodedStringWithKey:key bundle:[MVMCoreUIUtility bundleForMVMCoreUI]]; From 19f08dca7993b2a69efea6f790f1e69cb4dcb5a5 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Fri, 14 Jun 2024 14:15:00 -0400 Subject: [PATCH 2/2] Digital PCT265 defect CXTDT-573370: Code review. Matt's genious. --- MVMCoreUI/Utility/MVMCoreUIUtility.h | 2 +- MVMCoreUI/Utility/MVMCoreUIUtility.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility.h b/MVMCoreUI/Utility/MVMCoreUIUtility.h index daba0310..12c1aa34 100644 --- a/MVMCoreUI/Utility/MVMCoreUIUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUIUtility.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN + (nullable NSBundle *)bundleForMVMCoreUI; /// The bundle for the VDS frameowrk. Handy for accessing VDS resources such as fonts. -+ (nullable NSBundle *)bundleForVDS; ++ (nullable NSBundle *)bundleForFonts; // Returns the hardcoded string from the string file. + (nullable NSString *)hardcodedStringWithKey:(nonnull NSString *)key; diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility.m b/MVMCoreUI/Utility/MVMCoreUIUtility.m index c8e57888..e725114d 100644 --- a/MVMCoreUI/Utility/MVMCoreUIUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUIUtility.m @@ -22,7 +22,7 @@ return [NSBundle bundleWithIdentifier:@"com.vzw.MVMCoreUI"]; } -+ (nullable NSBundle *)bundleForVDS { ++ (nullable NSBundle *)bundleForFonts { return [NSBundle bundleWithIdentifier:@"com.vzw.vds"]; }