Fjalapeno has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206469
Change subject: Fix improperly defined const
......................................................................
Fix improperly defined const
Change-Id: I2a6846a35f87dfd1c6679972016b487de5a32e70
---
M Wikipedia/Categories/NSString+WMFHTMLParsing.m
M Wikipedia/Categories/NSURL+WMFRest.h
M Wikipedia/Categories/NSURL+WMFRest.m
M Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
M Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
M Wikipedia/Networking/Fetchers/SearchResultFetcher.h
M Wikipedia/Networking/Fetchers/SearchResultFetcher.m
M Wikipedia/Protocols/WMFLocalizationProtocol.m
M Wikipedia/Session/SessionSingleton.h
M Wikipedia/Session/SessionSingleton.m
M Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
M Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
M Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.h
M Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
M Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
M Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/View Controllers/WebView/WebViewController_Private.h
M Wikipedia/mw-utils/WikipediaAppUtils.m
25 files changed, 94 insertions(+), 96 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/69/206469/1
diff --git a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
index f48ba4c..a89ad8f 100644
--- a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -2,8 +2,8 @@
#import "WikipediaAppUtils.h"
#import <hpple/TFHpple.h>
-static const int kMinimumLengthForPreTransformedHTMLForSnippet = 40;
-static const int kHighestIndexForSubstringAfterHTMLRemoved = 350;
+static int const kMinimumLengthForPreTransformedHTMLForSnippet = 40;
+static int const kHighestIndexForSubstringAfterHTMLRemoved = 350;
@implementation NSString (WMFHTMLParsing)
diff --git a/Wikipedia/Categories/NSURL+WMFRest.h
b/Wikipedia/Categories/NSURL+WMFRest.h
index 91c264e..85a3679 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.h
+++ b/Wikipedia/Categories/NSURL+WMFRest.h
@@ -5,6 +5,6 @@
@interface NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key;
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key;
@end
diff --git a/Wikipedia/Categories/NSURL+WMFRest.m
b/Wikipedia/Categories/NSURL+WMFRest.m
index eed2352..4eb26ac 100644
--- a/Wikipedia/Categories/NSURL+WMFRest.m
+++ b/Wikipedia/Categories/NSURL+WMFRest.m
@@ -6,7 +6,7 @@
@implementation NSURL (WMFRest)
--(BOOL)wmf_conformsToScheme:(NSString *)scheme andHasKey:(NSString *)key {
+- (BOOL)wmf_conformsToScheme:(NSString*)scheme andHasKey:(NSString*)key {
return ([[self scheme] wmf_isEqualToStringIgnoringCase:scheme] && [[self
host] wmf_isEqualToStringIgnoringCase:key]);
}
diff --git a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
index dccbe30..60f6501 100644
--- a/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
+++ b/Wikipedia/Custom Views/WMFLoadingIndicatorOverlay.m
@@ -5,11 +5,11 @@
#import "UIColor+WMFHexColor.h"
#import <Masonry/Masonry.h>
-static const CGFloat kActivityIndicatorWidth = 100.0f;
-static const CGFloat kActivityIndicatorCornerRadius = 10.0f;
-static const NSInteger kActivityIndicatorBackgroundColor = 0x000000;
+static CGFloat const kActivityIndicatorWidth = 100.0f;
+static CGFloat const kActivityIndicatorCornerRadius = 10.0f;
+static NSInteger const kActivityIndicatorBackgroundColor = 0x000000;
-static const CGFloat kFadeAnimationDuration = 0.33f;
+static CGFloat const kFadeAnimationDuration = 0.33f;
@interface WMFLoadingIndicatorOverlay ()
diff --git a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
index 631a896..f9f9057 100644
--- a/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
+++ b/Wikipedia/EventLogging/WMFSuggestedPagesFunnel.m
@@ -9,7 +9,7 @@
#import "WMFSuggestedPagesFunnel.h"
static NSString* const kSchemaName = @"MobileWikiAppArticleSuggestions";
-static const int kSchemaVersion = 10590869;
+static int const kSchemaVersion = 10590869;
static NSString* const kActionKey = @"action";
static NSString* const kActionShown = @"shown";
diff --git a/Wikipedia/Networking/Fetchers/SearchResultFetcher.h
b/Wikipedia/Networking/Fetchers/SearchResultFetcher.h
index 161b981..d30cf11 100644
--- a/Wikipedia/Networking/Fetchers/SearchResultFetcher.h
+++ b/Wikipedia/Networking/Fetchers/SearchResultFetcher.h
@@ -40,7 +40,7 @@
- (instancetype)initAndSearchForTerm:(NSString*)searchTerm
searchType:(SearchType)searchType
searchReason:(SearchReason)searchReason
- language:(NSString *)language
+ language:(NSString*)language
maxResults:(NSUInteger)maxResults
withManager:(AFHTTPRequestOperationManager*)manager
thenNotifyDelegate:(id <FetchFinishedDelegate>)delegate;
diff --git a/Wikipedia/Networking/Fetchers/SearchResultFetcher.m
b/Wikipedia/Networking/Fetchers/SearchResultFetcher.m
index 7990b7a..90fe258 100644
--- a/Wikipedia/Networking/Fetchers/SearchResultFetcher.m
+++ b/Wikipedia/Networking/Fetchers/SearchResultFetcher.m
@@ -31,7 +31,7 @@
- (instancetype)initAndSearchForTerm:(NSString*)searchTerm
searchType:(SearchType)searchType
searchReason:(SearchReason)searchReason
- language:(NSString *)language
+ language:(NSString*)language
maxResults:(NSUInteger)maxResults
withManager:(AFHTTPRequestOperationManager*)manager
thenNotifyDelegate:(id <FetchFinishedDelegate>)delegate {
diff --git a/Wikipedia/Protocols/WMFLocalizationProtocol.m
b/Wikipedia/Protocols/WMFLocalizationProtocol.m
index fcb2a8c..76d4b2b 100644
--- a/Wikipedia/Protocols/WMFLocalizationProtocol.m
+++ b/Wikipedia/Protocols/WMFLocalizationProtocol.m
@@ -6,7 +6,7 @@
#import "NSURL+WMFRest.h"
__attribute__((constructor)) static void WMFRegisterLocalizationProtocol() {
- [NSURLProtocol registerClass:[WMFLocalizationProtocol class]];
+ [NSURLProtocol registerClass:[WMFLocalizationProtocol class]];
}
@interface WMFLocalizationProtocol () <NSURLConnectionDelegate>
@@ -15,19 +15,19 @@
@implementation WMFLocalizationProtocol
-+ (BOOL)canInitWithRequest:(NSURLRequest *)request {
++ (BOOL)canInitWithRequest:(NSURLRequest*)request {
return [[request URL] wmf_conformsToScheme:@"wmf" andHasKey:@"localize"];
}
-+ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request {
++ (NSURLRequest*)canonicalRequestForRequest:(NSURLRequest*)request {
return request;
}
// Some handling below based on
http://devmonologue.com/ios/tutorials/nsurlprotocol-tutorial/
- (void)startLoading {
- NSString *key = [self getKeyFromURL:self.request.URL];
- NSString *translation = [self getTranslationForKey:key];
+ NSString* key = [self getKeyFromURL:self.request.URL];
+ NSString* translation = [self getTranslationForKey:key];
NSAssert(translation.length > 1, @"translation length is zero for key:
%@", key);
@@ -36,26 +36,26 @@
[self sendResponseWithData:localizationStringData];
}
--(NSString *)getKeyFromURL:(NSURL *)url {
+- (NSString*)getKeyFromURL:(NSURL*)url {
NSAssert(self.request.URL.path.length > 1, @"wikipedia URLs must have a
path: %@", self.request.URL);
if (self.request.URL.path.length > 1) {
return [self.request.URL.path substringFromIndex:1];
- }else{
+ } else {
return nil;
}
}
--(NSString *)getTranslationForKey:(NSString *)key {
+- (NSString*)getTranslationForKey:(NSString*)key {
return MWCurrentArticleLanguageLocalizedString(key, nil);
}
-- (void)sendResponseWithData:(NSData*)data{
+- (void)sendResponseWithData:(NSData*)data {
[self handleResponse:data];
[self handleResponseData:data];
[self handleRequestFinished];
}
-- (void)handleResponse:(NSData*)data{
+- (void)handleResponse:(NSData*)data {
NSURLResponse* response = [[NSURLResponse alloc]
initWithURL:self.request.URL
MIMEType:@"text/plain"
expectedContentLength:data.length
@@ -65,16 +65,15 @@
cacheStoragePolicy:NSURLCacheStorageNotAllowed];
}
-- (void)handleResponseData:(NSData*)data{
+- (void)handleResponseData:(NSData*)data {
[self.client URLProtocol:self didLoadData:data];
}
-- (void)handleRequestFinished{
+- (void)handleRequestFinished {
[self.client URLProtocolDidFinishLoading:self];
}
- (void)stopLoading {
-
}
@end
diff --git a/Wikipedia/Session/SessionSingleton.h
b/Wikipedia/Session/SessionSingleton.h
index deb29f9..58a915c 100644
--- a/Wikipedia/Session/SessionSingleton.h
+++ b/Wikipedia/Session/SessionSingleton.h
@@ -91,7 +91,7 @@
@property (strong, nonatomic, readonly) NSString* searchApiUrl;
-- (NSString*)searchApiUrlForLanguage:(NSString *)language;
+- (NSString*)searchApiUrlForLanguage:(NSString*)language;
- (NSString*)searchLanguage;
@property (nonatomic) BOOL fallback;
diff --git a/Wikipedia/Session/SessionSingleton.m
b/Wikipedia/Session/SessionSingleton.m
index b7f7869..2287d94 100644
--- a/Wikipedia/Session/SessionSingleton.m
+++ b/Wikipedia/Session/SessionSingleton.m
@@ -196,7 +196,7 @@
return [self searchApiUrlForLanguage:self.searchLanguage];
}
-- (NSString*)searchApiUrlForLanguage:(NSString *)language {
+- (NSString*)searchApiUrlForLanguage:(NSString*)language {
NSString* endpoint = self.fallback ? @"" : @".m";
return [NSString stringWithFormat:@"https://%@%@.%@/w/api.php";, language,
endpoint, self.currentArticleSite.domain];
}
diff --git a/Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
b/Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
index 43b9d3d..578aa3e 100644
--- a/Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
+++ b/Wikipedia/View Controllers/LeadImage/LeadImageContainer.m
@@ -19,8 +19,8 @@
#import "UIImage+WMFFocalImageDrawing.h"
#import "MWKArticle+Convenience.h"
-static const CGFloat kPlaceHolderImageAlpha = 0.3f;
-static const CGFloat kMinimumAcceptableCachedVariantThreshold = 0.6f;
+static CGFloat const kPlaceHolderImageAlpha = 0.3f;
+static CGFloat const kMinimumAcceptableCachedVariantThreshold = 0.6f;
/*
When YES this causes lead image faces to be highlighted in green and
diff --git a/Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
b/Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
index 8df0ad7..c87cc1a 100644
--- a/Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
+++ b/Wikipedia/View
Controllers/SavedPages/NSAttributedString+WMFSavedPagesAttributedStrings.m
@@ -7,14 +7,14 @@
#import "NSString+Extras.h"
#import "UIColor+WMFHexColor.h"
-static const NSInteger kTitleColor = 0x000000;
+static NSInteger const kTitleColor = 0x000000;
static CGFloat const kTitleFontSize = 21.0f;
-static const NSInteger kDescriptionColor = 0x777777;
+static NSInteger const kDescriptionColor = 0x777777;
static CGFloat const kDescriptionFontSize = 13.0f;
static CGFloat const kDescriptionSpaceAbove = 3.0f;
-static const NSInteger kLanguageColor = 0x999999;
+static NSInteger const kLanguageColor = 0x999999;
static CGFloat const kLanguageFontSize = 10.0f;
static CGFloat const kLanguageSpaceAbove = 5.0f;
diff --git a/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
b/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
index 80f3684..f593f9e 100644
--- a/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
+++ b/Wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
@@ -325,13 +325,13 @@
self.progressView.alpha = 0.0;
}
--(void)hideTrashButton {
- MenuButton *trashButton = (MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
+- (void)hideTrashButton {
+ MenuButton* trashButton = (MenuButton*)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
trashButton.alpha = 0.0;
}
--(void)showTrashButton {
- MenuButton *trashButton = (MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
+- (void)showTrashButton {
+ MenuButton* trashButton = (MenuButton*)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_TRASH];
trashButton.alpha = 1.0;
}
@@ -343,9 +343,9 @@
MenuButton* reloadButton = [self reloadButton];
reloadButton.alpha = savedPageFound ? 1.0 : 0.0;
- if (savedPageFound){
+ if (savedPageFound) {
[self showTrashButton];
- }else{
+ } else {
[self hideTrashButton];
}
}
diff --git a/Wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.h b/Wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.h
index ea65374..6c3d68e 100644
--- a/Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.h
+++ b/Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.h
@@ -5,11 +5,11 @@
@interface SearchResultAttributedString : NSMutableAttributedString
-+ (instancetype) initWithTitle:(NSString*)title
- snippet:(NSString*)snippet
- wikiDataDescription:(NSString*)description
- highlightWords:(NSArray*)wordsToHighlight
- shouldHighlightWords:(BOOL)shouldHighlightWords
- searchType:(SearchType)searchType;
++ (instancetype)initWithTitle:(NSString*)title
+ snippet:(NSString*)snippet
+ wikiDataDescription:(NSString*)description
+ highlightWords:(NSArray*)wordsToHighlight
+ shouldHighlightWords:(BOOL)shouldHighlightWords
+ searchType:(SearchType)searchType;
@end
diff --git a/Wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.m b/Wikipedia/View
Controllers/SearchResults/SearchResultAttributedString.m
index f5666ad..21f18a7 100644
--- a/Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
+++ b/Wikipedia/View Controllers/SearchResults/SearchResultAttributedString.m
@@ -7,17 +7,17 @@
#import "UIColor+WMFHexColor.h"
static CGFloat const kFontSize = 16.0f;
-static const NSInteger kFontColor = 0x383838;
+static NSInteger const kFontColor = 0x383838;
static CGFloat const kDescriptionFontSize = 12.0f;
-static const NSInteger kDescriptionFontColor = 0x606060;
+static NSInteger const kDescriptionFontColor = 0x606060;
static CGFloat const kSnippetFontSize = 12.0f;
-static const NSInteger kSnippetFontColor = 0x000000;
-static const NSInteger kSnippetHighlightColor = 0x0000ff;
+static NSInteger const kSnippetFontColor = 0x000000;
+static NSInteger const kSnippetHighlightColor = 0x0000ff;
static CGFloat const kHighlightedFontSize = 16.0f;
-static const NSInteger kHighlightedFontColor = 0x000000;
+static NSInteger const kHighlightedFontColor = 0x000000;
static CGFloat const kPaddingAboveDescription = 2.0f;
static CGFloat const kPaddingAboveSnippet = 3.0f;
@@ -38,14 +38,14 @@
(SearchResultAttributedString*)[[NSMutableAttributedString alloc]
initWithString:title
attributes:self.attributesTitle];
- if (shouldHighlightWords){
+ if (shouldHighlightWords) {
switch (searchType) {
case SEARCH_TYPE_TITLES:
for (NSString* word in wordsToHighlight.copy) {
// Highlight matches in title.
NSRange rangeOfWord =
- [title rangeOfString:word
- options:(NSCaseInsensitiveSearch |
NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch)];
+ [title rangeOfString:word
+ options:(NSCaseInsensitiveSearch |
NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch)];
[outputString setAttributes:self.attributesHighlight
range:rangeOfWord];
}
@@ -100,7 +100,7 @@
if (!attributes) {
NSMutableParagraphStyle* descriptionParagraphStyle =
[[NSMutableParagraphStyle alloc] init];
descriptionParagraphStyle.paragraphSpacingBefore =
kPaddingAboveDescription;
- attributes =
+ attributes =
@{
NSFontAttributeName: [UIFont
systemFontOfSize:(kDescriptionFontSize * MENUS_SCALE_MULTIPLIER)],
NSForegroundColorAttributeName: [UIColor
wmf_colorWithHex:kDescriptionFontColor alpha:1.0f],
@@ -127,7 +127,7 @@
if (!attributes) {
NSMutableParagraphStyle* snippetParagraphStyle =
[[NSMutableParagraphStyle alloc] init];
snippetParagraphStyle.paragraphSpacingBefore = kPaddingAboveSnippet;
- attributes =
+ attributes =
@{
NSParagraphStyleAttributeName: snippetParagraphStyle,
NSFontAttributeName: [UIFont
italicSystemFontOfSize:(kSnippetFontSize * MENUS_SCALE_MULTIPLIER)],
@@ -142,7 +142,7 @@
if (!attributes) {
NSMutableParagraphStyle* snippetParagraphStyle =
[[NSMutableParagraphStyle alloc] init];
snippetParagraphStyle.paragraphSpacingBefore = kPaddingAboveSnippet;
- attributes =
+ attributes =
@{
NSParagraphStyleAttributeName: snippetParagraphStyle,
NSFontAttributeName: [UIFont
italicSystemFontOfSize:(kSnippetFontSize * MENUS_SCALE_MULTIPLIER)],
diff --git a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
index 15ee037..29f0c8a 100644
--- a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
+++ b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
@@ -516,14 +516,14 @@
}
}
--(BOOL)isReadMore {
+- (BOOL)isReadMore {
return (self.type == WMFSearchResultsControllerTypeReadMore);
}
--(NSString *)getSearchLanguage {
+- (NSString*)getSearchLanguage {
if ([self isReadMore]) {
return [SessionSingleton sharedInstance].currentArticleSite.language;
- }else{
+ } else {
return [SessionSingleton sharedInstance].searchLanguage;
}
}
diff --git a/Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
b/Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
index dbdbe41..01405ef 100644
--- a/Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
+++ b/Wikipedia/View Controllers/ShareCard/WMFShareFunnel.m
@@ -11,7 +11,7 @@
#import "NSString+Extras.h"
static NSString* const kSchemaName = @"MobileWikiAppShareAFact";
-static const int kSchemaVersion = 11331974;
+static int const kSchemaVersion = 11331974;
static NSString* const kActionKey = @"action";
static NSString* const kActionHighlight = @"highlight";
static NSString* const kActionShareTap = @"sharetap";
diff --git a/Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
b/Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
index caea756..d5c04c9 100644
--- a/Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
+++ b/Wikipedia/View Controllers/ShareCard/WMFShareOptionsView.m
@@ -10,7 +10,7 @@
#import "PaddedLabel.h"
#import "UIView+WMFRoundCorners.h"
-static const int kCornerRadius = 4.2f;
+static int const kCornerRadius = 4.2f;
@implementation WMFShareOptionsView
diff --git a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
index 35f5651..83cb8f9 100644
--- a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
+++ b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
@@ -5,6 +5,6 @@
@interface WMFLegalFooterViewController : UIViewController
--(void)updateLocalizedText;
+- (void)updateLocalizedText;
@end
diff --git a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
index e1bccc1..0f2cf39 100644
--- a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
+++ b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
@@ -11,12 +11,12 @@
#pragma mark Font sizes
-static const CGFloat kLicenseFontSize = 10.0f;
+static CGFloat const kLicenseFontSize = 10.0f;
#pragma mark Colors
-static const NSInteger kLicenseTextColor = 0x565656;
-static const NSInteger kLicenseNameColor = 0x566893;
+static NSInteger const kLicenseTextColor = 0x565656;
+static NSInteger const kLicenseNameColor = 0x566893;
#pragma mark License URL
@@ -65,7 +65,7 @@
substitutionAttributes:@[substitutionStyle]];
}
--(void)updateLocalizedText {
+- (void)updateLocalizedText {
self.licenseLabel.attributedText = [self getAttributedStringForLicense];
}
diff --git a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
index b1e1e9f..8e09fa4 100644
--- a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
+++ b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
@@ -18,26 +18,26 @@
#pragma mark Font sizes
-static const CGFloat kGlyphButtonFontSize = 23.0f;
-static const CGFloat kOptionTextFontSize = 12.0f;
-static const CGFloat kOptionTextLineSpacing = 2.0f;
+static CGFloat const kGlyphButtonFontSize = 23.0f;
+static CGFloat const kOptionTextFontSize = 12.0f;
+static CGFloat const kOptionTextLineSpacing = 2.0f;
#pragma mark Colors
-static const NSInteger kBaseTextColor = 0x565656;
+static NSInteger const kBaseTextColor = 0x565656;
-static const NSInteger kLastModGlyphBackgroundColor = 0x565656;
-static const NSInteger kLastModGlyphForgroundColor = 0xffffff;
-static const NSInteger kLastModTimestampColor = 0x565656;
-static const NSInteger kLastModUsernameColor = 0x565656;
+static NSInteger const kLastModGlyphBackgroundColor = 0x565656;
+static NSInteger const kLastModGlyphForgroundColor = 0xffffff;
+static NSInteger const kLastModTimestampColor = 0x565656;
+static NSInteger const kLastModUsernameColor = 0x565656;
-static const NSInteger kLangGlyphBackgroundColor = 0x565656;
-static const NSInteger kLangGlyphForgroundColor = 0xffffff;
-static const NSInteger kLangCountColor = 0x565656;
+static NSInteger const kLangGlyphBackgroundColor = 0x565656;
+static NSInteger const kLangGlyphForgroundColor = 0xffffff;
+static NSInteger const kLangCountColor = 0x565656;
#pragma mark Glyph icon
-static const CGFloat kGlyphIconBaselineOffset = 1.6f;
+static CGFloat const kGlyphIconBaselineOffset = 1.6f;
#pragma mark Private properties
diff --git a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
index 495c436..7365ee7 100644
--- a/Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
+++ b/Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
@@ -35,7 +35,7 @@
[self adjustConstraintsScaleForViews:@[self.titleLabel,
self.optionsContainerView]];
}
--(void)updateLocalizedText{
+- (void)updateLocalizedText {
self.titleLabel.text =
MWCurrentArticleLanguageLocalizedString(@"article-read-more-title", @"Read
more");
}
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m
b/Wikipedia/View Controllers/WebView/WebViewController.m
index a7c2ede..538e05e 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -265,7 +265,7 @@
#pragma mark Scroll indicator
-static const CGFloat kScrollIndicatorMinYMargin = 4.0f;
+static CGFloat const kScrollIndicatorMinYMargin = 4.0f;
- (void)scrollIndicatorSetup {
self.scrollIndicatorView =
[[UIView alloc] init];
@@ -890,18 +890,18 @@
}];
/*
- [self.bridge addListener:@"disambigClicked" withBlock:^(NSString*
messageType, NSDictionary* payload) {
+ [self.bridge addListener:@"disambigClicked" withBlock:^(NSString*
messageType, NSDictionary* payload) {
//NSLog(@"disambigClicked: %@", payload);
- }];
+ }];
- [self.bridge addListener:@"issuesClicked" withBlock:^(NSString*
messageType, NSDictionary* payload) {
+ [self.bridge addListener:@"issuesClicked" withBlock:^(NSString*
messageType, NSDictionary* payload) {
//NSLog(@"issuesClicked: %@", payload);
- }];
- */
+ }];
+ */
UIMenuItem* shareSnippet = [[UIMenuItem alloc]
initWithTitle:MWLocalizedString(@"share-custom-menu-item", nil)
action:@selector(shareSnippet:)];
diff --git a/Wikipedia/View Controllers/WebView/WebViewController_Private.h
b/Wikipedia/View Controllers/WebView/WebViewController_Private.h
index 1bdd9c0..1956b00 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController_Private.h
+++ b/Wikipedia/View Controllers/WebView/WebViewController_Private.h
@@ -74,16 +74,16 @@
#define TOC_TOGGLE_ANIMATION_DURATION @0.225f
-static const CGFloat kScrollIndicatorLeftMargin = 2.0f;
-static const CGFloat kScrollIndicatorWidth = 2.5f;
-static const CGFloat kScrollIndicatorHeight = 25.0f;
-static const CGFloat kScrollIndicatorCornerRadius = 2.0f;
-static const CGFloat kScrollIndicatorBorderWidth = 1.0f;
-static const CGFloat kScrollIndicatorAlpha = 0.3f;
-static const NSInteger kScrollIndicatorBorderColor = 0x000000;
-static const NSInteger kScrollIndicatorBackgroundColor = 0x000000;
+static CGFloat const kScrollIndicatorLeftMargin = 2.0f;
+static CGFloat const kScrollIndicatorWidth = 2.5f;
+static CGFloat const kScrollIndicatorHeight = 25.0f;
+static CGFloat const kScrollIndicatorCornerRadius = 2.0f;
+static CGFloat const kScrollIndicatorBorderWidth = 1.0f;
+static CGFloat const kScrollIndicatorAlpha = 0.3f;
+static NSInteger const kScrollIndicatorBorderColor = 0x000000;
+static NSInteger const kScrollIndicatorBackgroundColor = 0x000000;
-static const CGFloat kBottomScrollSpacerHeight = 2000.0f;
+static CGFloat const kBottomScrollSpacerHeight = 2000.0f;
// This controls how fast the swipe has to be (side-to-side).
#define TOC_SWIPE_TRIGGER_MIN_X_VELOCITY 600.0f
@@ -93,7 +93,7 @@
// TODO: rename the WebViewControllerVariableNames once we rename this class
// Some dialects have complex characters, so we use 2 instead of 10
-static const int kMinimumTextSelectionLength = 2;
+static int const kMinimumTextSelectionLength = 2;
@interface WebViewController ()
{
diff --git a/Wikipedia/mw-utils/WikipediaAppUtils.m
b/Wikipedia/mw-utils/WikipediaAppUtils.m
index 0fb76d5..e0a6b12 100644
--- a/Wikipedia/mw-utils/WikipediaAppUtils.m
+++ b/Wikipedia/mw-utils/WikipediaAppUtils.m
@@ -58,12 +58,11 @@
];
}
-
+ (NSString*)currentArticleLanguageLocalizedString:(NSString*)key {
- MWKSite* site = [SessionSingleton sharedInstance].currentArticleSite;
+ MWKSite* site = [SessionSingleton
sharedInstance].currentArticleSite;
NSString* path = [[NSBundle mainBundle]
pathForResource:site.language ofType:@"lproj"];
NSBundle* languageBundle = [NSBundle bundleWithPath:path];
- NSString *translation = nil;
+ NSString* translation = nil;
if (languageBundle) {
translation = [languageBundle localizedStringForKey:key value:@""
table:nil];
}
--
To view, visit https://gerrit.wikimedia.org/r/206469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a6846a35f87dfd1c6679972016b487de5a32e70
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno <cfl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
