[MediaWiki-commits] [Gerrit] Removed the Deletion heading above the slider delete button. - change (apps...commons)
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
[MediaWiki-commits] [Gerrit] Removed the Deletion heading above the slider delete button. - change (apps...commons)
Brion VIBBER has submitted this change and it was merged. 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(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved 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
