gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] [mapsme-8978] - disable last category deleting from list settings

Browse source
This commit is contained in:
o.bolovintseva 2018-11-27 13:38:37 +03:00 • committed by Olesia Bolovintseva
parent 004fc0ef57
commit 755f46094d
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
iphone/Maps/Bookmarks/Categories/Category settings/CategorySettings.storyboard
View file

@ -137,16 +137,18 @@
</tableViewSection>
<tableViewSection id="LeZ-S5-Rxs">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="WjK-j0-RKa">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="WjK-j0-RKa">
<rect key="frame" x="0.0" y="299" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="WjK-j0-RKa" id="5HB-S5-Pl2">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u56-Jh-ACU">
<rect key="frame" x="0.0" y="0.0" width="375" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u56-Jh-ACU">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<constraints>
<constraint firstAttribute="height" constant="43.5" id="1mi-1o-cIZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Delete List">
<color key="titleColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -154,12 +156,20 @@
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="red"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="delete_list"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="blackHintText"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="deleteListButtonPressed:" destination="tgw-vx-qJ3" eventType="touchUpInside" id="hEg-uB-1pl"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="u56-Jh-ACU" firstAttribute="leading" secondItem="5HB-S5-Pl2" secondAttribute="leading" id="IuM-bU-Md7"/>
<constraint firstAttribute="trailing" secondItem="u56-Jh-ACU" secondAttribute="trailing" id="cOH-qJ-mS1"/>
<constraint firstItem="u56-Jh-ACU" firstAttribute="top" secondItem="5HB-S5-Pl2" secondAttribute="top" id="vyj-Ac-n3I"/>
<constraint firstAttribute="bottom" secondItem="u56-Jh-ACU" secondAttribute="bottom" id="wnb-Bb-HMW"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</cells>
@ -174,6 +184,7 @@
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="accessStatusLabel" destination="hwp-Cw-qHJ" id="FFA-EU-pHx"/>
<outlet property="deleteListButton" destination="u56-Jh-ACU" id="YGi-6E-uHB"/>
<outlet property="descriptionCell" destination="WFB-XH-2pJ" id="gBu-qU-6AM"/>
<outlet property="descriptionTextView" destination="2hT-xL-Vpf" id="ZGf-vb-TFO"/>
<outlet property="nameTextField" destination="cbH-NH-2Hd" id="NoV-HY-TxN"/>

2
iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift
View file

@ -24,6 +24,7 @@ class CategorySettingsViewController: MWMTableViewController {
@IBOutlet private weak var descriptionTextView: UITextView!
@IBOutlet private weak var descriptionCell: UITableViewCell!
@IBOutlet private weak var saveButton: UIBarButtonItem!
@IBOutlet private weak var deleteListButton: UIButton!
override func viewDidLoad() {
super.viewDidLoad()
@ -32,6 +33,7 @@ class CategorySettingsViewController: MWMTableViewController {
assert(categoryId != MWMFrameworkHelper.invalidCategoryId(), "must provide category info")
deleteListButton.isEnabled = (manager.groupsIdList().count > 1)
nameTextField.text = manager.getCategoryName(categoryId)
descriptionTextView.text = manager.getCategoryDescription(categoryId)
configureAccessStatus()