[MediaWiki-commits] [Gerrit] Fix RTL appearance of new ToC icons - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has submitted this change and it was merged.

Change subject: Fix RTL appearance of new ToC icons
......................................................................


Fix RTL appearance of new ToC icons

We had initially resolved the arrow-direction issue on RTL here by
swapping the two glyphs, but this put the arrow on the wrong side
of the greeked text representation in the icon.

Flipping it with a transform *seems* to work fine.
Tested in 6.1, 7.1, and 8.0.

Bug: 70491
Change-Id: Id63bf72ee5a09704f994102b19ea265dd89718a1
---
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
2 files changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Mhurd: Verified; Looks good to me, approved



diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m 
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
index fd87735..22fc1fc 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
@@ -242,18 +242,21 @@
 
     BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
     NSString *caret = !isRTL ? WIKIGLYPH_CARET_LEFT: IOS_WIKIGLYPH_FORWARD;
-    NSString *toc = !isRTL ? IOS_WIKIGLYPH_TOC_COLLAPSED: 
IOS_WIKIGLYPH_TOC_EXPANDED;
 
     self.buttonX =          getWikiGlyphButton(WIKIGLYPH_X,           
MWLocalizedString(@"menu-close-accessibility-label", nil),   NAVBAR_BUTTON_X, 
size);
     self.buttonEye =        getWikiGlyphButton(WIKIGLYPH_EYE,         
MWLocalizedString(@"menu-preview-accessibility-label", nil), NAVBAR_BUTTON_EYE, 
size);
     self.buttonArrowLeft =  getWikiGlyphButton(caret,                 
MWLocalizedString(@"menu-back-accessibility-label", nil),    
NAVBAR_BUTTON_ARROW_LEFT, size);
     self.buttonArrowRight = getWikiGlyphButton(caret,                 
MWLocalizedString(@"menu-forward-accessibility-label", nil), 
NAVBAR_BUTTON_ARROW_RIGHT, size);
     self.buttonW =          getWikiGlyphButton(IOS_WIKIGLYPH_W,       
MWLocalizedString(@"menu-w-accessibility-label", nil),       
NAVBAR_BUTTON_LOGO_W, size);
-    self.buttonTOC =        getWikiGlyphButton(toc,                   
MWLocalizedString(@"menu-toc-accessibility-label", nil),     NAVBAR_BUTTON_TOC, 
size);
+    self.buttonTOC =        getWikiGlyphButton(IOS_WIKIGLYPH_TOC_COLLAPSED, 
MWLocalizedString(@"menu-toc-accessibility-label", nil),     NAVBAR_BUTTON_TOC, 
size);
     self.buttonMagnify =    getWikiGlyphButton(IOS_WIKIGLYPH_MAGNIFY, 
MWLocalizedString(@"menu-search-accessibility-label", nil),  
NAVBAR_BUTTON_MAGNIFY, size);
     self.buttonBlank =      getWikiGlyphButton(@"",                   @"", 
NAVBAR_BUTTON_BLANK, size);
     self.buttonCancel =     getWikiGlyphButton(@"",                   
MWLocalizedString(@"menu-cancel-accessibility-label", nil),  
NAVBAR_BUTTON_CANCEL, size);
     self.buttonTrash =      getWikiGlyphButton(WIKIGLYPH_TRASH,       
MWLocalizedString(@"menu-trash-accessibility-label", nil),   
NAVBAR_BUTTON_TRASH, size);
+    
+    if (isRTL) {
+        self.buttonTOC.transform = 
CGAffineTransformScale(CGAffineTransformIdentity, -1.0, 1.0);
+    }
 
     self.buttonCancel.label.font = [UIFont systemFontOfSize:17.0];
     self.buttonCancel.label.text = MWLocalizedString(@"search-cancel", nil);
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m 
b/wikipedia/View Controllers/WebView/WebViewController.m
index bb2ef1c..a4ac2dc 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -566,10 +566,8 @@
                              self.unsafeToToggleTOC = NO;
                              self.webView.scrollView.contentOffset = 
origScrollPosition;
                              
-                             BOOL isRTL = [WikipediaAppUtils 
isDeviceLanguageRTL];
-
                              WikiGlyphButton *tocButton = 
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
-                             [tocButton.label setWikiText: (isRTL ? 
IOS_WIKIGLYPH_TOC_EXPANDED: IOS_WIKIGLYPH_TOC_COLLAPSED)
+                             [tocButton.label setWikiText: 
IOS_WIKIGLYPH_TOC_COLLAPSED
                                                     color: 
tocButton.label.color
                                                      size: tocButton.label.size
                                            baselineOffset: 
tocButton.label.baselineOffset];
@@ -625,10 +623,8 @@
                          }completion: ^(BOOL done){
                              self.unsafeToToggleTOC = NO;
                              
-                             BOOL isRTL = [WikipediaAppUtils 
isDeviceLanguageRTL];
-
                              WikiGlyphButton *tocButton = 
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
-                             [tocButton.label setWikiText: (isRTL ? 
IOS_WIKIGLYPH_TOC_COLLAPSED: IOS_WIKIGLYPH_TOC_EXPANDED)
+                             [tocButton.label setWikiText: 
IOS_WIKIGLYPH_TOC_EXPANDED
                                                     color: 
tocButton.label.color
                                                      size: tocButton.label.size
                                            baselineOffset: 
tocButton.label.baselineOffset];

-- 
To view, visit https://gerrit.wikimedia.org/r/160081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id63bf72ee5a09704f994102b19ea265dd89718a1
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits