Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163670
Change subject: Turn ... button into a "More..." button
......................................................................
Turn ... button into a "More..." button
Note I didn't all-caps the string as in the design,
as the translators HATE it when we all-caps things.
Change-Id: Ic977f508d3f170195a1544715b7f0d0f64349046
---
M wikipedia/Base.lproj/Main_iPhone.storyboard
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
4 files changed, 21 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/70/163670/1
diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard
b/wikipedia/Base.lproj/Main_iPhone.storyboard
index 0856e7d..c1a1320 100644
--- a/wikipedia/Base.lproj/Main_iPhone.storyboard
+++ b/wikipedia/Base.lproj/Main_iPhone.storyboard
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version="3.0" toolsVersion="6245" systemVersion="13E28"
targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"
initialViewController="1qV-3k-dN1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version="3.0" toolsVersion="6245" systemVersion="13F34"
targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"
initialViewController="1qV-3k-dN1">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<development version="5100" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="6238"/>
<capability name="Alignment constraints with different attributes"
minToolsVersion="5.1"/>
+ <capability name="Constraints to layout margins"
minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--Languages View Controller-->
@@ -919,7 +920,7 @@
<view contentMode="scaleToFill"
translatesAutoresizingMaskIntoConstraints="NO" id="z4O-h7-mfv">
<rect key="frame" x="0.0" y="0.0" width="320"
height="568"/>
<subviews>
- <view contentMode="scaleToFill"
translatesAutoresizingMaskIntoConstraints="NO" id="m9e-S5-3FD" userLabel="Empty
marker">
+ <view contentMode="scaleToFill"
misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m9e-S5-3FD"
userLabel="Empty marker">
<rect key="frame" x="0.0" y="165"
width="320" height="238"/>
<subviews>
<imageView
userInteractionEnabled="NO" contentMode="scaleToFill"
horizontalHuggingPriority="251" verticalHuggingPriority="251"
image="SavedPagesEmpty" translatesAutoresizingMaskIntoConstraints="NO"
id="Nki-Th-pdU">
@@ -1237,7 +1238,7 @@
<view contentMode="scaleToFill"
translatesAutoresizingMaskIntoConstraints="NO" id="HLl-qz-Bgx">
<rect key="frame" x="0.0" y="0.0" width="320"
height="568"/>
<subviews>
- <view contentMode="scaleToFill"
translatesAutoresizingMaskIntoConstraints="NO" id="Yc2-71-IOD" userLabel="Empty
marker">
+ <view contentMode="scaleToFill"
misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yc2-71-IOD"
userLabel="Empty marker">
<rect key="frame" x="0.0" y="200"
width="320" height="168"/>
<subviews>
<imageView
userInteractionEnabled="NO" contentMode="scaleToFill"
horizontalHuggingPriority="251" verticalHuggingPriority="251"
image="RecentPagesEmpty" translatesAutoresizingMaskIntoConstraints="NO"
id="o1U-9i-KeG">
@@ -1518,7 +1519,7 @@
<rect key="frame" x="0.0" y="0.0" width="320"
height="568"/>
<autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
- <tableView opaque="NO"
clearsContextBeforeDrawing="NO" contentMode="scaleToFill"
alwaysBounceVertical="YES" dataMode="prototypes" style="plain"
separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44"
sectionHeaderHeight="22" sectionFooterHeight="22"
translatesAutoresizingMaskIntoConstraints="NO" id="k1z-U9-PgQ">
+ <tableView opaque="NO"
clearsContextBeforeDrawing="NO" contentMode="scaleToFill" ambiguous="YES"
misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain"
separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44"
sectionHeaderHeight="22" sectionFooterHeight="22"
translatesAutoresizingMaskIntoConstraints="NO" id="k1z-U9-PgQ">
<rect key="frame" x="15" y="0.0" width="290"
height="518"/>
<color key="backgroundColor" white="0.0"
alpha="0.0" colorSpace="calibratedWhite"/>
<color key="sectionIndexBackgroundColor"
white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1558,23 +1559,21 @@
<outlet property="delegate"
destination="kv0-ra-y1C" id="eFw-8y-9Cu"/>
</connections>
</tableView>
- <view opaque="NO" clearsContextBeforeDrawing="NO"
contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO"
id="724-e2-4qa" userLabel="More Button" customClass="WikiGlyphButton">
- <rect key="frame" x="0.0" y="518" width="320"
height="50"/>
- <color key="backgroundColor" white="0.0"
alpha="0.0" colorSpace="calibratedWhite"/>
+ <view opaque="NO" clearsContextBeforeDrawing="NO"
contentMode="scaleToFill" ambiguous="YES" misplaced="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="724-e2-4qa" userLabel="More
Button" customClass="PaddedLabel">
+ <rect key="frame" x="22" y="518" width="72"
height="30"/>
+ <color key="backgroundColor"
white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstAttribute="height"
constant="50" id="KaQ-m0-QVN"/>
+ <constraint firstAttribute="height"
constant="30" id="Fbq-wn-sKi"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1"
colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstAttribute="trailing"
secondItem="724-e2-4qa" secondAttribute="trailing" id="14C-e5-SFb"/>
- <constraint firstItem="724-e2-4qa"
firstAttribute="leading" secondItem="T6V-mj-ox6" secondAttribute="leading"
id="4cd-5z-eqF"/>
+ <constraint firstItem="ms6-Ce-U0I"
firstAttribute="top" secondItem="724-e2-4qa" secondAttribute="bottom"
constant="20" id="A97-jb-dun"/>
<constraint firstAttribute="trailing"
secondItem="k1z-U9-PgQ" secondAttribute="trailing" constant="15"
id="Hj4-yb-Ji3"/>
- <constraint firstItem="ms6-Ce-U0I"
firstAttribute="top" secondItem="724-e2-4qa" secondAttribute="bottom"
id="OA3-4T-ZFO"/>
+ <constraint firstItem="724-e2-4qa"
firstAttribute="leading" secondItem="T6V-mj-ox6"
secondAttribute="leadingMargin" constant="6" id="hjd-3N-YVV"/>
<constraint firstItem="k1z-U9-PgQ"
firstAttribute="leading" secondItem="T6V-mj-ox6" secondAttribute="leading"
constant="15" id="riH-wG-jgQ"/>
<constraint firstItem="k1z-U9-PgQ"
firstAttribute="top" secondItem="l0x-rC-7XB" secondAttribute="bottom"
id="uju-5f-pRC"/>
- <constraint firstItem="724-e2-4qa"
firstAttribute="top" secondItem="k1z-U9-PgQ" secondAttribute="bottom"
id="vOo-ZB-1q5"/>
</constraints>
</view>
<connections>
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index 75b87a6..d802d65 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -36,7 +36,7 @@
@interface PrimaryMenuViewController ()
-@property (weak, nonatomic) IBOutlet WikiGlyphButton *moreButton;
+@property (weak, nonatomic) IBOutlet PaddedLabel *moreButton;
@property (weak, nonatomic) IBOutlet UITableView *tableView;
@@ -69,17 +69,15 @@
//[self setupTableData];
//[self randomizeTitles];
- [self.moreButton.label setWikiText: WIKIGLYPH_ELLIPSIS
- color: [UIColor darkGrayColor]
- size: 64
- baselineOffset: 2.0
- ];
- self.moreButton.accessibilityLabel =
MWLocalizedString(@"menu-more-accessibility-label", nil);
+ self.moreButton.text = MWLocalizedString(@"menu-more-label", nil);
- self.moreButton.label.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
+ self.moreButton.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
- self.moreButton.label.padding = UIEdgeInsetsMake(0, 12, 0, 12);
-
+ self.moreButton.padding = UIEdgeInsetsMake(0, 12, 0, 12);
+
+ self.moreButton.textColor = [UIColor colorWithWhite:1.0f alpha:1.0f];
+ self.moreButton.backgroundColor = [UIColor colorWithWhite:1.0f
alpha:0.25f];
+
[self addTableHeaderView];
[self.moreButton addGestureRecognizer:[[UITapGestureRecognizer alloc]
initWithTarget:self action:@selector(moreButtonTapped:)]];
diff --git a/wikipedia/en.lproj/Localizable.strings
b/wikipedia/en.lproj/Localizable.strings
index 47128b4..614ce38 100644
--- a/wikipedia/en.lproj/Localizable.strings
+++ b/wikipedia/en.lproj/Localizable.strings
@@ -109,6 +109,7 @@
"main-menu-heading-legal" = "Mumbo jumbo";
"main-menu-show-today" = "Today";
"main-menu-nearby" = "Nearby";
+"menu-more-label" = "More...";
"saved-pages-title" = "Saved pages";
"saved-pages-clear-confirmation-heading" = "Delete all saved items?";
@@ -216,7 +217,6 @@
"menu-search-accessibility-label" = "Search";
"menu-cancel-accessibility-label" = "Cancel";
"menu-share-accessibility-label" = "Share";
-"menu-more-accessibility-label" = "More settings";
"menu-trash-accessibility-label" = "Delete";
"nearby-title" = "Nearby";
diff --git a/wikipedia/qqq.lproj/Localizable.strings
b/wikipedia/qqq.lproj/Localizable.strings
index 311ce6a..556cfd0 100644
--- a/wikipedia/qqq.lproj/Localizable.strings
+++ b/wikipedia/qqq.lproj/Localizable.strings
@@ -107,6 +107,7 @@
"main-menu-heading-legal" = "Header text for the legal section of the menu.
Consider using something informal, but feel free to use a more literal
translation of \"Legal info\" if it seems more appropriate.";
"main-menu-show-today" = "Button text for showing mobile version of main
page\n{{Identical|Today}}";
"main-menu-nearby" = "Button for showing nearby
articles.\n{{Identical|Nearby}}";
+"menu-more-label" = "Button for showing additional settings and menu items.";
"saved-pages-title" = "Header text for Saved Pages
interface.\n{{Identical|Saved page}}";
"saved-pages-clear-confirmation-heading" = "Heading text of delete all
confirmation dialog";
"saved-pages-clear-confirmation-sub-heading" = "Sub-heading text of delete all
confirmation dialog";
@@ -194,7 +195,6 @@
"menu-search-accessibility-label" = "Accessible label text for toolbar search
icon button\n{{Identical|Search}}";
"menu-cancel-accessibility-label" = "Accessible label text for toolbar cancel
button\n{{Identical|Cancel}}";
"menu-share-accessibility-label" = "Accessible label text for toolbar share
button\n{{Identical|Share}}";
-"menu-more-accessibility-label" = "Accessible label for more/... button in 'W'
menu";
"menu-trash-accessibility-label" = "Accessible label for trash
button\n{{Identical|Delete}}";
"nearby-title" = "Title for page showing nearby geotagged
articles\n{{Identical|Nearby}}";
"nearby-distance-label-meters" = "Label for showing distance in meters to
nearby geotagged articles.\n\nParameters:\n* $1 - the number of meters. (The
iOS app doesn't support pluralization syntax
yet.)\n{{Related|Wikipedia-ios-nearby-distance-label}}";
--
To view, visit https://gerrit.wikimedia.org/r/163670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic977f508d3f170195a1544715b7f0d0f64349046
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
