Brion VIBBER has submitted this change and it was merged.
Change subject: iOS 6 docs led us astray with NSTextAlignmentNatural. Fixed.
......................................................................
iOS 6 docs led us astray with NSTextAlignmentNatural. Fixed.
Change-Id: I211b30b65fb497fdc7b93e001cd9bbb6072525f5
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/PaddedLabel/PaddedLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Captcha/CaptchaViewController.m
M wikipedia/View Controllers/EditSummary/EditSummaryViewController.m
M wikipedia/View Controllers/History/HistoryViewController.m
M wikipedia/View Controllers/Languages/LanguagesCell.m
M wikipedia/View Controllers/Login/LoginViewController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuRowView.m
M wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
M wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M wikipedia/View Controllers/SearchResults/SearchResultCell.m
M wikipedia/mw-utils/WikipediaAppUtils.h
M wikipedia/mw-utils/WikipediaAppUtils.m
17 files changed, 60 insertions(+), 36 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index decc9aa..47da97e 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -212,16 +212,16 @@
0415581A18ADFA5C00B81A59 /* UIImage+ColorMask.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UIImage+ColorMask.h"; sourceTree = "<group>"; };
0415581B18ADFA5C00B81A59 /* UIImage+ColorMask.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "UIImage+ColorMask.m"; sourceTree = "<group>"; };
041A3B5818E11ED90079FF1C /* LanguagesCell.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
LanguagesCell.h; sourceTree = "<group>"; };
- 041A3B5918E11ED90079FF1C /* LanguagesCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= LanguagesCell.m; sourceTree = "<group>"; };
+ 041A3B5918E11ED90079FF1C /* LanguagesCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = LanguagesCell.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
041A3B5C18E11ED90079FF1C /* LanguagesViewController.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= LanguagesViewController.h; sourceTree = "<group>"; };
041A3B5D18E11ED90079FF1C /* LanguagesViewController.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = LanguagesViewController.m; sourceTree = "<group>"; };
041C55D01950B27D006CE0EF /* EditSummaryViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = EditSummaryViewController.h; sourceTree = "<group>"; };
- 041C55D11950B27D006CE0EF /* EditSummaryViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = EditSummaryViewController.m; sourceTree = "<group>";
};
+ 041C55D11950B27D006CE0EF /* EditSummaryViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = EditSummaryViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04272E781940EEBC00CC682F /* AssetsFile.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
AssetsFile.h; sourceTree = "<group>"; };
04272E791940EEBC00CC682F /* AssetsFile.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= AssetsFile.m; sourceTree = "<group>"; };
04272E7A1940EEBC00CC682F /* AssetsFileEnum.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
AssetsFileEnum.h; sourceTree = "<group>"; };
04292FEF185FBA70002A13FC /* SearchResultCell.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SearchResultCell.h; sourceTree = "<group>"; };
- 04292FF0185FBA70002A13FC /* SearchResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SearchResultCell.m; sourceTree = "<group>"; };
+ 04292FF0185FBA70002A13FC /* SearchResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = SearchResultCell.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04292FF1185FBA70002A13FC /* SearchResultPrototypeView.xib */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path =
SearchResultPrototypeView.xib; sourceTree = "<group>"; };
04292FF6185FBB0B002A13FC /* SearchResultsController.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= SearchResultsController.h; sourceTree = "<group>"; };
04292FF7185FBB0B002A13FC /* SearchResultsController.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = SearchResultsController.m; sourceTree = "<group>"; };
@@ -231,7 +231,7 @@
0429300318604898002A13FC /* SavedPagesResultCell.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SavedPagesResultCell.h; sourceTree = "<group>"; };
0429300418604898002A13FC /* SavedPagesResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SavedPagesResultCell.m; sourceTree = "<group>"; };
0429300818604898002A13FC /* SavedPagesViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = SavedPagesViewController.h; sourceTree = "<group>"; };
- 0429300918604898002A13FC /* SavedPagesViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SavedPagesViewController.m; sourceTree = "<group>"; };
+ 0429300918604898002A13FC /* SavedPagesViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = SavedPagesViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
042A5B1F19253D2A0095E172 /* CenterNavController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
CenterNavController.h; sourceTree = "<group>"; };
042A5B2019253D2A0095E172 /* CenterNavController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= CenterNavController.m; sourceTree = "<group>"; };
042A5B2719253E570095E172 /* TopMenuViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
TopMenuViewController.h; sourceTree = "<group>"; };
@@ -265,7 +265,7 @@
04478621185145090050563B /* HistoryResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= HistoryResultCell.m; sourceTree = "<group>"; };
04478622185145090050563B /* HistoryResultPrototypeView.xib */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path =
HistoryResultPrototypeView.xib; sourceTree = "<group>"; };
04478623185145090050563B /* HistoryViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
HistoryViewController.h; sourceTree = "<group>"; };
- 04478624185145090050563B /* HistoryViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= HistoryViewController.m; sourceTree = "<group>"; };
+ 04478624185145090050563B /* HistoryViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = HistoryViewController.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
0447862D185145090050563B /* WebViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WebViewController.h; sourceTree = "<group>"; };
0447862E185145090050563B /* WebViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WebViewController.m; sourceTree = "<group>"; };
0447866D1852B5010050563B /* SessionSingleton.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SessionSingleton.h; sourceTree = "<group>"; };
@@ -274,7 +274,7 @@
0447867A1852BBFE0050563B /*
NSManagedObjectContext+SimpleFetch.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; path =
"NSManagedObjectContext+SimpleFetch.h"; sourceTree = "<group>"; };
0447867B1852BBFE0050563B /*
NSManagedObjectContext+SimpleFetch.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path =
"NSManagedObjectContext+SimpleFetch.m"; sourceTree = "<group>"; };
0449E63318A9845C00D51524 /* LoginViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
LoginViewController.h; sourceTree = "<group>"; };
- 0449E63418A9845C00D51524 /* LoginViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= LoginViewController.m; sourceTree = "<group>"; };
+ 0449E63418A9845C00D51524 /* LoginViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = LoginViewController.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
0449E63718AAA26A00D51524 /* NSHTTPCookieStorage+CloneCookie.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = "NSHTTPCookieStorage+CloneCookie.h"; sourceTree =
"<group>"; };
0449E63818AAA26A00D51524 /* NSHTTPCookieStorage+CloneCookie.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = "NSHTTPCookieStorage+CloneCookie.m"; sourceTree =
"<group>"; };
044BD6A01883302C00FFE4BE /* Image.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
Image.h; sourceTree = "<group>"; };
@@ -323,7 +323,7 @@
047FF5451889078C009DB293 /* Image+Convenience.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"Image+Convenience.h"; sourceTree = "<group>"; };
047FF5461889078C009DB293 /* Image+Convenience.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "Image+Convenience.m"; sourceTree = "<group>"; };
048A26751906268100395F53 /* PaddedLabel.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
PaddedLabel.h; sourceTree = "<group>"; };
- 048A26761906268100395F53 /* PaddedLabel.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PaddedLabel.m; sourceTree = "<group>"; };
+ 048A26761906268100395F53 /* PaddedLabel.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = PaddedLabel.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
0493C2CA1952373100EBB973 /* CoreDataHousekeeping.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
CoreDataHousekeeping.h; sourceTree = "<group>"; };
0493C2CB1952373100EBB973 /* CoreDataHousekeeping.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= CoreDataHousekeeping.m; sourceTree = "<group>"; };
0493C2D219525F8E00EBB973 /* WikiGlyph_Chars_iOS.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WikiGlyph_Chars_iOS.h; sourceTree = "<group>"; };
@@ -342,7 +342,7 @@
04A81E8418871EB000EEBADB /* Section+ImageRecords.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"Section+ImageRecords.h"; sourceTree = "<group>"; };
04A81E8518871EB000EEBADB /* Section+ImageRecords.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "Section+ImageRecords.m"; sourceTree = "<group>"; };
04A97E8518B81D5D0046B166 /* AccountCreationViewController.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = AccountCreationViewController.h; sourceTree = "<group>";
};
- 04A97E8618B81D5D0046B166 /* AccountCreationViewController.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = AccountCreationViewController.m; sourceTree =
"<group>"; };
+ 04A97E8618B81D5D0046B166 /* AccountCreationViewController.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = AccountCreationViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04AE1C6E1891B302002D5487 /* NSObject+Extras.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"NSObject+Extras.h"; sourceTree = "<group>"; };
04AE1C6F1891B302002D5487 /* NSObject+Extras.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "NSObject+Extras.m"; sourceTree = "<group>"; };
04B0EA43190AFDD8007458AF /* ArticleImporter.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ArticleImporter.h; sourceTree = "<group>"; };
@@ -361,7 +361,7 @@
04B78A5118A580AF0050EBF5 /* LoginOp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
LoginOp.h; sourceTree = "<group>"; };
04B78A5218A580AF0050EBF5 /* LoginOp.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= LoginOp.m; sourceTree = "<group>"; };
04B7B9BB18B5570E00A63551 /* CaptchaViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
CaptchaViewController.h; sourceTree = "<group>"; };
- 04B7B9BC18B5570E00A63551 /* CaptchaViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= CaptchaViewController.m; sourceTree = "<group>"; };
+ 04B7B9BC18B5570E00A63551 /* CaptchaViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = CaptchaViewController.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04B91AA518E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = "UIView+TemporaryAnimatedXF.h"; sourceTree = "<group>"; };
04B91AA618E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = "UIView+TemporaryAnimatedXF.m"; sourceTree =
"<group>"; };
04B91AA918E3D9E200FFAA1C /*
NSString+FormattedAttributedString.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; path =
"NSString+FormattedAttributedString.h"; sourceTree = "<group>"; };
@@ -404,7 +404,7 @@
04CCCFEC1935093A00E3F60C /* SecondaryMenuViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = SecondaryMenuViewController.h; sourceTree = "<group>"; };
04CCCFED1935093A00E3F60C /* SecondaryMenuViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SecondaryMenuViewController.m; sourceTree =
"<group>"; };
04CCCFF21935094000E3F60C /* PrimaryMenuViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = PrimaryMenuViewController.h; sourceTree = "<group>"; };
- 04CCCFF31935094000E3F60C /* PrimaryMenuViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PrimaryMenuViewController.m; sourceTree = "<group>";
};
+ 04CCCFF31935094000E3F60C /* PrimaryMenuViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = PrimaryMenuViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04CCCFF41935094000E3F60C /* PrimaryMenuTableViewCell.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = PrimaryMenuTableViewCell.h; sourceTree = "<group>"; };
04CCCFF51935094000E3F60C /* PrimaryMenuTableViewCell.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PrimaryMenuTableViewCell.m; sourceTree = "<group>"; };
04CFA11E194900D50088269A /* TopMenuTextFieldContainer.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = TopMenuTextFieldContainer.h; sourceTree = "<group>"; };
@@ -447,17 +447,17 @@
04DB0BE818BD37F900B4BCF3 /*
UIScrollView+ScrollSubviewToLocation.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UIScrollView+ScrollSubviewToLocation.h"; sourceTree = "<group>"; };
04DB0BE918BD37F900B4BCF3 /*
UIScrollView+ScrollSubviewToLocation.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path =
"UIScrollView+ScrollSubviewToLocation.m"; sourceTree = "<group>"; };
04DD89AF18BFE63A00DD5DAD /* PreviewAndSaveViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = PreviewAndSaveViewController.h; sourceTree = "<group>"; };
- 04DD89B018BFE63A00DD5DAD /* PreviewAndSaveViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PreviewAndSaveViewController.m; sourceTree =
"<group>"; };
+ 04DD89B018BFE63A00DD5DAD /* PreviewAndSaveViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = PreviewAndSaveViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04E9A78218F73C7200F7ECF7 /* www */ = {isa = PBXFileReference;
lastKnownFileType = folder; path = www; sourceTree = "<group>"; };
04F0E2E8186EDC1A00468738 /* UIWebView+ElementLocation.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = "UIWebView+ElementLocation.h"; sourceTree = "<group>"; };
04F0E2E9186EDC1A00468738 /* UIWebView+ElementLocation.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = "UIWebView+ElementLocation.m"; sourceTree =
"<group>"; };
04F0E2EC186FB2D000468738 /* TOCSectionCellView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
TOCSectionCellView.h; sourceTree = "<group>"; };
04F0E2ED186FB2D100468738 /* TOCSectionCellView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= TOCSectionCellView.m; sourceTree = "<group>"; };
04F27B6E18FE0F2E00EDD838 /* PageHistoryResultCell.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
PageHistoryResultCell.h; sourceTree = "<group>"; };
- 04F27B6F18FE0F2E00EDD838 /* PageHistoryResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PageHistoryResultCell.m; sourceTree = "<group>"; };
+ 04F27B6F18FE0F2E00EDD838 /* PageHistoryResultCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = PageHistoryResultCell.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04F27B7018FE0F2E00EDD838 /* PageHistoryResultPrototypeView.xib
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib;
path = PageHistoryResultPrototypeView.xib; sourceTree = "<group>"; };
04F27B7318FE0F2E00EDD838 /* PageHistoryViewController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = PageHistoryViewController.h; sourceTree = "<group>"; };
- 04F27B7418FE0F2E00EDD838 /* PageHistoryViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PageHistoryViewController.m; sourceTree = "<group>";
};
+ 04F27B7418FE0F2E00EDD838 /* PageHistoryViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = PageHistoryViewController.m;
sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
04F27B7918FE19B700EDD838 /* PageHistoryOp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
PageHistoryOp.h; sourceTree = "<group>"; };
04F27B7A18FE19B700EDD838 /* PageHistoryOp.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PageHistoryOp.m; sourceTree = "<group>"; };
04F3958E186CF80100B0D6FC /* TOCViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
TOCViewController.h; sourceTree = "<group>"; };
diff --git a/wikipedia/PaddedLabel/PaddedLabel.m
b/wikipedia/PaddedLabel/PaddedLabel.m
index 8550151..88da57b 100644
--- a/wikipedia/PaddedLabel/PaddedLabel.m
+++ b/wikipedia/PaddedLabel/PaddedLabel.m
@@ -2,13 +2,14 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "PaddedLabel.h"
+#import "WikipediaAppUtils.h"
@implementation PaddedLabel
-(void)setup
{
self.padding = UIEdgeInsetsZero;
- if(self.textAlignment == NSTextAlignmentLeft) self.textAlignment =
NSTextAlignmentNatural;
+ if(self.textAlignment == NSTextAlignmentLeft) self.textAlignment =
[WikipediaAppUtils rtlSafeAlignment];
}
- (instancetype)initWithCoder:(NSCoder *)coder
diff --git a/wikipedia/View
Controllers/AccountCreation/AccountCreationViewController.m b/wikipedia/View
Controllers/AccountCreation/AccountCreationViewController.m
index faa31e4..708d94a 100644
--- a/wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
+++ b/wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
@@ -147,10 +147,10 @@
((MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_NEXT]).color = WMF_COLOR_GREEN;
((MenuButton *)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_DONE]).color = WMF_COLOR_GREEN;
- self.usernameField.textAlignment = NSTextAlignmentNatural;
- self.passwordField.textAlignment = NSTextAlignmentNatural;
- self.passwordRepeatField.textAlignment = NSTextAlignmentNatural;
- self.emailField.textAlignment = NSTextAlignmentNatural;
+ self.usernameField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.passwordField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.passwordRepeatField.textAlignment = [WikipediaAppUtils
rtlSafeAlignment];
+ self.emailField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
}
- (void)loginButtonPushed:(id)sender
diff --git a/wikipedia/View Controllers/Captcha/CaptchaViewController.m
b/wikipedia/View Controllers/Captcha/CaptchaViewController.m
index 39138f8..7360814 100644
--- a/wikipedia/View Controllers/Captcha/CaptchaViewController.m
+++ b/wikipedia/View Controllers/Captcha/CaptchaViewController.m
@@ -2,6 +2,7 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "CaptchaViewController.h"
+#import "WikipediaAppUtils.h"
@interface CaptchaViewController ()
@@ -24,7 +25,7 @@
[self.reloadCaptchaButton setTitleColor:[UIColor darkGrayColor]
forState:UIControlStateDisabled];
[self.reloadCaptchaButton setTitleColor:[UIColor darkGrayColor]
forState:UIControlStateNormal];
- self.captchaTextBox.textAlignment = NSTextAlignmentNatural;
+ self.captchaTextBox.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
}
- (void)reloadCaptchaPushed:(id)sender
diff --git a/wikipedia/View Controllers/EditSummary/EditSummaryViewController.m
b/wikipedia/View Controllers/EditSummary/EditSummaryViewController.m
index ccbd769..eea84a3 100644
--- a/wikipedia/View Controllers/EditSummary/EditSummaryViewController.m
+++ b/wikipedia/View Controllers/EditSummary/EditSummaryViewController.m
@@ -37,12 +37,12 @@
// Do any additional setup after loading the view.
self.placeholderLabel.text =
MWLocalizedString(@"edit-summary-field-placeholder-text", nil);
- self.placeholderLabel.textAlignment = NSTextAlignmentNatural;
+ self.placeholderLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
self.summaryTextField.textColor = [UIColor darkGrayColor];
self.summaryTextField.returnKeyType = UIReturnKeyDone;
self.summaryTextField.delegate = self;
- self.summaryTextField.textAlignment = NSTextAlignmentNatural;
+ self.summaryTextField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
self.bottomLineHeightConstraint.constant = 1.0f / [UIScreen
mainScreen].scale;
}
diff --git a/wikipedia/View Controllers/History/HistoryViewController.m
b/wikipedia/View Controllers/History/HistoryViewController.m
index dd81312..18e0670 100644
--- a/wikipedia/View Controllers/History/HistoryViewController.m
+++ b/wikipedia/View Controllers/History/HistoryViewController.m
@@ -342,7 +342,7 @@
NSString *language = [NSString stringWithFormat:@"\n%@",
historyEntry.article.domainName];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]
init];
- paragraphStyle.alignment = NSTextAlignmentNatural;
+ paragraphStyle.alignment = [WikipediaAppUtils rtlSafeAlignment];
NSMutableAttributedString *(^styleText)(NSString *, CGFloat, UIColor *) =
^NSMutableAttributedString *(NSString *str, CGFloat size, UIColor *color){
return [[NSMutableAttributedString alloc] initWithString:str
attributes: @{
diff --git a/wikipedia/View Controllers/Languages/LanguagesCell.m
b/wikipedia/View Controllers/Languages/LanguagesCell.m
index 4fb623b..a8e6629 100644
--- a/wikipedia/View Controllers/Languages/LanguagesCell.m
+++ b/wikipedia/View Controllers/Languages/LanguagesCell.m
@@ -2,6 +2,7 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "LanguagesCell.h"
+#import "WikipediaAppUtils.h"
#define BACKGROUND_COLOR [UIColor colorWithWhite:1.0f alpha:1.0f]
@@ -29,8 +30,8 @@
//self.textLabel.layer.borderWidth = 1;
//self.textLabel.layer.borderColor = [UIColor redColor].CGColor;
self.backgroundColor = BACKGROUND_COLOR;
- self.textLabel.textAlignment = NSTextAlignmentNatural;
- self.canonicalLabel.textAlignment = NSTextAlignmentNatural;}
+ self.textLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.canonicalLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated
{
diff --git a/wikipedia/View Controllers/Login/LoginViewController.m
b/wikipedia/View Controllers/Login/LoginViewController.m
index 13703d7..f6347c7 100644
--- a/wikipedia/View Controllers/Login/LoginViewController.m
+++ b/wikipedia/View Controllers/Login/LoginViewController.m
@@ -102,8 +102,8 @@
*/
self.titleLabel.text = MWLocalizedString(@"navbar-title-mode-login", nil);
- self.usernameField.textAlignment = NSTextAlignmentNatural;
- self.passwordField.textAlignment = NSTextAlignmentNatural;
+ self.usernameField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.passwordField.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
}
-(NSAttributedString *)getAttributedPlaceholderForString:(NSString *)string
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index 3d124dd..9d7d08a 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -73,7 +73,7 @@
baselineOffset: 2.0
];
- self.moreButton.label.textAlignment = NSTextAlignmentNatural;
+ self.moreButton.label.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
self.moreButton.label.padding = UIEdgeInsetsMake(0, 12, 0, 12);
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuRowView.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuRowView.m
index 16a5793..b7e2f20 100644
--- a/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuRowView.m
+++ b/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuRowView.m
@@ -5,6 +5,7 @@
#import "PaddedLabel.h"
#import "Defines.h"
#import "SessionSingleton.h"
+#import "WikipediaAppUtils.h"
#define MENU_HEADING_FONT_SIZE 13
#define MENU_SUB_TITLE_TEXT_COLOR [UIColor colorWithWhite:0.5f alpha:1.0f]
@@ -39,6 +40,10 @@
{
[super awakeFromNib];
self.insetTopBorderView.backgroundColor = BORDER_COLOR;
+
+ BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
+
+ self.iconLabel.textAlignment = isRTL ? NSTextAlignmentLeft :
NSTextAlignmentRight;
}
- (void)drawRect:(CGRect)rect
diff --git a/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
b/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
index 5abb2d9..7fc2a26 100644
--- a/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
+++ b/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
@@ -2,6 +2,7 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "PageHistoryResultCell.h"
+#import "WikipediaAppUtils.h"
@implementation PageHistoryResultCell
@@ -27,11 +28,11 @@
self.separatorHeightConstraint.constant = 1.0f / [UIScreen
mainScreen].scale;
- self.summaryLabel.textAlignment = NSTextAlignmentNatural;
- self.nameLabel.textAlignment = NSTextAlignmentNatural;
- self.timeLabel.textAlignment = NSTextAlignmentNatural;
- self.deltaLabel.textAlignment = NSTextAlignmentNatural;
- self.iconLabel.textAlignment = NSTextAlignmentNatural;
+ self.summaryLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.nameLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.timeLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.deltaLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.iconLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
}
-(void)prepareForReuse
diff --git a/wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
b/wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
index cb01699..d8212e4 100644
--- a/wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
+++ b/wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
@@ -240,7 +240,7 @@
label.autoresizingMask = UIViewAutoresizingFlexibleWidth |
UIViewAutoresizingFlexibleHeight;
label.backgroundColor = [UIColor clearColor];
- label.textAlignment = NSTextAlignmentNatural;
+ label.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
NSDictionary *sectionDict = self.pageHistoryDataArray[section];
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 79f0860..ff72324 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -289,7 +289,7 @@
self.aboutLabel.lineBreakMode = NSLineBreakByWordWrapping;
self.aboutLabel.translatesAutoresizingMaskIntoConstraints = NO;
self.aboutLabel.text = MWLocalizedString(@"edit-summary-title", nil);
- self.aboutLabel.textAlignment = NSTextAlignmentNatural;
+ self.aboutLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
[self.editSummaryContainer addSubview:self.aboutLabel];
}
diff --git a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
index 0e50718..a68681d 100644
--- a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
+++ b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
@@ -200,7 +200,7 @@
NSString *language = [NSString stringWithFormat:@"\n%@",
savedEntry.article.domainName];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]
init];
- paragraphStyle.alignment = NSTextAlignmentNatural;
+ paragraphStyle.alignment = [WikipediaAppUtils rtlSafeAlignment];
NSMutableAttributedString *(^styleText)(NSString *, CGFloat, UIColor *) =
^NSMutableAttributedString *(NSString *str, CGFloat size, UIColor *color){
return [[NSMutableAttributedString alloc] initWithString:str
attributes: @{
diff --git a/wikipedia/View Controllers/SearchResults/SearchResultCell.m
b/wikipedia/View Controllers/SearchResults/SearchResultCell.m
index 717e0bb..2efb5e7 100644
--- a/wikipedia/View Controllers/SearchResults/SearchResultCell.m
+++ b/wikipedia/View Controllers/SearchResults/SearchResultCell.m
@@ -2,6 +2,7 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "SearchResultCell.h"
+#import "WikipediaAppUtils.h"
@implementation SearchResultCell
@@ -60,7 +61,7 @@
//self.textLabel.layer.borderColor = [UIColor redColor].CGColor;
//self.backgroundColor = [UIColor greenColor];
- self.textLabel.textAlignment = NSTextAlignmentNatural;
+ self.textLabel.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
}
-(void)prepareForReuse
diff --git a/wikipedia/mw-utils/WikipediaAppUtils.h
b/wikipedia/mw-utils/WikipediaAppUtils.h
index 7cee452..9dfa504 100644
--- a/wikipedia/mw-utils/WikipediaAppUtils.h
+++ b/wikipedia/mw-utils/WikipediaAppUtils.h
@@ -17,6 +17,8 @@
+(NSString*) wikiLangForSystemLang:(NSString *)code;
+(BOOL) isDeviceLanguageRTL;
++(NSTextAlignment) rtlSafeAlignment;
+
+(void)copyAssetsFolderToAppDataDocuments;
@end
diff --git a/wikipedia/mw-utils/WikipediaAppUtils.m
b/wikipedia/mw-utils/WikipediaAppUtils.m
index f5d75b0..aefc205 100644
--- a/wikipedia/mw-utils/WikipediaAppUtils.m
+++ b/wikipedia/mw-utils/WikipediaAppUtils.m
@@ -214,4 +214,16 @@
return ([NSLocale characterDirectionForLanguage:[[NSLocale
preferredLanguages] objectAtIndex:0]] == NSLocaleLanguageDirectionRightToLeft);
}
++(NSTextAlignment)rtlSafeAlignment
+{
+ // The apple docs say NSTextAlignmentNatural is supported in iOS 6. Lies!
Only true for
+ // attributed strings :(
+ if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_6_1) {
+ return NSTextAlignmentNatural;
+ }else{
+ BOOL isRTL = [self isDeviceLanguageRTL];
+ return isRTL ? NSTextAlignmentRight : NSTextAlignmentLeft;
+ }
+}
+
@end
--
To view, visit https://gerrit.wikimedia.org/r/146303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I211b30b65fb497fdc7b93e001cd9bbb6072525f5
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
