Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/220609
Change subject: scale language row height w/ device ...................................................................... scale language row height w/ device Fixes text being cropped on iPad. [0] 0: https://phabricator.wikimedia.org/T97780#1393885 Bug: T97780 Change-Id: I56257700c474a02f3dbd64cfa48f08d98f70d524 --- M Wikipedia/Base.lproj/Main_iPhone.storyboard M Wikipedia/View Controllers/Languages/LanguagesViewController.m M Wikipedia/View Controllers/WebView/WebViewController.m 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/09/220609/1 diff --git a/Wikipedia/Base.lproj/Main_iPhone.storyboard b/Wikipedia/Base.lproj/Main_iPhone.storyboard index 08c087c..8c34dfc 100644 --- a/Wikipedia/Base.lproj/Main_iPhone.storyboard +++ b/Wikipedia/Base.lproj/Main_iPhone.storyboard @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="15A178w" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="1qV-3k-dN1"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="1qV-3k-dN1"> <dependencies> <deployment identifier="iOS"/> <development version="5100" identifier="xcode"/> @@ -1878,7 +1878,7 @@ <view autoresizesSubviews="NO" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DsV-9G-XpE" userLabel="Bottom Menu Container" customClass="BottomMenuContainerView"> <rect key="frame" x="0.0" y="0.0" width="320" height="46"/> <subviews> - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vRW-Da-kEk" userLabel="Back Button" customClass="WikiGlyphButton"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vRW-Da-kEk" userLabel="Back Button" customClass="WikiGlyphButton"> <rect key="frame" x="10" y="0.0" width="40" height="46"/> <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -1891,7 +1891,7 @@ <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1LN-g3-9sh" userLabel="Forward Button" customClass="WikiGlyphButton"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1LN-g3-9sh" userLabel="Forward Button" customClass="WikiGlyphButton"> <rect key="frame" x="75" y="0.0" width="40" height="46"/> <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -1904,7 +1904,7 @@ <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SIR-FX-olC" userLabel="Save Button" customClass="WikiGlyphButton"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SIR-FX-olC" userLabel="Save Button" customClass="WikiGlyphButton"> <rect key="frame" x="140" y="0.0" width="40" height="46"/> <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -1918,7 +1918,7 @@ <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dTJ-8C-aMG" userLabel="Languages Button" customClass="WikiGlyphButton"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dTJ-8C-aMG" userLabel="Languages Button" customClass="WikiGlyphButton"> <rect key="frame" x="205" y="0.0" width="40" height="46"/> <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> @@ -1931,7 +1931,7 @@ <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> - <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pa7-aw-hDf" userLabel="Share Button" customClass="WikiGlyphButton"> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pa7-aw-hDf" userLabel="Share Button" customClass="WikiGlyphButton"> <rect key="frame" x="270" y="0.0" width="40" height="46"/> <animations/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> diff --git a/Wikipedia/View Controllers/Languages/LanguagesViewController.m b/Wikipedia/View Controllers/Languages/LanguagesViewController.m index c0e5e3c..21f577e 100644 --- a/Wikipedia/View Controllers/Languages/LanguagesViewController.m +++ b/Wikipedia/View Controllers/Languages/LanguagesViewController.m @@ -236,9 +236,9 @@ #endif - (CGFloat)tableView:(UITableView*)tableView heightForRowAtIndexPath:(NSIndexPath*)indexPath { if (PreferredLanguagesSection == indexPath.section) { - return PreferredLanguageRowHeight; + return PreferredLanguageRowHeight * MENUS_SCALE_MULTIPLIER; } else { - return OtherLanguageRowHeight; + return OtherLanguageRowHeight * MENUS_SCALE_MULTIPLIER; } } diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m b/Wikipedia/View Controllers/WebView/WebViewController.m index b66e1aa..e03e9ef 100644 --- a/Wikipedia/View Controllers/WebView/WebViewController.m +++ b/Wikipedia/View Controllers/WebView/WebViewController.m @@ -63,7 +63,7 @@ [self setupTrackingFooter]; self.bottomNavHeightConstraint.constant = CHROME_MENUS_HEIGHT; - + self.webView.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal; self.scrollingToTop = NO; -- To view, visit https://gerrit.wikimedia.org/r/220609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56257700c474a02f3dbd64cfa48f08d98f70d524 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle <bgers...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
