Browse Source

bug #1190, #1213 fixed

v0.17
hehehaha 2 years ago
parent
commit
e2673d1017
  1. 17
      GME Remit/Modules/RenewID/User Interface/View/RenewID.storyboard
  2. 2
      GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift

17
GME Remit/Modules/RenewID/User Interface/View/RenewID.storyboard

@ -30,22 +30,22 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="EeK-6h-Ytd">
<rect key="frame" x="16" y="20" width="343" height="508"/>
<rect key="frame" x="16" y="20" width="343" height="518"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xBD-LP-Spj">
<rect key="frame" x="0.0" y="0.0" width="343" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="f46-Wi-Brc">
<rect key="frame" x="20" y="8" width="303" height="34"/>
<rect key="frame" x="20" y="8" width="303" height="44"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uuw-Go-D31">
<rect key="frame" x="0.0" y="0.0" width="303" height="13"/>
<rect key="frame" x="0.0" y="0.0" width="303" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wuu-wk-U39">
<rect key="frame" x="0.0" y="21" width="303" height="13"/>
<rect key="frame" x="0.0" y="26" width="303" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -62,7 +62,7 @@
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="3SX-Ry-CNy">
<rect key="frame" x="0.0" y="80" width="343" height="25"/>
<rect key="frame" x="0.0" y="90" width="343" height="25"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TgA-B0-SFw">
<rect key="frame" x="0.0" y="0.0" width="25" height="25"/>
@ -93,7 +93,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ryt-gI-XXb">
<rect key="frame" x="0.0" y="135" width="343" height="298"/>
<rect key="frame" x="0.0" y="145" width="343" height="298"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="Wly-av-sWq">
<rect key="frame" x="0.0" y="0.0" width="343" height="298"/>
@ -376,7 +376,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rxz-1f-wOx">
<rect key="frame" x="0.0" y="463" width="343" height="45"/>
<rect key="frame" x="0.0" y="473" width="343" height="45"/>
<color key="backgroundColor" name="ThemeText"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="FKb-hl-e3d"/>
@ -397,7 +397,6 @@
<constraint firstItem="EeK-6h-Ytd" firstAttribute="top" secondItem="y1H-iV-BwG" secondAttribute="bottom" constant="20" id="BM0-4Q-CyS"/>
<constraint firstAttribute="trailingMargin" secondItem="EeK-6h-Ytd" secondAttribute="trailing" id="DPG-18-VGg"/>
<constraint firstItem="EeK-6h-Ytd" firstAttribute="leading" secondItem="9Uc-9s-KgO" secondAttribute="leadingMargin" id="KQS-CC-061"/>
<constraint firstItem="PYB-Kq-ghm" firstAttribute="top" secondItem="EeK-6h-Ytd" secondAttribute="bottom" constant="139" id="it4-nJ-Wg7"/>
</constraints>
</view>
<connections>

2
GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift

@ -94,7 +94,7 @@ class RenewIDViewController: UIViewController {
let combination = NSMutableAttributedString()
combination.append(statusText)
combination.append(idStatusTitle)
expiryDate.text = "Expiry Date: \(Utility.database.user.string(.expirtDate) ?? "")"
expiryDate.text = "Current Id Expiry Date: \(Utility.database.user.string(.expirtDate) ?? "")"
idStatus.attributedText = combination
}

Loading…
Cancel
Save