From 5c7ccc5b3742c7ff2462feb6302f54e27ec11bc1 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 10:42:09 -0700
Subject: [PATCH 01/10] Never use large titles in password details

---
 pass/Controllers/PasswordDetailTableViewController.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 14d9a4a..41d5f80 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -89,6 +89,9 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.addSubview(indicator)
         editUIBarButtonItem.isEnabled = false
         navigationItem.rightBarButtonItem = editUIBarButtonItem
+        if #available(iOS 11.0, *) {
+            navigationItem.largeTitleDisplayMode = .never
+        }
         
         if let imageData = passwordEntity?.image {
             let image = UIImage(data: imageData as Data)

From 3f3360259af167ac704faa34ba20edadeb42df4d Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 19:58:46 -0700
Subject: [PATCH 02/10] Optimize the top margin of raw password

---
 pass/Base.lproj/Main.storyboard | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 413a892..19d4523 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -838,7 +838,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3dt-Ph-4As">
-                                <rect key="frame" x="20" y="10" width="374" height="726"/>
+                                <rect key="frame" x="20" y="72" width="374" height="664"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">K7PBbkoaJf6mLyVX3EBU
 username: passforios-demo@email.com
@@ -853,8 +853,8 @@ Phone Support PIN #: 84719</string>
                         <constraints>
                             <constraint firstAttribute="trailingMargin" secondItem="3dt-Ph-4As" secondAttribute="trailing" id="2IV-7r-9eG"/>
                             <constraint firstItem="7JD-uM-IyS" firstAttribute="top" secondItem="3dt-Ph-4As" secondAttribute="bottom" id="3yp-aL-exH"/>
-                            <constraint firstItem="3dt-Ph-4As" firstAttribute="top" secondItem="XeK-cv-AXf" secondAttribute="bottom" constant="-54" id="5y9-J3-Luj"/>
                             <constraint firstAttribute="leadingMargin" secondItem="3dt-Ph-4As" secondAttribute="leading" id="jgf-j1-lNa"/>
+                            <constraint firstItem="3dt-Ph-4As" firstAttribute="top" secondItem="XeK-cv-AXf" secondAttribute="bottom" constant="8" symbolic="YES" id="yN7-0c-t4Y"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Raw Password" id="c13-zM-tLf">
@@ -1805,7 +1805,7 @@ Cgo
         <image name="Settings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="iCM-Fy-hkk"/>
+        <segue reference="WfV-6d-ZUj"/>
         <segue reference="yyD-4H-pLE"/>
     </inferredMetricsTieBreakers>
 </document>

From be76987758f64666d9c1b8cf05486778c03668e7 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 20:51:13 -0700
Subject: [PATCH 03/10] Fix UI constraint warning

---
 pass/Base.lproj/Main.storyboard          |  2 +-
 pass/Views/FillPasswordTableViewCell.xib | 17 +++++++----------
 pass/Views/LabelTableViewCell.xib        | 11 +++++------
 pass/Views/TextFieldTableViewCell.xib    |  8 ++++----
 pass/Views/TextViewTableViewCell.xib     | 13 +++++++++----
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 19d4523..1cd7a3c 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1806,6 +1806,6 @@ Cgo
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="WfV-6d-ZUj"/>
-        <segue reference="yyD-4H-pLE"/>
+        <segue reference="UfP-k3-XeR"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/pass/Views/FillPasswordTableViewCell.xib b/pass/Views/FillPasswordTableViewCell.xib
index 715a3d3..2ebed2b 100644
--- a/pass/Views/FillPasswordTableViewCell.xib
+++ b/pass/Views/FillPasswordTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,17 +16,14 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="89.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="19l-R0-gP1">
-                        <rect key="frame" x="15" y="11" width="290" height="68"/>
+                        <rect key="frame" x="8" y="11" width="304" height="68"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="password" textAlignment="natural" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="k0U-2N-YaX" userLabel="Password">
-                                <rect key="frame" x="0.0" y="0.0" width="230" height="68"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="9gX-VT-F9P"/>
-                                </constraints>
+                                <rect key="frame" x="0.0" y="0.0" width="244" height="68"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="alphabet"/>
@@ -35,7 +32,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hTh-ek-Xam" userLabel="Generate">
-                                <rect key="frame" x="230" y="0.0" width="30" height="68"/>
+                                <rect key="frame" x="244" y="0.0" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="l0l-7B-Tws"/>
                                 </constraints>
@@ -46,7 +43,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SZJ-aY-45Y" userLabel="Setting">
-                                <rect key="frame" x="260" y="0.0" width="30" height="68"/>
+                                <rect key="frame" x="274" y="0.0" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="D9D-FC-ANz"/>
                                 </constraints>
diff --git a/pass/Views/LabelTableViewCell.xib b/pass/Views/LabelTableViewCell.xib
index cd316bb..d5c85a8 100644
--- a/pass/Views/LabelTableViewCell.xib
+++ b/pass/Views/LabelTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,11 +16,11 @@
             <rect key="frame" x="0.0" y="0.0" width="333" height="59"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="333" height="59"/>
+                <rect key="frame" x="0.0" y="0.0" width="333" height="58.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yyr-cF-QN0">
-                        <rect key="frame" x="15" y="27" width="303" height="21"/>
+                        <rect key="frame" x="8" y="27" width="56" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="pgw-DF-LQa"/>
                         </constraints>
@@ -29,7 +29,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dqz-7n-uEZ">
-                        <rect key="frame" x="15" y="11" width="303" height="13"/>
+                        <rect key="frame" x="8" y="11" width="317" height="13"/>
                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                         <color key="textColor" red="0.0" green="0.47843137254901957" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -40,7 +40,6 @@
                     <constraint firstItem="Dqz-7n-uEZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="CVm-uc-iVo"/>
                     <constraint firstAttribute="topMargin" secondItem="Dqz-7n-uEZ" secondAttribute="top" id="N4y-iT-CiY"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="leading" secondItem="Dqz-7n-uEZ" secondAttribute="leading" id="TpW-bu-QIx"/>
-                    <constraint firstItem="yyr-cF-QN0" firstAttribute="width" secondItem="Dqz-7n-uEZ" secondAttribute="width" id="ZXa-fK-0Bg"/>
                     <constraint firstAttribute="bottomMargin" secondItem="yyr-cF-QN0" secondAttribute="bottom" id="mIj-9c-ElE"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="top" secondItem="Dqz-7n-uEZ" secondAttribute="bottom" constant="3" id="sgc-hN-i8t"/>
                 </constraints>
diff --git a/pass/Views/TextFieldTableViewCell.xib b/pass/Views/TextFieldTableViewCell.xib
index 35d3feb..00a066d 100644
--- a/pass/Views/TextFieldTableViewCell.xib
+++ b/pass/Views/TextFieldTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16F43c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,7 +20,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8Ky-UZ-sLu">
-                        <rect key="frame" x="15" y="11" width="290" height="47"/>
+                        <rect key="frame" x="8" y="11" width="304" height="47"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="R1z-fU-Xr2"/>
                         </constraints>
@@ -33,7 +33,7 @@
                     <constraint firstItem="8Ky-UZ-sLu" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="3h4-9E-oDJ"/>
                     <constraint firstItem="8Ky-UZ-sLu" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="FH4-4T-aaK"/>
                     <constraint firstAttribute="trailingMargin" secondItem="8Ky-UZ-sLu" secondAttribute="trailing" id="Nii-Cg-gC1"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="8Ky-UZ-sLu" secondAttribute="bottom" id="h72-l3-Sb3"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="8Ky-UZ-sLu" secondAttribute="bottom" priority="750" id="h72-l3-Sb3"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
diff --git a/pass/Views/TextViewTableViewCell.xib b/pass/Views/TextViewTableViewCell.xib
index 564a3c8..0e13d70 100644
--- a/pass/Views/TextViewTableViewCell.xib
+++ b/pass/Views/TextViewTableViewCell.xib
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16F43c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Menlo.ttc">
+            <string>Menlo-Regular</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -20,7 +25,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xHX-Sh-1pR">
-                        <rect key="frame" x="15" y="11" width="290" height="195"/>
+                        <rect key="frame" x="8" y="11" width="304" height="195"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="120" id="Tvq-j8-Nvh"/>
@@ -32,7 +37,7 @@
                 <constraints>
                     <constraint firstAttribute="trailingMargin" secondItem="xHX-Sh-1pR" secondAttribute="trailing" id="LWS-JW-9dS"/>
                     <constraint firstItem="xHX-Sh-1pR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="SRq-7t-Gyr"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="xHX-Sh-1pR" secondAttribute="bottom" id="UPQ-jk-QJR"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="xHX-Sh-1pR" secondAttribute="bottom" priority="750" id="UPQ-jk-QJR"/>
                     <constraint firstItem="xHX-Sh-1pR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="gwb-2C-4wp"/>
                 </constraints>
             </tableViewCellContentView>

From 77a38807f340bbe6a8322c2bba365c9923cd4afb Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:07:02 -0700
Subject: [PATCH 04/10] Additional content show at top by default when editing
 a password

---
 pass/Controllers/PasswordEditorTableViewController.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index 71defd2..ce72409 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -75,6 +75,9 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
         self.tableView.sectionFooterHeight = UITableViewAutomaticDimension;
         self.tableView.estimatedSectionFooterHeight = 0;
     }
