Skip to content

Commit

Permalink
Merge pull request #105 from Esri/eli/hotfix-mmpk-update
Browse files Browse the repository at this point in the history 
Hotfix: Update mmpk button
  • Loading branch information
@esreli
esreli authored Aug 20, 2020
2 parents 03f767e + 4d6a434 commit b7b41da
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion RELEASE.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# v2.0.2


- Hides update button for portal mobile map package if package is current.

# v2.0.1

Expand Down
35 changes: 17 additions & 18 deletions mapbook-iOS/View controllers/Map Packages List/Base.lproj/MapPackagesList.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rdU-Ra-7i9">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="rdU-Ra-7i9">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -40,42 +38,42 @@
<objects>
<tableViewController id="K9I-zN-dMD" customClass="MapPackagesListViewController" customModule="mapbook_iOS" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="VJF-zE-ZCh">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="LocalPackageCell" rowHeight="202" id="Pxw-w5-nh1" customClass="LocalPackageCell" customModule="mapbook_iOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="55.5" width="414" height="202"/>
<rect key="frame" x="0.0" y="55.5" width="600" height="202"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pxw-w5-nh1" id="5Dd-nk-J6o">
<rect key="frame" x="0.0" y="0.0" width="414" height="202"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="202"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="6yA-pA-zeD">
<rect key="frame" x="20" y="20" width="374" height="162"/>
<rect key="frame" x="20" y="20" width="560" height="162"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="0BU-5p-zrV">
<rect key="frame" x="0.0" y="0.0" width="374" height="153"/>
<rect key="frame" x="0.0" y="0.0" width="560" height="153"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="m7m-9o-xlG">
<rect key="frame" x="0.0" y="0.0" width="374" height="51"/>
<rect key="frame" x="0.0" y="0.0" width="560" height="51"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Map Package Title Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nBl-9k-EDx">
<rect key="frame" x="0.0" y="0.0" width="374" height="26.5"/>
<rect key="frame" x="0.0" y="0.0" width="560" height="26.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Map Package Description Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j9S-ev-mdJ">
<rect key="frame" x="0.0" y="30.5" width="374" height="20.5"/>
<rect key="frame" x="0.0" y="30.5" width="560" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="9bd-TP-Zz7">
<rect key="frame" x="0.0" y="63" width="374" height="90"/>
<rect key="frame" x="0.0" y="63" width="560" height="90"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Xaf-DV-dbd">
<rect key="frame" x="0.0" y="0.0" width="120" height="90"/>
Expand All @@ -85,10 +83,10 @@
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="jsr-4h-jAq">
<rect key="frame" x="136" y="0.0" width="238" height="90"/>
<rect key="frame" x="136" y="0.0" width="424" height="90"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="bottom" translatesAutoresizingMaskIntoConstraints="NO" id="dQH-YQ-aht">
<rect key="frame" x="0.0" y="0.0" width="238" height="90"/>
<rect key="frame" x="0.0" y="0.0" width="424" height="90"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="W0Z-uE-0Js">
<rect key="frame" x="0.0" y="25" width="80.5" height="65"/>
Expand Down Expand Up @@ -130,7 +128,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="bottom" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="MMc-k7-VDX">
<rect key="frame" x="153.5" y="31.5" width="84.5" height="58.5"/>
<rect key="frame" x="339.5" y="31.5" width="84.5" height="58.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XEj-gH-swL">
<rect key="frame" x="40.5" y="0.0" width="44" height="24"/>
Expand Down Expand Up @@ -192,19 +190,20 @@
<outlet property="sizeLabel" destination="goD-Sh-OAp" id="AwI-Kb-aH0"/>
<outlet property="thumbnailImageView" destination="Xaf-DV-dbd" id="oDj-wM-7Tb"/>
<outlet property="titleLabel" destination="nBl-9k-EDx" id="gfg-DP-gvf"/>
<outlet property="updateActivityStackView" destination="XEj-gH-swL" id="7xo-9z-7bW"/>
<outlet property="updateButton" destination="xTd-lI-gow" id="611-wa-PhU"/>
<outlet property="updateStackView" destination="MMc-k7-VDX" id="wun-zM-qpS"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="NoPackagesCell" rowHeight="48" id="1ni-mQ-bYT" customClass="NoPackagesCell" customModule="mapbook_iOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="257.5" width="414" height="48"/>
<rect key="frame" x="0.0" y="257.5" width="600" height="48"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1ni-mQ-bYT" id="r07-e8-7jW">
<rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="48"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="No packages." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rYM-0D-GI5">
<rect key="frame" x="20" y="11" width="374" height="26"/>
<rect key="frame" x="20" y="11" width="560" height="26"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<color key="textColor" systemColor="tertiaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand Down
3 changes: 3 additions & 0 deletions mapbook-iOS/View controllers/Map Packages List/MapPackagesListViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ class LocalPackageCell: UITableViewCell {
@IBOutlet weak var updateButton:UIButton!
@IBOutlet weak var activityIndicatorView:UIActivityIndicatorView!
@IBOutlet weak var updateStackView:UIStackView!
@IBOutlet weak var updateActivityStackView: UIStackView!

weak var delegate: LocalPackageCellDelegate?

Expand All @@ -485,6 +486,8 @@ class LocalPackageCell: UITableViewCell {
self.isUpdating = false
}

updateActivityStackView.isHidden = !portalPackage.canUpdate

_portalAwarePackage = portalPackage
}
else {
Expand Down

0 comments on commit b7b41da

Please sign in to comment.