Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194875
Change subject: uncrustify pass to fix linting errors
......................................................................
uncrustify pass to fix linting errors
Change-Id: I35d701b204486decbd42364fbc3606d11081e80b
---
M wikipedia/AppDelegate.m
M wikipedia/Categories/UIViewController+HideKeyboard.h
M wikipedia/Categories/UIViewController+HideKeyboard.m
M wikipedia/Session/SessionSingleton.m
M wikipedia/View Controllers/Navigation/Center/CenterNavController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
7 files changed, 28 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/75/194875/1
diff --git a/wikipedia/AppDelegate.m b/wikipedia/AppDelegate.m
index 420a80f..26ba5eb 100644
--- a/wikipedia/AppDelegate.m
+++ b/wikipedia/AppDelegate.m
@@ -16,7 +16,7 @@
[[BITHockeyManager sharedHockeyManager] startManager];
[[BITHockeyManager sharedHockeyManager].authenticator
authenticateInstallation];
}
-
+
[self systemWideStyleOverrides];
// Enables Alignment Rect highlighting for debugging
diff --git a/wikipedia/Categories/UIViewController+HideKeyboard.h
b/wikipedia/Categories/UIViewController+HideKeyboard.h
index 595db25..ddf99d9 100644
--- a/wikipedia/Categories/UIViewController+HideKeyboard.h
+++ b/wikipedia/Categories/UIViewController+HideKeyboard.h
@@ -4,7 +4,7 @@
@interface UIViewController (HideKeyboard)
/**
- * Uses the responder chain to make all UIResponders
+ * Uses the responder chain to make all UIResponders
* in the view hierarchy resignFirstResponder.
*/
- (void)hideKeyboard;
diff --git a/wikipedia/Categories/UIViewController+HideKeyboard.m
b/wikipedia/Categories/UIViewController+HideKeyboard.m
index d91f251..35c0fbb 100644
--- a/wikipedia/Categories/UIViewController+HideKeyboard.m
+++ b/wikipedia/Categories/UIViewController+HideKeyboard.m
@@ -4,10 +4,8 @@
@implementation UIViewController (HideKeyboard)
- (void)hideKeyboard {
-
//http://stackoverflow.com/questions/11879745/an-utility-method-for-hiding-the-keyboard
[[UIApplication sharedApplication]
sendAction:@selector(resignFirstResponder) to:nil from:nil forEvent:nil];
-
}
@end
diff --git a/wikipedia/Session/SessionSingleton.m
b/wikipedia/Session/SessionSingleton.m
index e9e4e6c..ed0d4eb 100644
--- a/wikipedia/Session/SessionSingleton.m
+++ b/wikipedia/Session/SessionSingleton.m
@@ -24,8 +24,8 @@
@implementation SessionSingleton
-@synthesize currentArticleSite = _currentArticleSite;
-@synthesize currentArticle = _currentArticle;
+@synthesize currentArticleSite = _currentArticleSite;
+@synthesize currentArticle = _currentArticle;
#pragma mark - Setup
@@ -155,9 +155,9 @@
- (void)setCurrentArticle:(MWKArticle*)currentArticle {
if (currentArticle) {
- _currentArticle = currentArticle;
+ _currentArticle = currentArticle;
self.currentArticleTitle = currentArticle.title;
- self.currentArticleSite = currentArticle.site;
+ self.currentArticleSite = currentArticle.site;
}
}
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
index 0f71e65..724338d 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
@@ -184,9 +184,8 @@
}
- (void)switchPreferredLanguageToId:(NSString*)languageId {
-
[[SessionSingleton sharedInstance] setSearchLanguage:languageId];
-
+
MWKTitle* pageTitle = [[SessionSingleton sharedInstance]
mainArticleTitleForSite:[SessionSingleton sharedInstance].searchSite
languageCode:languageId];
[self loadArticleWithTitle:pageTitle
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index 2f4249a..f469a57 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -583,9 +583,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;
@@ -721,9 +721,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 {
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index ef1f615..989b258 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -95,12 +95,12 @@
selector:@selector(zeroStateChanged:)
name:@"ZeroStateChanged"
object:nil];
-
-
+
+
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardDidShow:)
name:UIKeyboardDidShowNotification object:nil];
-
+
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardWillHide:)
name:UIKeyboardWillHideNotification object:nil];
@@ -472,8 +472,8 @@
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;
@@ -537,8 +537,8 @@
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];
@@ -746,10 +746,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.
@@ -1099,13 +1099,11 @@
}
}
-- (void)keyboardDidShow:(NSNotification*)note{
-
+- (void)keyboardDidShow:(NSNotification*)note {
self.keyboardIsVisible = YES;
}
-- (void)keyboardWillHide:(NSNotification*)note{
-
+- (void)keyboardWillHide:(NSNotification*)note {
self.keyboardIsVisible = NO;
}
@@ -1901,8 +1899,8 @@
animations:^{
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];
--
To view, visit https://gerrit.wikimedia.org/r/194875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35d701b204486decbd42364fbc3606d11081e80b
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