+    override func viewDidLayoutSubviews() {
+       additionsCell?.contentTextView.setContentOffset(.zero, animated: false)
+    }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cellData = tableData[indexPath.section][indexPath.row]

From 77a98186226dce509873e2014e31abfdc730f6e2 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:18:37 -0700
Subject: [PATCH 05/10] Fix a UI bug in LabelTableViewCell to show long
 sentense

---
 pass/Views/LabelTableViewCell.xib | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pass/Views/LabelTableViewCell.xib b/pass/Views/LabelTableViewCell.xib
index d5c85a8..157ca44 100644
--- a/pass/Views/LabelTableViewCell.xib
+++ b/pass/Views/LabelTableViewCell.xib
@@ -20,7 +20,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yyr-cF-QN0">
-                        <rect key="frame" x="8" y="27" width="56" height="21"/>
+                        <rect key="frame" x="8" y="27" width="305" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="pgw-DF-LQa"/>
                         </constraints>
@@ -40,6 +40,7 @@
                     <constraint firstItem="Dqz-7n-uEZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="CVm-uc-iVo"/>
                     <constraint firstAttribute="topMargin" secondItem="Dqz-7n-uEZ" secondAttribute="top" id="N4y-iT-CiY"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="leading" secondItem="Dqz-7n-uEZ" secondAttribute="leading" id="TpW-bu-QIx"/>
