Brion VIBBER has submitted this change and it was merged.
Change subject: No description found message wasn't displaying.
......................................................................
No description found message wasn't displaying.
Also fixed small autolayout issue with categories which happened before
categories had loaded.
Change-Id: I18aff38cee704928802ddfc22eb2fff0353f2726
---
M Commons-iOS/DetailScrollViewController.m
M Commons-iOS/en.lproj/MainStoryboard.storyboard
2 files changed, 9 insertions(+), 14 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Commons-iOS/DetailScrollViewController.m
b/Commons-iOS/DetailScrollViewController.m
index f099c00..9b3d4dc 100644
--- a/Commons-iOS/DetailScrollViewController.m
+++ b/Commons-iOS/DetailScrollViewController.m
@@ -661,13 +661,6 @@
// return (self.categoryList.count == 0) ? 1 :
self.categoryList.count;
// }
-// Categories title
-// [MWMessage forKey:@"details-category-label"].text;
-
-
-// Show add categories button for yet-to-be-uploaded images
-
-
// if (self.selectedRecord.complete.boolValue) {
// Show "Loading..." row if no categories
// if(self.categoryList.count == 0){
@@ -882,7 +875,7 @@
}];
[req always:^(NSDictionary *result) {
- if ([weakDescriptionTextView.text isEqualToString: [MWMessage
forKey:@"details-description-loading"].text]){
+ if (weakDescriptionTextView.text.length == 0){
weakDescriptionTextView.text = [MWMessage
forKey:@"details-description-none-found"].text;
}
weakDescriptionTextLabel.text = weakDescriptionTextView.text;
diff --git a/Commons-iOS/en.lproj/MainStoryboard.storyboard
b/Commons-iOS/en.lproj/MainStoryboard.storyboard
index 80818ef..7b8fefe 100644
--- a/Commons-iOS/en.lproj/MainStoryboard.storyboard
+++ b/Commons-iOS/en.lproj/MainStoryboard.storyboard
@@ -1306,8 +1306,8 @@
<color key="textColor"
white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
- <label opaque="NO"
clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left"
misplaced="YES" text="Required" lineBreakMode="tailTruncation"
baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="7ez-E3-hMg"
userLabel="Required Label">
- <rect key="frame" x="30"
y="57" width="230" height="21"/>
+ <label opaque="NO"
clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left"
text="Required" lineBreakMode="tailTruncation"
baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="7ez-E3-hMg"
userLabel="Required Label">
+ <rect key="frame" x="30"
y="57" width="230" height="17"/>
<autoresizingMask
key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription
key="fontDescription" type="system" pointSize="14"/>
<color key="textColor"
white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -1366,10 +1366,10 @@
</subviews>
<color key="backgroundColor"
white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="jUg-Wa-cMl"
firstAttribute="leading" secondItem="fx9-U5-jNG" secondAttribute="leading"
constant="20" symbolic="YES" placeholder="YES" id="Eir-BG-oWC"/>
- <constraint firstItem="jUg-Wa-cMl"
firstAttribute="top" secondItem="fx9-U5-jNG" secondAttribute="top"
constant="20" symbolic="YES" placeholder="YES" id="GuJ-RG-cpo"/>
- <constraint
firstAttribute="trailing" secondItem="jUg-Wa-cMl" secondAttribute="trailing"
constant="20" symbolic="YES" placeholder="YES" id="fbi-kd-6SU"/>
- <constraint
firstAttribute="bottom" secondItem="jUg-Wa-cMl" secondAttribute="bottom"
constant="20" symbolic="YES" placeholder="YES" id="u19-D6-Yye"/>
+ <constraint firstItem="jUg-Wa-cMl"
firstAttribute="leading" secondItem="fx9-U5-jNG" secondAttribute="leading"
constant="20" symbolic="YES" id="Eir-BG-oWC"/>
+ <constraint firstItem="jUg-Wa-cMl"
firstAttribute="top" secondItem="fx9-U5-jNG" secondAttribute="top"
constant="20" symbolic="YES" id="GuJ-RG-cpo"/>
+ <constraint
firstAttribute="trailing" secondItem="jUg-Wa-cMl" secondAttribute="trailing"
constant="20" symbolic="YES" id="fbi-kd-6SU"/>
+ <constraint
firstAttribute="bottom" secondItem="jUg-Wa-cMl" secondAttribute="bottom"
constant="20" symbolic="YES" id="u19-D6-Yye"/>
</constraints>
</view>
</subviews>
@@ -1951,6 +1951,8 @@
<image name="mockPageLogo.png" width="64" height="106"/>
<image name="mockPagePhoto.png" width="134" height="103"/>
<image name="photo-button-bg.png" width="72" height="72"/>
+ <image name="photo-button-bg.png" width="72" height="72"/>
+ <image name="photo-button-bg.png" width="72" height="72"/>
<image name="settings.png" width="30" height="30"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
--
To view, visit https://gerrit.wikimedia.org/r/88162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18aff38cee704928802ddfc22eb2fff0353f2726
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/commons
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
