Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173869
Change subject: Increased Recent item row height.
......................................................................
Increased Recent item row height.
Saved pages images flush left to be consistent with search results.
Change-Id: If6b8da071bb68d734870c8f7701ef3a01e62c98a
---
M wikipedia/View Controllers/History/HistoryResultPrototypeView.xib
M wikipedia/View Controllers/History/HistoryViewController.m
M wikipedia/View Controllers/SavedPages/SavedPagesResultPrototypeView.xib
3 files changed, 23 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/69/173869/1
diff --git a/wikipedia/View Controllers/History/HistoryResultPrototypeView.xib
b/wikipedia/View Controllers/History/HistoryResultPrototypeView.xib
index ff6f290..2603bc0 100644
--- a/wikipedia/View Controllers/History/HistoryResultPrototypeView.xib
+++ b/wikipedia/View Controllers/History/HistoryResultPrototypeView.xib
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="5056" systemVersion="13C1021" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <deployment defaultVersion="1536" identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="3733"/>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1"
userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2"
customClass="UIResponder"/>
- <tableViewCell contentMode="scaleToFill"
restorationIdentifier="HistoryResultCell" selectionStyle="default"
indentationWidth="10" reuseIdentifier="HistoryResultCell" id="DCa-yi-JAk"
customClass="HistoryResultCell">
- <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
+ <tableViewCell contentMode="scaleToFill"
restorationIdentifier="HistoryResultCell" selectionStyle="default"
indentationWidth="10" reuseIdentifier="HistoryResultCell" rowHeight="82"
id="DCa-yi-JAk" customClass="HistoryResultCell">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="82"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"
flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO"
clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"
tableViewCell="DCa-yi-JAk" id="c2I-Os-6UK">
<rect key="frame" x="0.0" y="0.0" width="320" height="62"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251"
verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap"
numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO"
preferredMaxLayoutWidth="194" translatesAutoresizingMaskIntoConstraints="NO"
id="6gV-a2-bBZ">
- <rect key="frame" x="106" y="3" width="194"
height="55"/>
- <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <rect key="frame" x="119" y="13" width="181"
height="55"/>
<color key="backgroundColor" white="0.0" alpha="0.0"
colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="55"
id="0xj-zB-nht"/>
@@ -26,16 +25,14 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO"
contentMode="scaleAspectFill" horizontalHuggingPriority="251"
verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO"
id="Osd-Rs-zDt">
- <rect key="frame" x="40" y="3" width="55" height="55"/>
- <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <rect key="frame" x="40" y="6" width="68" height="68"/>
<constraints>
- <constraint firstAttribute="height" constant="55"
id="EEY-hd-rOn"/>
- <constraint firstAttribute="width" constant="55"
id="an5-O3-h22"/>
+ <constraint firstAttribute="height" constant="68"
id="EEY-hd-rOn"/>
+ <constraint firstAttribute="width" constant="68"
id="an5-O3-h22"/>
</constraints>
</imageView>
<label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251"
verticalHuggingPriority="251" text="X" textAlignment="center"
lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO"
id="104-EG-LAC">
- <rect key="frame" x="8" y="19" width="24" height="24"/>
- <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <rect key="frame" x="8" y="29" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24"
id="6s7-CD-Afx"/>
<constraint firstAttribute="height" constant="24"
id="bwt-gj-PHU"/>
@@ -60,6 +57,12 @@
<outlet property="methodLabel" destination="104-EG-LAC"
id="XaA-Ww-hfb"/>
<outlet property="textLabel" destination="6gV-a2-bBZ"
id="8MQ-zs-5C1"/>
</connections>
+ <point key="canvasLocation" x="241" y="416"/>
</tableViewCell>
</objects>
+ <simulatedMetricsContainer key="defaultSimulatedMetrics">
+ <simulatedStatusBarMetrics key="statusBar"/>
+ <simulatedOrientationMetrics key="orientation"/>
+ <simulatedScreenMetrics key="destination" type="retina4"/>
+ </simulatedMetricsContainer>
</document>
diff --git a/wikipedia/View Controllers/History/HistoryViewController.m
b/wikipedia/View Controllers/History/HistoryViewController.m
index 1f85272..51d473e 100644
--- a/wikipedia/View Controllers/History/HistoryViewController.m
+++ b/wikipedia/View Controllers/History/HistoryViewController.m
@@ -23,7 +23,7 @@
#import "CoreDataHousekeeping.h"
#import "NSObject+ConstraintsScale.h"
-#define HISTORY_RESULT_HEIGHT (66.0 * MENUS_SCALE_MULTIPLIER)
+#define HISTORY_RESULT_HEIGHT (80.0 * MENUS_SCALE_MULTIPLIER)
#define HISTORY_TEXT_COLOR [UIColor colorWithWhite:0.0f alpha:0.7f]
#define HISTORY_LANGUAGE_COLOR [UIColor colorWithWhite:0.0f alpha:0.4f]
#define HISTORY_DATE_HEADER_TEXT_COLOR [UIColor colorWithWhite:0.0f alpha:0.6f]
diff --git a/wikipedia/View
Controllers/SavedPages/SavedPagesResultPrototypeView.xib b/wikipedia/View
Controllers/SavedPages/SavedPagesResultPrototypeView.xib
index bbd0f12..4b22411 100644
--- a/wikipedia/View Controllers/SavedPages/SavedPagesResultPrototypeView.xib
+++ b/wikipedia/View Controllers/SavedPages/SavedPagesResultPrototypeView.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="6238"/>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1"
userLabel="File's Owner"/>
@@ -14,7 +15,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251"
verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap"
numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO"
preferredMaxLayoutWidth="171" translatesAutoresizingMaskIntoConstraints="NO"
id="v0D-Yl-KZk">
- <rect key="frame" x="129" y="5" width="171"
height="110"/>
+ <rect key="frame" x="123" y="5" width="177"
height="110"/>
<constraints>
<constraint firstAttribute="height" constant="110"
id="Jj0-aB-4XH"/>
</constraints>
@@ -22,7 +23,7 @@
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO"
contentMode="scaleAspectFill" horizontalHuggingPriority="251"
verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO"
id="UJM-gJ-lCo">
- <rect key="frame" x="6" y="5" width="110"
height="110"/>
+ <rect key="frame" x="0.0" y="5" width="110"
height="110"/>
<constraints>
<constraint firstAttribute="height" constant="110"
id="9hS-dG-FyP"/>
<constraint firstAttribute="width" constant="110"
id="EFl-R6-z9N"/>
@@ -31,7 +32,7 @@
</subviews>
<constraints>
<constraint firstAttribute="trailing"
secondItem="v0D-Yl-KZk" secondAttribute="trailing" constant="20" symbolic="YES"
id="IHt-As-KaF"/>
- <constraint firstItem="UJM-gJ-lCo"
firstAttribute="leading" secondItem="RvZ-qs-wTo" secondAttribute="leading"
constant="6" id="IXj-4U-VAr"/>
+ <constraint firstItem="UJM-gJ-lCo"
firstAttribute="leading" secondItem="RvZ-qs-wTo" secondAttribute="leading"
id="IXj-4U-VAr"/>
<constraint firstAttribute="centerY"
secondItem="v0D-Yl-KZk" secondAttribute="centerY" id="LTN-n1-w4t"/>
<constraint firstAttribute="centerY"
secondItem="UJM-gJ-lCo" secondAttribute="centerY" id="PDX-Qa-XDm"/>
<constraint firstItem="v0D-Yl-KZk"
firstAttribute="leading" secondItem="UJM-gJ-lCo" secondAttribute="trailing"
constant="13" id="p37-ZO-QaS"/>
--
To view, visit https://gerrit.wikimedia.org/r/173869
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6b8da071bb68d734870c8f7701ef3a01e62c98a
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