+                    <constraint firstAttribute="trailing" secondItem="yyr-cF-QN0" secondAttribute="trailing" constant="20" symbolic="YES" id="evr-4N-30Z"/>
                     <constraint firstAttribute="bottomMargin" secondItem="yyr-cF-QN0" secondAttribute="bottom" id="mIj-9c-ElE"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="top" secondItem="Dqz-7n-uEZ" secondAttribute="bottom" constant="3" id="sgc-hN-i8t"/>
                 </constraints>

From f3551a15422c50c171b2b00ef4e4a21470cc02b5 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:54:56 -0700
Subject: [PATCH 06/10] Change the password's font to Courier

---
 passKit/Helpers/Globals.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 930ce56..1ecb124 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -47,7 +47,7 @@ public class Globals {
     
     public static let passwordDots = "••••••••••••"
     public static let oneTimePasswordDots = "••••••"
-    public static let passwordFonts = "Menlo"
+    public static let passwordFonts = "Courier"
     
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)

From 6ea47766bccc7aa8c6ffa5ab64cfbc5275adc53f Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 22:16:59 -0700
Subject: [PATCH 07/10] Specify colors for digits and letters in password

---
 passKit/Helpers/Globals.swift | 2 ++
 passKit/Helpers/Utils.swift   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 1ecb124..5bd7688 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -52,6 +52,8 @@ public class Globals {
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)
     public static let blue = UIColor(red:0.00, green:0.48, blue:1.00, alpha:1.0)
