Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6301 from vector-im/ismail/6271_scrollback_spinner

Browse source
This commit is contained in:
ismailgulek 2022-06-15 18:22:16 +03:00 committed by GitHub
commit 9a0fbc70a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Modules/Common/Recents/RecentsViewController.m
View file

@ -2528,7 +2528,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
- (void)stopActivityIndicator {
if (self.userIndicatorStore) {
if (loadingIndicatorCancel) {
MXLogDebug(@"[RecentsViewController] Present loading indicator")
MXLogDebug(@"[RecentsViewController] Dismiss loading indicator")
loadingIndicatorCancel();
loadingIndicatorCancel = nil;
}

11
Riot/Modules/Room/MXKRoomViewController.m
View file

@ -1903,10 +1903,7 @@
return;
}
__block UserIndicatorCancel cancelIndicator;
NSTimer *indicatorTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 repeats:NO block:^(NSTimer * _Nonnull timer) {
cancelIndicator = [self.userIndicatorStore presentLoadingWithLabel:[VectorL10n homeSyncing] isInteractionBlocking:NO];
}];
UserIndicatorCancel cancelIndicator = [self.userIndicatorStore presentLoadingWithLabel:[VectorL10n loading] isInteractionBlocking:NO];
// Store the current height of the first bubble (if any)
backPaginationSavedFirstBubbleHeight = 0;
@ -1993,8 +1990,6 @@
[self updateCurrentEventIdAtTableBottom:NO];
}
[indicatorTimer invalidate];
if (cancelIndicator) {
cancelIndicator();
}
@ -2012,9 +2007,7 @@
[self reloadBubblesTable:NO];
self.bubbleTableViewDisplayInTransition = NO;
[indicatorTimer invalidate];
if (cancelIndicator) {
cancelIndicator();
}

1
changelog.d/6271.bugfix Normal file
View file

@ -0,0 +1 @@
Room: Present loading indicator immediately on pagination and change wording.