From 3d4f8938dc05723debd9d0ac1119a71abfcead93 Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Fri, 15 Sep 2023 15:42:35 +0530 Subject: [PATCH 1/3] Adding option to show a label to loading overlay --- .../LoadingOverlay/MVMCoreLoadingOverlayHandler.h | 3 +++ .../LoadingOverlay/MVMCoreLoadingOverlayHandler.m | 6 +++++- .../LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h index 64e5388..0f26243 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h @@ -17,6 +17,9 @@ // Starts Loading. Every start loading call must be terminated with an end loading call. - (void)startLoading; +// Starts Loading, by showing the text in the center +- (void)startLoadingWith:(nullable NSString *) text; + // Returns if it is showing. - (BOOL)isShowing; diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m index f3c953e..b93178e 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m @@ -51,6 +51,10 @@ #pragma mark - Overlay Functions - (void)startLoading { + [self startLoadingWith:nil]; +} + +- (void)startLoadingWith:(nullable NSString *)text { [MVMCoreDispatchUtility performBlockOnMainThread:^{ @@ -72,7 +76,7 @@ } // Restarts the loading animation. - [self.loadingViewController startLoading]; + [self.loadingViewController startLoadingWith:text]; if (self.animatingOut) { diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h index 9a880d7..be95878 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h @@ -14,4 +14,8 @@ // Called when the view controller should stop animating loading. - (void)stopLoading; +@optional +// Called when the view controller should animate loading with custom text +- (void)startLoadingWith:(nullable NSString *) text; + @end From 31b5dc21715eb800e5dccc55e28f9271ea6888ab Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Fri, 13 Oct 2023 23:02:27 +0530 Subject: [PATCH 2/3] added getAccessibilityElements func to MVMCoreViewManagerProtocol --- MVMCore/MVMCore/MainProtocols/MVMCoreViewManagerProtocol.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MVMCore/MVMCore/MainProtocols/MVMCoreViewManagerProtocol.h b/MVMCore/MVMCore/MainProtocols/MVMCoreViewManagerProtocol.h index 4407a49..fda6bee 100644 --- a/MVMCore/MVMCore/MainProtocols/MVMCoreViewManagerProtocol.h +++ b/MVMCore/MVMCore/MainProtocols/MVMCoreViewManagerProtocol.h @@ -17,6 +17,8 @@ // Returns if the manage currently contains the page with the page type. - (BOOL)containsPageWithPageType:(nullable NSString *)pageType; +- (nullable NSArray*)getAccessibilityElements; //AccessibilityElements that are owned by Manager. + @optional /// Notifies the manager that the controller received new data. From 48de2b186915955187075b2c3c8a84e1241f6c83 Mon Sep 17 00:00:00 2001 From: Sumanth Nadigadda Date: Thu, 19 Oct 2023 16:59:12 +0530 Subject: [PATCH 3/3] Enabling the loading overlay info text to take attributed string. --- .../LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h | 2 +- .../LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m | 2 +- .../LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h index 0f26243..666f1b3 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.h @@ -18,7 +18,7 @@ - (void)startLoading; // Starts Loading, by showing the text in the center -- (void)startLoadingWith:(nullable NSString *) text; +- (void)startLoadingWith:(nullable NSAttributedString *) text; // Returns if it is showing. - (BOOL)isShowing; diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m index 2f16b09..e53df5e 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingOverlayHandler.m @@ -55,7 +55,7 @@ [self startLoadingWith:nil]; } -- (void)startLoadingWith:(nullable NSString *)text { +- (void)startLoadingWith:(nullable NSAttributedString *)text { [MVMCoreDispatchUtility performBlockOnMainThread:^{ diff --git a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h index be95878..e4afe13 100644 --- a/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h +++ b/MVMCore/MVMCore/LoadHandling/LoadingOverlay/MVMCoreLoadingViewControllerProtocol.h @@ -16,6 +16,6 @@ @optional // Called when the view controller should animate loading with custom text -- (void)startLoadingWith:(nullable NSString *) text; +- (void)startLoadingWith:(nullable NSAttributedString *) text; @end