+    public static let letterColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
+    public static let digitColor = UIColor(red:66/255.0, green:113/255.0, blue:174/255.0, alpha:1.0)
     public static let tableCellButtonSize = CGFloat(20.0)
     
     private init() { }
diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift
index 7767ffb..3ddd167 100644
--- a/passKit/Helpers/Utils.swift
+++ b/passKit/Helpers/Utils.swift
@@ -107,9 +107,9 @@ public class Utils {
         for (index, element) in plainPassword.unicodeScalars.enumerated() {
             var charColor = UIColor.darkText
             if NSCharacterSet.decimalDigits.contains(element) {
-                charColor = Globals.red
+                charColor = Globals.digitColor
             } else if !NSCharacterSet.letters.contains(element) {
-                charColor = Globals.blue
+                charColor = Globals.letterColor
             }
             attributedPassword.addAttribute(NSAttributedStringKey.foregroundColor, value: charColor, range: NSRange(location: index, length: 1))
         }

From 3605e59c30ab98fdd25de58372ece5158c6b5b84 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 23:05:26 -0700
Subject: [PATCH 08/10] Tweak password font

---
 pass/Views/FillPasswordTableViewCell.swift | 2 +-
 pass/Views/LabelTableViewCell.swift        | 4 ++--
 passKit/Helpers/Globals.swift              | 5 +++--
 passKit/Helpers/Utils.swift                | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pass/Views/FillPasswordTableViewCell.swift b/pass/Views/FillPasswordTableViewCell.swift
index 97c702d..0042ba1 100644
--- a/pass/Views/FillPasswordTableViewCell.swift
+++ b/pass/Views/FillPasswordTableViewCell.swift
@@ -25,7 +25,7 @@ class FillPasswordTableViewCell: ContentTableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
-        contentTextField.font = UIFont(name: Globals.passwordFonts, size: (contentTextField.font?.pointSize)!)
+        contentTextField.font = Globals.passwordFont
         
         // Force aspect ratio of button images
         settingButton.imageView?.contentMode = .scaleAspectFit
diff --git a/pass/Views/LabelTableViewCell.swift b/pass/Views/LabelTableViewCell.swift
index fd72303..b1d8def 100644
--- a/pass/Views/LabelTableViewCell.swift
+++ b/pass/Views/LabelTableViewCell.swift
@@ -51,7 +51,7 @@ class LabelTableViewCell: UITableViewCell {
                         contentLabel.text = Globals.passwordDots
                     }
                 }
