Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/88175
Change subject: Removed the "Deletion" heading above the slider delete button. ...................................................................... Removed the "Deletion" heading above the slider delete button. Change-Id: Ib93b2dac80f34fc9e903ae4e498bb05afed656c6 --- M Commons-iOS/DetailScrollViewController.h M Commons-iOS/DetailScrollViewController.m M Commons-iOS/en.lproj/MainStoryboard.storyboard M Commons-iOS/messages/messages-en.json M Commons-iOS/messages/messages-qqq.json 5 files changed, 4 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/commons refs/changes/75/88175/1 diff --git a/Commons-iOS/DetailScrollViewController.h b/Commons-iOS/DetailScrollViewController.h index e4bcccd..dfb313e 100644 --- a/Commons-iOS/DetailScrollViewController.h +++ b/Commons-iOS/DetailScrollViewController.h @@ -46,7 +46,6 @@ @property (weak, nonatomic) IBOutlet UILabelDynamicHeight *categoryDefaultLabel; @property (weak, nonatomic) IBOutlet UILabelDynamicHeight *licenseDefaultLabel; -@property (weak, nonatomic) IBOutlet UILabel *deleteLabel; @property (weak, nonatomic) IBOutlet UILabelDynamicHeight *deleteButton; @property (weak, nonatomic) IBOutlet UIView *titleContainer; diff --git a/Commons-iOS/DetailScrollViewController.m b/Commons-iOS/DetailScrollViewController.m index 1e726d1..09fca92 100644 --- a/Commons-iOS/DetailScrollViewController.m +++ b/Commons-iOS/DetailScrollViewController.m @@ -146,8 +146,6 @@ self.licenseLabel.text = [MWMessage forKey:@"details-license-label"].text; self.categoryLabel.text = [MWMessage forKey:@"details-category-label"].text; - - self.deleteLabel.text = [MWMessage forKey:@"details-deletion-label"].text; self.deleteButton.text = [MWMessage forKey:@"details-deletion-button"].text; self.descriptionTextView.backgroundColor = DETAIL_EDITABLE_TEXTBOX_BACKGROUND_COLOR; @@ -192,7 +190,6 @@ self.titleLabel.textColor = DETAIL_LABEL_COLOR; self.licenseLabel.textColor = DETAIL_LABEL_COLOR; self.categoryLabel.textColor = DETAIL_LABEL_COLOR; - self.deleteLabel.textColor = DETAIL_LABEL_COLOR; [self.view setMultipleTouchEnabled:NO]; diff --git a/Commons-iOS/en.lproj/MainStoryboard.storyboard b/Commons-iOS/en.lproj/MainStoryboard.storyboard index 3c2e5b2..9a04a8e 100644 --- a/Commons-iOS/en.lproj/MainStoryboard.storyboard +++ b/Commons-iOS/en.lproj/MainStoryboard.storyboard @@ -1236,7 +1236,7 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ehb-uI-yRM" userLabel="Scroll Container"> - <rect key="frame" x="0.0" y="0.0" width="320" height="650"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="621"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jhZ-zd-ki7" userLabel="Title Container"> @@ -1397,18 +1397,11 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zMN-gT-FuM" userLabel="Delete Container"> - <rect key="frame" x="20" y="544" width="280" height="86"/> + <rect key="frame" x="20" y="544" width="280" height="57"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Deletion" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="240" translatesAutoresizingMaskIntoConstraints="NO" id="COf-gZ-FUh"> - <rect key="frame" x="20" y="20" width="240" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delete This Image" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="240" translatesAutoresizingMaskIntoConstraints="NO" id="tnu-rV-ymq" customClass="UILabelDynamicHeight"> - <rect key="frame" x="20" y="49" width="240" height="17"/> + <rect key="frame" x="20" y="20" width="240" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -1417,11 +1410,8 @@ </subviews> <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <constraints> - <constraint firstItem="COf-gZ-FUh" firstAttribute="top" secondItem="zMN-gT-FuM" secondAttribute="top" constant="20" symbolic="YES" id="HnD-2T-aEE"/> - <constraint firstAttribute="trailing" secondItem="COf-gZ-FUh" secondAttribute="trailing" constant="20" symbolic="YES" id="MB1-RH-U3S"/> <constraint firstItem="tnu-rV-ymq" firstAttribute="leading" secondItem="zMN-gT-FuM" secondAttribute="leading" constant="20" symbolic="YES" id="RBH-Lj-JdP"/> - <constraint firstItem="COf-gZ-FUh" firstAttribute="leading" secondItem="zMN-gT-FuM" secondAttribute="leading" constant="20" symbolic="YES" id="WOE-RU-kuX"/> - <constraint firstItem="tnu-rV-ymq" firstAttribute="top" secondItem="COf-gZ-FUh" secondAttribute="bottom" constant="8" symbolic="YES" id="dKh-TP-l61"/> + <constraint firstItem="tnu-rV-ymq" firstAttribute="top" secondItem="zMN-gT-FuM" secondAttribute="top" constant="20" symbolic="YES" id="bv2-d3-lDV"/> <constraint firstAttribute="trailing" secondItem="tnu-rV-ymq" secondAttribute="trailing" constant="20" symbolic="YES" id="jo7-sE-stT"/> <constraint firstAttribute="bottom" secondItem="tnu-rV-ymq" secondAttribute="bottom" constant="20" symbolic="YES" id="yF4-hi-JnT"/> </constraints> @@ -1464,7 +1454,6 @@ <outlet property="categoryLabel" destination="jUg-Wa-cMl" id="8yR-OG-vWN"/> <outlet property="deleteButton" destination="tnu-rV-ymq" id="XL3-yG-uXx"/> <outlet property="deleteContainer" destination="zMN-gT-FuM" id="tmh-TQ-NlA"/> - <outlet property="deleteLabel" destination="COf-gZ-FUh" id="ETn-ZN-dfB"/> <outlet property="descriptionContainer" destination="ChD-4f-cDJ" id="Kag-oJ-QIL"/> <outlet property="descriptionLabel" destination="CZQ-bf-MDt" id="5Ys-xU-tlY"/> <outlet property="descriptionPlaceholder" destination="7ez-E3-hMg" id="Lmn-FU-s50"/> diff --git a/Commons-iOS/messages/messages-en.json b/Commons-iOS/messages/messages-en.json index 4eca7f9..1a33bdb 100644 --- a/Commons-iOS/messages/messages-en.json +++ b/Commons-iOS/messages/messages-en.json @@ -54,7 +54,6 @@ "details-category-select": "Select...", "details-category-loading": "Loading...", "details-category-none-found": "No Categories Found", - "details-deletion-label": "Deletion", "details-deletion-button": "Delete this Image", "web-open-in": "Open in $1", diff --git a/Commons-iOS/messages/messages-qqq.json b/Commons-iOS/messages/messages-qqq.json index f12c606..d68c66e 100644 --- a/Commons-iOS/messages/messages-qqq.json +++ b/Commons-iOS/messages/messages-qqq.json @@ -54,7 +54,6 @@ "details-category-select": "Placeholder for category short list on image detail page when no categories are present. Should be short and encourage tapping to open the category selector.\n{{Identical|Select}}", "details-category-loading": "Loading message for categories on photo details.\n{{Identical|Loading}}", "details-category-none-found": "No categories found message for photo details.", - "details-deletion-label": "Deletion label above delete button", "details-deletion-button": "Button text for image deletion button", "web-open-in": "Button text for opening web page in a given browser. Parameters:\n* $1 - the application name such as 'Safari' or 'Opera'", "web-cancel": "Button text for cancel button.\n{{Identical|Cancel}}", -- To view, visit https://gerrit.wikimedia.org/r/88175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib93b2dac80f34fc9e903ae4e498bb05afed656c6 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/commons Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Mhurd <mh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits