Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194250
Change subject: Uncrustify strikes back—with a vengeance
......................................................................
Uncrustify strikes back—with a vengeance
Change-Id: I3fa9cd94d930430409f87d01e758a476f4c65d6e
---
M wikipedia/AppDelegate.m
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
M wikipedia/View Controllers/LeadImage/LeadImageContainer.m
M wikipedia/View Controllers/LeadImage/LeadImageTitleLabel.m
M wikipedia/View Controllers/Login/LoginViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
M wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
M wikipedia/View Controllers/RecentSearches/RecentSearchesViewController.m
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
M wikipedia/View Controllers/TableOfContents/TOCViewController.m
M wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
18 files changed, 141 insertions(+), 141 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/50/194250/1
diff --git a/wikipedia/AppDelegate.m b/wikipedia/AppDelegate.m
index 3ec356b..478f194 100644
--- a/wikipedia/AppDelegate.m
+++ b/wikipedia/AppDelegate.m
@@ -46,8 +46,8 @@
object:nil
queue:nil
usingBlock:^(NSNotification* notification) {
- NSLog(@"NOTIFICATION %@ -> %@", notification.name,
notification.userInfo);
- }];
+ NSLog(@"NOTIFICATION %@ -> %@", notification.name,
notification.userInfo);
+ }];
}
- (void)registerStandardUserDefaults {
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m
b/wikipedia/Categories/Alerts/AlertLabel.m
index e645463..9934961 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -80,11 +80,11 @@
delay:delay
options:0
animations:^{
- self.alpha = 0.0;
- }
+ self.alpha = 0.0;
+ }
completion:^(BOOL done){
- [self hide];
- }];
+ [self hide];
+ }];
}
- (void)didMoveToSuperview {
diff --git a/wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
b/wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
index ab78055..10ef869 100644
--- a/wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
+++ b/wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
@@ -78,12 +78,12 @@
@"iiurlwidth": @1280,
}
success:^(AFHTTPRequestOperation* operation, NSArray*
galleryItems) {
- MWKImageInfoFetcher* strSelf = weakSelf;
- if (!strSelf) {
- return;
- }
- [strSelf finishWithError:nil fetchedData:galleryItems];
- } failure:^(AFHTTPRequestOperation* operation, NSError* error) {
+ MWKImageInfoFetcher* strSelf = weakSelf;
+ if (!strSelf) {
+ return;
+ }
+ [strSelf finishWithError:nil fetchedData:galleryItems];
+ } failure:^(AFHTTPRequestOperation* operation, NSError* error) {
MWKImageInfoFetcher* strSelf = weakSelf;
if (!strSelf) {
return;
diff --git a/wikipedia/View Controllers/Image
Gallery/WMFImageGalleryViewController.m b/wikipedia/View Controllers/Image
Gallery/WMFImageGalleryViewController.m
index 7bb8f7b..6f48042 100644
--- a/wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
+++ b/wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
@@ -231,11 +231,11 @@
delay:0
options:UIViewAnimationOptionBeginFromCurrentState |
UIViewAnimationOptionAllowAnimatedContent
animations:^{
- [self.collectionViewFlowLayout invalidateLayout];
- }
+ [self.collectionViewFlowLayout invalidateLayout];
+ }
completion:^(BOOL finished) {
- [self setVisibleImageIndex:currentImageIndex
animated:NO forceViewUpdate:YES];
- }];
+ [self setVisibleImageIndex:currentImageIndex animated:NO
forceViewUpdate:YES];
+ }];
}
- (void)viewDidLayoutSubviews {
@@ -484,7 +484,7 @@
wmf_idempotentGET:imageURL.absoluteString
parameters:nil
success:^(AFHTTPRequestOperation* operation, UIImage*
image) {
- dispatch_async(dispatch_get_main_queue(), ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
[[MWNetworkActivityIndicatorManager sharedManager] pop];
WMFImageGalleryViewController* strSelf = weakSelf;
if (!strSelf) {
@@ -497,13 +497,13 @@
(WMFImageGalleryCollectionViewCell*)[self.collectionView
cellForItemAtIndexPath:indexPath];
cell.image = image;
});
- }
+ }
failure:^(AFHTTPRequestOperation* operation, NSError*
error) {
- ImgGalleryLog(@"Failed to fetch image at %@ for cell
%@: %@", operation.request.URL, indexPath, error);
- dispatch_async(dispatch_get_main_queue(), ^{
+ ImgGalleryLog(@"Failed to fetch image at %@ for cell %@: %@",
operation.request.URL, indexPath, error);
+ dispatch_async(dispatch_get_main_queue(), ^{
[[MWNetworkActivityIndicatorManager sharedManager] pop];
});
- }];
+ }];
if (request) {
// request will be nil if no request was sent (if another operation is
already requesting the specified image)
diff --git a/wikipedia/View Controllers/LeadImage/LeadImageContainer.m
b/wikipedia/View Controllers/LeadImage/LeadImageContainer.m
index c01ac36..c746ecb 100644
--- a/wikipedia/View Controllers/LeadImage/LeadImageContainer.m
+++ b/wikipedia/View Controllers/LeadImage/LeadImageContainer.m
@@ -56,18 +56,18 @@
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
- [self
updateNonImageElements];
- }];
+ [self updateNonImageElements];
+ }];
#if HIGHLIGHT_FOCAL_FACE
// Testing code so we can hit "Command-Shift-M" to toggle through focal
images.
[[NSNotificationCenter defaultCenter]
addObserverForName:UIApplicationDidReceiveMemoryWarningNotification
object:nil
queue:[NSOperationQueue
mainQueue]
usingBlock:^(NSNotification*
note) {
- // Repeated calls to
getFaceBounds returns next face bounds each time.
- self.focalFaceBounds =
[self.image getFaceBounds];
- [self setNeedsDisplay];
- }];
+ // Repeated calls to getFaceBounds returns next face bounds each time.
+ self.focalFaceBounds = [self.image getFaceBounds];
+ [self setNeedsDisplay];
+ }];
#endif
// Important! "clipsToBounds" must be "NO" so super long titles lay out
properly!
diff --git a/wikipedia/View Controllers/LeadImage/LeadImageTitleLabel.m
b/wikipedia/View Controllers/LeadImage/LeadImageTitleLabel.m
index 38c240d..0ef1c81 100644
--- a/wikipedia/View Controllers/LeadImage/LeadImageTitleLabel.m
+++ b/wikipedia/View Controllers/LeadImage/LeadImageTitleLabel.m
@@ -25,9 +25,9 @@
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
- // Update padding on
rotation so padding beneath title goes away in landscape.
- [self updatePadding];
- }];
+ // Update padding on rotation so padding beneath title goes away in
landscape.
+ [self updatePadding];
+ }];
}
- (void)dealloc {
diff --git a/wikipedia/View Controllers/Login/LoginViewController.m
b/wikipedia/View Controllers/Login/LoginViewController.m
index fa26024..a042167 100644
--- a/wikipedia/View Controllers/Login/LoginViewController.m
+++ b/wikipedia/View Controllers/Login/LoginViewController.m
@@ -205,13 +205,13 @@
[self loginWithUserName:self.usernameField.text
password:self.passwordField.text
onSuccess:^{
- NSString* loggedInMessage =
MWLocalizedString(@"main-menu-account-title-logged-in", nil);
- loggedInMessage = [loggedInMessage
stringByReplacingOccurrencesOfString:@"$1"
-
withString:self.usernameField.text];
- [self showAlert:loggedInMessage type:ALERT_TYPE_TOP
duration:1.0f];
+ NSString* loggedInMessage =
MWLocalizedString(@"main-menu-account-title-logged-in", nil);
+ loggedInMessage = [loggedInMessage
stringByReplacingOccurrencesOfString:@"$1"
+
withString:self.usernameField.text];
+ [self showAlert:loggedInMessage type:ALERT_TYPE_TOP duration:1.0f];
- [self performSelector:(onboardingVC ?
@selector(popModalToRoot) : @selector(popModal)) withObject:nil
afterDelay:1.2f];
- } onFail:nil];
+ [self performSelector:(onboardingVC ? @selector(popModalToRoot) :
@selector(popModal)) withObject:nil afterDelay:1.2f];
+ } onFail:nil];
}
- (void)viewWillDisappear:(BOOL)animated {
@@ -361,9 +361,9 @@
[self performModalSequeWithID:@"modal_segue_show_create_account"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(AccountCreationViewController*
createAcctVC){
- createAcctVC.funnel =
[[CreateAccountFunnel alloc] init];
- [createAcctVC.funnel
logStartFromLogin:self.funnel.loginSessionToken];
- }];
+ createAcctVC.funnel = [[CreateAccountFunnel alloc] init];
+ [createAcctVC.funnel
logStartFromLogin:self.funnel.loginSessionToken];
+ }];
}
}
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 3e97480..95935ee 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -162,19 +162,19 @@
afterDelay:0.0
duration:0.06f
then:^{
- [self
performActionForButton:button];
- if (button.tag ==
BOTTOM_MENU_BUTTON_SHARE) {
- // Bring the buttons back to
life.
- // Note that the custom
sharing activity
- // spawned in this class makes
a dimmed
- // background that makes the
buttons
- // in the collection in effect
non-tappable
- // so we don't have to do more
than this.
- for (WikiGlyphButton* b in
self.allButtons) {
- b.userInteractionEnabled =
YES;
- }
- }
- }];
+ [self performActionForButton:button];
+ if (button.tag == BOTTOM_MENU_BUTTON_SHARE) {
+ // Bring the buttons back to life.
+ // Note that the custom sharing activity
+ // spawned in this class makes a dimmed
+ // background that makes the buttons
+ // in the collection in effect non-tappable
+ // so we don't have to do more than this.
+ for (WikiGlyphButton* b in self.allButtons) {
+ b.userInteractionEnabled = YES;
+ }
+ }
+ }];
}
}
}
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index 2855c8e..dd329d5 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -231,8 +231,8 @@
afterDelay:0.0
duration:0.1
then:^{
- [self performActionForItem:tag];
- }];
+ [self performActionForItem:tag];
+ }];
}
- (void)performActionForItem:(PrimaryMenuItemTag)tag {
@@ -241,9 +241,9 @@
[self performModalSequeWithID:@"modal_segue_show_login"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(LoginViewController* loginVC){
- loginVC.funnel = [[LoginFunnel alloc]
init];
- [loginVC.funnel
logStartFromNavigation];
- }];
+ loginVC.funnel = [[LoginFunnel alloc] init];
+ [loginVC.funnel logStartFromNavigation];
+ }];
}
break;
case PRIMARY_MENU_ITEM_RANDOM: {
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index ae16764..1b6b35f 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -548,9 +548,9 @@
[self performModalSequeWithID:@"modal_segue_show_login"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(LoginViewController*
loginVC){
- loginVC.funnel = [[LoginFunnel
alloc] init];
- [loginVC.funnel
logStartFromNavigation];
- }];
+ loginVC.funnel = [[LoginFunnel alloc] init];
+ [loginVC.funnel logStartFromNavigation];
+ }];
} else {
[SessionSingleton
sharedInstance].keychainCredentials.userName = nil;
[SessionSingleton
sharedInstance].keychainCredentials.password = nil;
@@ -668,9 +668,9 @@
[self performModalSequeWithID:@"modal_segue_show_languages"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(LanguagesViewController* languagesVC){
- languagesVC.languageSelectionDelegate = self;
- languagesVC.invokingVC = self;
- }];
+ languagesVC.languageSelectionDelegate = self;
+ languagesVC.invokingVC = self;
+ }];
}
- (void)languageSelected:(NSDictionary*)langData
sender:(LanguagesViewController*)sender {
@@ -752,10 +752,10 @@
delay:delay
options:UIViewAnimationOptionCurveEaseInOut
animations:^{
- view.center = destPoint;
- view.alpha = 0.3f;
- view.transform = xf;
- } completion:^(BOOL finished) {
+ view.center = destPoint;
+ view.alpha = 0.3f;
+ view.transform = xf;
+ } completion:^(BOOL finished) {
[view removeFromSuperview];
}];
}
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 94285c2..81e46be 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -336,11 +336,11 @@
[self performModalSequeWithID:@"modal_segue_show_edit_summary"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(EditSummaryViewController* summaryVC){
- // Set the overlay's text field to
self.summaryText so it can display
- // any existing value (in case user taps
"Other" again)
- summaryVC.summaryText = self.summaryText;
- summaryVC.previewVC = self;
- }];
+ // Set the overlay's text field to self.summaryText so it can display
+ // any existing value (in case user taps "Other" again)
+ summaryVC.summaryText = self.summaryText;
+ summaryVC.previewVC = self;
+ }];
}
- (void)htmlAlertWasHidden {
@@ -392,9 +392,9 @@
[self performModalSequeWithID:@"modal_segue_show_login"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(LoginViewController* loginVC){
- loginVC.funnel = [[LoginFunnel alloc]
init];
- [loginVC.funnel
logStartFromEdit:self.funnel.editSessionToken];
- }];
+ loginVC.funnel = [[LoginFunnel alloc] init];
+ [loginVC.funnel logStartFromEdit:self.funnel.editSessionToken];
+ }];
}
}
diff --git a/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.m b/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.m
index dfb032e..6ed92ff 100644
--- a/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
+++ b/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
@@ -160,11 +160,11 @@
delay:0.6f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- self.pullToRefreshView.alpha = 0.0f;
- self.pullToRefreshViewBottomConstraint.constant = 0;
- scrollView.panGestureRecognizer.enabled = NO;
- [self.view layoutIfNeeded];
- } completion:^(BOOL done){
+ self.pullToRefreshView.alpha = 0.0f;
+ self.pullToRefreshViewBottomConstraint.constant = 0;
+ scrollView.panGestureRecognizer.enabled = NO;
+ [self.view layoutIfNeeded];
+ } completion:^(BOOL done){
scrollView.panGestureRecognizer.enabled = YES;
self.isAnimatingHide = NO;
}];
diff --git a/wikipedia/View
Controllers/RecentSearches/RecentSearchesViewController.m b/wikipedia/View
Controllers/RecentSearches/RecentSearchesViewController.m
index e2ce93b..6dac871 100644
--- a/wikipedia/View Controllers/RecentSearches/RecentSearchesViewController.m
+++ b/wikipedia/View Controllers/RecentSearches/RecentSearchesViewController.m
@@ -179,8 +179,8 @@
afterDelay:0.0
duration:0.1
then:^{
- [self showDeleteAllDialog];
- }];
+ [self showDeleteAllDialog];
+ }];
}
- (void)showDeleteAllDialog {
@@ -263,8 +263,8 @@
afterDelay:0.0
duration:0.1
then:^{
- [textFieldContainer.textField
sendActionsForControlEvents:UIControlEventEditingChanged];
- }];
+ [textFieldContainer.textField
sendActionsForControlEvents:UIControlEventEditingChanged];
+ }];
}
- (void)scrollViewWillBeginDragging:(UIScrollView*)scrollView {
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index b019621..7f83216 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -380,18 +380,18 @@
direction:direction
animated:animated
completion:^(BOOL finished) {
- if (!weakSelf.pageController) {
- return;
- }
- dispatch_async(dispatch_get_main_queue(),
^{
+ if (!weakSelf.pageController) {
+ return;
+ }
+ dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf.pageController setViewControllers:viewControllers
direction:direction
animated:NO
completion:^(BOOL done){
- [weakSelf
refViewDidAppear:weakSelf.topPageControl.currentPage];
- }];
+ [weakSelf
refViewDidAppear:weakSelf.topPageControl.currentPage];
+ }];
});
- }];
+ }];
}
- (void) pageViewController:(UIPageViewController*)pageViewController
diff --git a/wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.m b/wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.m
index 1f40665..7451fe3 100644
--- a/wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
+++ b/wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
@@ -68,9 +68,9 @@
[regex enumerateMatchesInString:[attrSnippet string] options:0
range:NSMakeRange(0,
attrSnippet.string.length)
usingBlock:^(NSTextCheckingResult* match,
NSMatchingFlags flags, BOOL* stop){
- [attrSnippet
setAttributes:attributesSnippetHighlight
-
range:match.range];
- }];
+ [attrSnippet setAttributes:attributesSnippetHighlight
+ range:match.range];
+ }];
}
}
[outputString appendAttributedString:attrSnippet];
diff --git a/wikipedia/View Controllers/TableOfContents/TOCViewController.m
b/wikipedia/View Controllers/TableOfContents/TOCViewController.m
index b1c17bd..79b18a2 100644
--- a/wikipedia/View Controllers/TableOfContents/TOCViewController.m
+++ b/wikipedia/View Controllers/TableOfContents/TOCViewController.m
@@ -475,10 +475,10 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- // Not using "setContentOffset:animated:" so duration
of animation
- // can be controlled and action can be taken after
animation completes.
- self.scrollView.contentOffset = contentOffset;
- } completion:^(BOOL done){
+ // Not using "setContentOffset:animated:" so duration of animation
+ // can be controlled and action can be taken after animation completes.
+ self.scrollView.contentOffset = contentOffset;
+ } completion:^(BOOL done){
self.scrollView.delegate = self;
}];
}
diff --git a/wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
b/wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
index 256f255..42076f4 100644
--- a/wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
+++ b/wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
@@ -152,10 +152,10 @@
[self performModalSequeWithID:@"modal_segue_show_languages"
transitionStyle:UIModalTransitionStyleCoverVertical
block:^(LanguagesViewController* languagesVC){
- languagesVC.downloadLanguagesForCurrentArticle
= YES;
- languagesVC.invokingVC = self;
- languagesVC.languageSelectionDelegate = self;
- }];
+ languagesVC.downloadLanguagesForCurrentArticle = YES;
+ languagesVC.invokingVC = self;
+ languagesVC.languageSelectionDelegate = self;
+ }];
}
#pragma mark LanguageSelectionDelegate
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 0238405..dea0f5e 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -452,20 +452,20 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- self.scrollIndicatorView.alpha = 1.0;
- // If the top menu isn't hidden, reveal the
bottom menu.
- self.bottomMenuHidden = ROOT.topMenuHidden;
+ self.scrollIndicatorView.alpha = 1.0;
+ // If the top menu isn't hidden, reveal the bottom menu.
+ self.bottomMenuHidden = ROOT.topMenuHidden;
- self.webView.scrollView.transform =
CGAffineTransformIdentity;
+ self.webView.scrollView.transform = CGAffineTransformIdentity;
- self.referencesContainerView.transform =
CGAffineTransformIdentity;
+ self.referencesContainerView.transform = CGAffineTransformIdentity;
- self.bottomBarView.transform =
CGAffineTransformIdentity;
+ self.bottomBarView.transform = CGAffineTransformIdentity;
- self.tocViewLeadingConstraint.constant = 0;
+ self.tocViewLeadingConstraint.constant = 0;
- [self.view layoutIfNeeded];
- } completion:^(BOOL done){
+ [self.view layoutIfNeeded];
+ } completion:^(BOOL done){
[self.tocVC didHide];
self.unsafeToToggleTOC = NO;
self.webView.scrollView.contentOffset = origScrollPosition;
@@ -515,22 +515,22 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- self.scrollIndicatorView.alpha = 0.0;
- self.bottomMenuHidden = YES;
- self.referencesHidden = YES;
+ self.scrollIndicatorView.alpha = 0.0;
+ self.bottomMenuHidden = YES;
+ self.referencesHidden = YES;
- CGFloat webViewScale = [self
tocGetWebViewScaleWhenTOCVisible];
- CGAffineTransform xf =
CGAffineTransformMakeScale(webViewScale, webViewScale);
+ CGFloat webViewScale = [self tocGetWebViewScaleWhenTOCVisible];
+ CGAffineTransform xf = CGAffineTransformMakeScale(webViewScale,
webViewScale);
- self.webView.scrollView.transform = xf;
- self.referencesContainerView.transform = xf;
- self.bottomBarView.transform = xf;
+ self.webView.scrollView.transform = xf;
+ self.referencesContainerView.transform = xf;
+ self.bottomBarView.transform = xf;
- CGFloat tocWidth = [self
tocGetWidthForWebViewScale:webViewScale];
- self.tocViewLeadingConstraint.constant = -tocWidth;
+ CGFloat tocWidth = [self tocGetWidthForWebViewScale:webViewScale];
+ self.tocViewLeadingConstraint.constant = -tocWidth;
- [self.view layoutIfNeeded];
- } completion:^(BOOL done){
+ [self.view layoutIfNeeded];
+ } completion:^(BOOL done){
self.unsafeToToggleTOC = NO;
WikiGlyphButton* tocButton = [ROOT.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TOC];
@@ -741,10 +741,10 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- // Not using "setContentOffset:animated:" so duration
of animation
- // can be controlled and action can be taken after
animation completes.
- self.webView.scrollView.contentOffset = point;
- } completion:^(BOOL done){
+ // Not using "setContentOffset:animated:" so duration of animation
+ // can be controlled and action can be taken after animation completes.
+ self.webView.scrollView.contentOffset = point;
+ } completion:^(BOOL done){
// Record the new scroll location.
[self saveWebViewScrollOffset];
// Toggle toc.
@@ -1873,9 +1873,9 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- self.referencesHidden = NO;
- [self.view layoutIfNeeded];
- } completion:nil];
+ self.referencesHidden = NO;
+ [self.view layoutIfNeeded];
+ } completion:nil];
}
- (void)referencesHide {
@@ -1886,10 +1886,10 @@
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:^{
- self.referencesHidden = YES;
+ self.referencesHidden = YES;
- [self.view layoutIfNeeded];
- } completion:^(BOOL done){
+ [self.view layoutIfNeeded];
+ } completion:^(BOOL done){
[self.referencesVC willMoveToParentViewController:nil];
[self.referencesVC.view removeFromSuperview];
[self.referencesVC removeFromParentViewController];
@@ -1970,11 +1970,11 @@
delay:0.0
options:UIViewAnimationOptionCurveEaseInOut
animations:^{
- self.activityIndicatorBackgroundView.alpha = 0.7;
- self.activityIndicator.alpha = 1.0;
- }
+ self.activityIndicatorBackgroundView.alpha = 0.7;
+ self.activityIndicator.alpha = 1.0;
+ }
completion:^(BOOL finished) {
- }];
+ }];
}
- (void)loadingIndicatorHide {
@@ -1984,11 +1984,11 @@
delay:0.0
options:UIViewAnimationOptionCurveEaseInOut
animations:^{
- self.activityIndicatorBackgroundView.alpha = 0.0;
- self.activityIndicator.alpha = 0.0;
- }
+ self.activityIndicatorBackgroundView.alpha = 0.0;
+ self.activityIndicator.alpha = 0.0;
+ }
completion:^(BOOL finished) {
- }];
+ }];
}
#pragma mark Lead image container
--
To view, visit https://gerrit.wikimedia.org/r/194250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fa9cd94d930430409f87d01e758a476f4c65d6e
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