-                contentLabel.font = UIFont(name: Globals.passwordFonts, size: contentLabel.font.pointSize)
+                contentLabel.font = Globals.passwordFont
             case "hmac-based":
                 type = .HOTP
                 if isReveal {
@@ -59,7 +59,7 @@ class LabelTableViewCell: UITableViewCell {
                 } else {
                     contentLabel.text = Globals.oneTimePasswordDots
                 }
-                contentLabel.font = UIFont(name: Globals.passwordFonts, size: contentLabel.font.pointSize)
+                contentLabel.font = Globals.passwordFont
             case "url":
                 type = .URL
                 contentLabel.text = content
diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 5bd7688..cc7962d 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -47,12 +47,13 @@ public class Globals {
     
     public static let passwordDots = "••••••••••••"
     public static let oneTimePasswordDots = "••••••"
-    public static let passwordFonts = "Courier"
+    public static let passwordFont = UIFont(name: "Courier-Bold", size: UIFont.labelFontSize - 1)
     
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)
     public static let blue = UIColor(red:0.00, green:0.48, blue:1.00, alpha:1.0)
-    public static let letterColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
+    public static let letterColor = UIColor(red:40/255.0, green:42/255.0, blue:54/255.0, alpha:1.0)
+    public static let symbolColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
     public static let digitColor = UIColor(red:66/255.0, green:113/255.0, blue:174/255.0, alpha:1.0)
     public static let tableCellButtonSize = CGFloat(20.0)
     
diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift
index 3ddd167..c97308e 100644
--- a/passKit/Helpers/Utils.swift
+++ b/passKit/Helpers/Utils.swift
@@ -109,6 +109,8 @@ public class Utils {
             if NSCharacterSet.decimalDigits.contains(element) {
                 charColor = Globals.digitColor
             } else if !NSCharacterSet.letters.contains(element) {
+                charColor = Globals.symbolColor
+            } else {
                 charColor = Globals.letterColor
             }
             attributedPassword.addAttribute(NSAttributedStringKey.foregroundColor, value: charColor, range: NSRange(location: index, length: 1))

From 3215fb2901cce9dc11466d9abcc099ff16e37cc5 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 23:14:00 -0700
Subject: [PATCH 09/10] Do not hide search bar when scrolling

---
 pass/Controllers/PasswordsViewController.swift | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 7706157..57729c3 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -190,9 +190,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         } else {
             searchController.searchBar.scopeButtonTitles = nil
         }
-        if #available(iOS 11.0, *) {
-            navigationItem.hidesSearchBarWhenScrolling = true
-        }
     }
     
     override func viewDidLoad() {
@@ -206,7 +203,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
             navigationItem.searchController = searchController
             navigationController?.navigationBar.prefersLargeTitles = true
             navigationItem.largeTitleDisplayMode = .automatic
-            navigationItem.hidesSearchBarWhenScrolling = true
+            navigationItem.hidesSearchBarWhenScrolling = false
         } else {
             // Fallback on earlier versions
             tableView.contentInset = UIEdgeInsetsMake(56, 0, 0, 0)
@@ -231,9 +228,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         if let path = tableView.indexPathForSelectedRow {
             tableView.deselectRow(at: path, animated: false)
         }
-        if #available(iOS 11.0, *) {
-            navigationItem.hidesSearchBarWhenScrolling = false
-        }
     }
     
     override func viewWillLayoutSubviews() {

From e0c0606852ae8c5b65c8c5f9f83fb0c9bd71697b Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sun, 8 Oct 2017 00:02:26 -0700
Subject: [PATCH 10/10] Remove the indicator in loading password details

---
 pass/Controllers/PasswordDetailTableViewController.swift | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 41d5f80..f16f087 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -19,12 +19,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     private var shouldPopCurrentView = false
     private let passwordStore = PasswordStore.shared
     
-    private let indicator: UIActivityIndicatorView = {
-        let indicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
-        indicator.center = CGPoint(x: UIScreen.main.bounds.width / 2, y: UIScreen.main.bounds.height * 0.382)
-        return indicator
-    }()
-    
     private lazy var editUIBarButtonItem: UIBarButtonItem = {
         let uiBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit(_:)))
         return uiBarButtonItem
@@ -85,8 +79,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 52
         
-        indicator.startAnimating()
-        tableView.addSubview(indicator)
         editUIBarButtonItem.isEnabled = false
         navigationItem.rightBarButtonItem = editUIBarButtonItem
         if #available(iOS 11.0, *) {
@@ -177,7 +169,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     
     private func showPassword() {
         DispatchQueue.main.async { [weak self] in
-            self?.indicator.stopAnimating()
             self?.setTableData()
             self?.tableView.reloadData()
             self?.editUIBarButtonItem.isEnabled = true