From 0e6e71f6f833dd370cac567a5b75379b146deae7 Mon Sep 17 00:00:00 2001
From: Yannick Spreen <yannick.spreen@gmail.com>
Date: Tue, 20 Apr 2021 23:23:44 +0200
Subject: [PATCH] Start adding info table.

---
 PatientScannerDemo.xcodeproj/project.pbxproj  |  8 ++
 PatientScannerDemo/Components/InfoCell.swift  | 18 +++++
 .../Components/SelfSizedTableView.swift       | 25 ++++++
 PatientScannerDemo/Models/HCert.swift         | 15 +++-
 .../Storyboards/CertificateViewer.storyboard  | 80 ++++++++++++++++---
 .../ViewControllers/CertificateViewer.swift   | 30 ++++++-
 PatientScannerDemo/ViewControllers/Scan.swift | 10 +--
 7 files changed, 167 insertions(+), 19 deletions(-)
 create mode 100644 PatientScannerDemo/Components/InfoCell.swift
 create mode 100644 PatientScannerDemo/Components/SelfSizedTableView.swift

diff --git a/PatientScannerDemo.xcodeproj/project.pbxproj b/PatientScannerDemo.xcodeproj/project.pbxproj
index 79a6c99..8b8225e 100644
--- a/PatientScannerDemo.xcodeproj/project.pbxproj
+++ b/PatientScannerDemo.xcodeproj/project.pbxproj
@@ -23,6 +23,8 @@
 		CEA15558262F639C0024B7AC /* JSONSchema in Frameworks */ = {isa = PBXBuildFile; productRef = CEA15557262F639C0024B7AC /* JSONSchema */; };
 		CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */; };
 		CEA15563262F6DAB0024B7AC /* ChildDismissedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */; };
+		CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */; };
+		CEA15570262F79DE0024B7AC /* InfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA1556F262F79DE0024B7AC /* InfoCell.swift */; };
 		CEA6D6EC261F8D2700715333 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6D6EB261F8D2700715333 /* AppDelegate.swift */; };
 		CEA6D6EE261F8D2700715333 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6D6ED261F8D2700715333 /* SceneDelegate.swift */; };
 		CEA6D6F0261F8D2700715333 /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6D6EF261F8D2700715333 /* Scan.swift */; };
@@ -71,6 +73,8 @@
 		CE3CC9432628C2130079FB78 /* CBOR.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBOR.swift; sourceTree = "<group>"; };
 		CEA1555C262F63B30024B7AC /* EuDgcSchema.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EuDgcSchema.swift; sourceTree = "<group>"; };
 		CEA15562262F6DAB0024B7AC /* ChildDismissedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChildDismissedDelegate.swift; sourceTree = "<group>"; };
+		CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSizedTableView.swift; sourceTree = "<group>"; };
+		CEA1556F262F79DE0024B7AC /* InfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoCell.swift; sourceTree = "<group>"; };
 		CEA6D6E8261F8D2700715333 /* PatientScannerDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PatientScannerDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CEA6D6EB261F8D2700715333 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		CEA6D6ED261F8D2700715333 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -174,6 +178,8 @@
 			children = (
 				CE13CF0E262DD0D80070C80E /* FullFloatingPanelLayout.swift */,
 				CE13CF22262DDF810070C80E /* RoundedButton.swift */,
+				CEA1556A262F784E0024B7AC /* SelfSizedTableView.swift */,
+				CEA1556F262F79DE0024B7AC /* InfoCell.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -410,6 +416,7 @@
 				CEC2C4C42625ED030056E406 /* Base45.swift in Sources */,
 				CE3CC9442628C2130079FB78 /* CBOR.swift in Sources */,
 				CE13CF0F262DD0D80070C80E /* FullFloatingPanelLayout.swift in Sources */,
+				CEA1556B262F784E0024B7AC /* SelfSizedTableView.swift in Sources */,
 				CE157F81262E1F7A00FE4821 /* Date.swift in Sources */,
 				CE1BDF99262A4CD600766F97 /* X509.swift in Sources */,
 				CEA1555D262F63B30024B7AC /* EuDgcSchema.swift in Sources */,
@@ -422,6 +429,7 @@
 				CEA15563262F6DAB0024B7AC /* ChildDismissedDelegate.swift in Sources */,
 				CEFAD8722625F29E009AFEF9 /* String+JSON.swift in Sources */,
 				CEC2C4C22625ED030056E406 /* ZLib.swift in Sources */,
+				CEA15570262F79DE0024B7AC /* InfoCell.swift in Sources */,
 				CEA6D6EE261F8D2700715333 /* SceneDelegate.swift in Sources */,
 				CE157F9B262E2A9F00FE4821 /* SwiftCBOR.CBOR.swift in Sources */,
 			);
diff --git a/PatientScannerDemo/Components/InfoCell.swift b/PatientScannerDemo/Components/InfoCell.swift
new file mode 100644
index 0000000..c72de62
--- /dev/null
+++ b/PatientScannerDemo/Components/InfoCell.swift
@@ -0,0 +1,18 @@
+//
+//  InfoCell.swift
+//  PatientScannerDemo
+//
+//  Created by Yannick Spreen on 4/20/21.
+//
+
+import UIKit
+
+class InfoCell: UITableViewCell {
+  @IBOutlet weak var headerLabel: UILabel!
+  @IBOutlet weak var contentLabel: UILabel!
+
+  func draw(_ info: InfoSection) {
+    headerLabel?.text = info.header
+    contentLabel?.text = info.content
+  }
+}
diff --git a/PatientScannerDemo/Components/SelfSizedTableView.swift b/PatientScannerDemo/Components/SelfSizedTableView.swift
new file mode 100644
index 0000000..81cda48
--- /dev/null
+++ b/PatientScannerDemo/Components/SelfSizedTableView.swift
@@ -0,0 +1,25 @@
+//
+//  SelfSizedTableView.swift
+//  PatientScannerDemo
+//
+//  Created by Yannick Spreen on 4/20/21.
+//
+//  https://dushyant37.medium.com/swift-4-recipe-self-sizing-table-view-2635ac3df8ab
+//
+
+import UIKit
+
+class SelfSizedTableView: UITableView {
+  var maxHeight: CGFloat = UIScreen.main.bounds.size.height
+
+  override func reloadData() {
+    super.reloadData()
+    self.invalidateIntrinsicContentSize()
+    self.layoutIfNeeded()
+  }
+
+  override var intrinsicContentSize: CGSize {
+    let height = min(contentSize.height, maxHeight)
+    return CGSize(width: contentSize.width, height: height)
+  }
+}
diff --git a/PatientScannerDemo/Models/HCert.swift b/PatientScannerDemo/Models/HCert.swift
index 4b39e00..cf53f18 100644
--- a/PatientScannerDemo/Models/HCert.swift
+++ b/PatientScannerDemo/Models/HCert.swift
@@ -9,6 +9,11 @@ import Foundation
 import SwiftyJSON
 import JSONSchema
 
+struct InfoSection {
+  var header: String
+  var content: String
+}
+
 struct HCert {
   init?(from cborData: Data) {
     let headerStr = CBOR.header(from: cborData)?.toString() ?? "{}"
@@ -100,8 +105,14 @@ struct HCert {
   var body: JSON
 
   var fullName: String {
-    let first = body["-259"]["1"]["sub"]["gn"].string ?? ""
-    let last = body["-259"]["1"]["sub"]["fn"].string ?? ""
+    let first = body["sub"]["gn"].string ?? ""
+    let last = body["sub"]["fn"].string ?? ""
     return "\(first) \(last)"
   }
+
+  var info: [InfoSection] {
+    [
+      InfoSection(header: "Test", content: "Test Test")
+    ]
+  }
 }
diff --git a/PatientScannerDemo/Storyboards/CertificateViewer.storyboard b/PatientScannerDemo/Storyboards/CertificateViewer.storyboard
index dc5efc0..4e982ae 100644
--- a/PatientScannerDemo/Storyboards/CertificateViewer.storyboard
+++ b/PatientScannerDemo/Storyboards/CertificateViewer.storyboard
@@ -28,7 +28,7 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="734"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a9u-Ia-KEX" customClass="RoundedButton" customModule="PatientScannerDemo" customModuleProvider="target">
-                                        <rect key="frame" x="161" y="691" width="53" height="39"/>
+                                        <rect key="frame" x="149" y="679" width="77" height="51"/>
                                         <color key="backgroundColor" systemColor="systemBlueColor"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <state key="normal" title="Okay">
@@ -46,47 +46,107 @@
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Max Mustermann" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DVW-2y-e4I">
                                         <rect key="frame" x="16" y="32.000000000000007" width="343" height="114.66666666666669"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="48"/>
-                                        <nil key="textColor"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Valid ✓" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NjI-L7-yat">
                                         <rect key="frame" x="16" y="154.66666666666666" width="343" height="28.666666666666657"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="24"/>
-                                        <color key="textColor" red="0.18509497543934392" green="0.70760604776760572" blue="0.31449791917786762" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <color key="textColor" red="0.37632042253521125" green="1" blue="0.54548555866148907" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identification Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shh-mW-RSP">
-                                        <rect key="frame" x="16" y="231.33333333333331" width="173.33333333333334" height="21.666666666666657"/>
+                                        <rect key="frame" x="16" y="246.33333333333329" width="173.33333333333334" height="21.666666666666657"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                        <nil key="textColor"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DE4382974329" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rk4-u2-ei3">
-                                        <rect key="frame" x="16" y="257" width="343" height="38.333333333333314"/>
+                                        <rect key="frame" x="16" y="272" width="343" height="38.333333333333314"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
-                                        <nil key="textColor"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <segmentedControl opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="9hO-yQ-B4J">
+                                        <rect key="frame" x="16" y="199.33333333333334" width="343" height="32"/>
+                                        <segments>
+                                            <segment title="Test"/>
+                                            <segment title="Vac 1"/>
+                                            <segment title="Vac 2"/>
+                                            <segment title="Rec"/>
+                                        </segments>
+                                        <color key="selectedSegmentTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </segmentedControl>
+                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NIJ-V3-NpL">
+                                        <rect key="frame" x="0.0" y="318.33333333333326" width="375" height="328.66666666666674"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <prototypes>
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="infoCell" rowHeight="96" id="C3K-o8-BC5" customClass="InfoCell" customModule="PatientScannerDemo" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="28" width="375" height="96"/>
+                                                <autoresizingMask key="autoresizingMask"/>
+                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="C3K-o8-BC5" id="Xhy-8E-hY4">
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="999" text="DE4382974329" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbw-zt-5Bq">
+                                                            <rect key="frame" x="16" y="49.666666666666657" width="343" height="38.333333333333343"/>
+                                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="32"/>
+                                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="998" text="Identification Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1YP-3x-Q7c">
+                                                            <rect key="frame" x="16" y="8" width="343" height="37.666666666666664"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="bottom" secondItem="dbw-zt-5Bq" secondAttribute="bottom" constant="8" id="6RB-eC-VdG"/>
+                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="top" secondItem="Xhy-8E-hY4" secondAttribute="top" constant="8" id="Gqz-1L-Yoj"/>
+                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="leading" secondItem="Xhy-8E-hY4" secondAttribute="leading" constant="16" id="HXP-rX-faJ"/>
+                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="top" secondItem="1YP-3x-Q7c" secondAttribute="bottom" constant="4" id="Uwv-ga-rrc"/>
+                                                        <constraint firstAttribute="trailing" secondItem="1YP-3x-Q7c" secondAttribute="trailing" constant="16" id="WR1-qN-UTj"/>
+                                                        <constraint firstItem="1YP-3x-Q7c" firstAttribute="leading" secondItem="Xhy-8E-hY4" secondAttribute="leading" constant="16" id="YeC-zN-X9H"/>
+                                                        <constraint firstItem="dbw-zt-5Bq" firstAttribute="trailing" secondItem="Xhy-8E-hY4" secondAttribute="trailing" constant="-16" id="iKh-7R-Lby"/>
+                                                    </constraints>
+                                                </tableViewCellContentView>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <connections>
+                                                    <outlet property="contentLabel" destination="dbw-zt-5Bq" id="yhn-zI-ier"/>
+                                                    <outlet property="headerLabel" destination="1YP-3x-Q7c" id="59L-gm-Xxz"/>
+                                                </connections>
+                                            </tableViewCell>
+                                        </prototypes>
+                                    </tableView>
                                 </subviews>
                                 <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="9hO-yQ-B4J" secondAttribute="trailing" constant="16" id="1gH-1K-TaY"/>
+                                    <constraint firstItem="shh-mW-RSP" firstAttribute="top" secondItem="9hO-yQ-B4J" secondAttribute="bottom" constant="16" id="4W6-fQ-RkN"/>
                                     <constraint firstItem="DVW-2y-e4I" firstAttribute="top" secondItem="yEe-AH-rsr" secondAttribute="top" constant="32" id="6Py-fR-Th3"/>
                                     <constraint firstAttribute="trailing" secondItem="DVW-2y-e4I" secondAttribute="trailing" constant="16" id="7qh-Db-iAm"/>
                                     <constraint firstAttribute="bottom" secondItem="a9u-Ia-KEX" secondAttribute="bottom" constant="4" id="99V-nH-ZeI"/>
-                                    <constraint firstItem="shh-mW-RSP" firstAttribute="top" secondItem="NjI-L7-yat" secondAttribute="bottom" constant="48" id="Fru-bC-34N"/>
                                     <constraint firstItem="shh-mW-RSP" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="Gtl-Ej-tkw"/>
+                                    <constraint firstItem="NIJ-V3-NpL" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" id="SsD-py-p7P"/>
+                                    <constraint firstAttribute="trailing" secondItem="NIJ-V3-NpL" secondAttribute="trailing" id="bMe-Iq-2qV"/>
+                                    <constraint firstItem="9hO-yQ-B4J" firstAttribute="top" secondItem="NjI-L7-yat" secondAttribute="bottom" constant="16" id="frU-2J-Kdb"/>
                                     <constraint firstItem="DVW-2y-e4I" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="iQB-29-cRZ"/>
                                     <constraint firstItem="a9u-Ia-KEX" firstAttribute="centerX" secondItem="yEe-AH-rsr" secondAttribute="centerX" id="j6y-x9-na3"/>
                                     <constraint firstItem="Rk4-u2-ei3" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="jLL-GJ-mV7"/>
                                     <constraint firstItem="NjI-L7-yat" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="jha-Fk-syh"/>
                                     <constraint firstItem="NjI-L7-yat" firstAttribute="top" secondItem="DVW-2y-e4I" secondAttribute="bottom" constant="8" id="lP1-ux-6At"/>
+                                    <constraint firstItem="9hO-yQ-B4J" firstAttribute="leading" secondItem="yEe-AH-rsr" secondAttribute="leading" constant="16" id="mYn-Jw-TYN"/>
                                     <constraint firstAttribute="trailing" secondItem="Rk4-u2-ei3" secondAttribute="trailing" constant="16" id="mqO-vV-psd"/>
                                     <constraint firstAttribute="trailing" secondItem="NjI-L7-yat" secondAttribute="trailing" constant="16" id="ox4-at-JzV"/>
+                                    <constraint firstItem="NIJ-V3-NpL" firstAttribute="top" secondItem="Rk4-u2-ei3" secondAttribute="bottom" constant="8" id="uXx-lV-Dnj"/>
                                     <constraint firstItem="Rk4-u2-ei3" firstAttribute="top" secondItem="shh-mW-RSP" secondAttribute="bottom" constant="4" id="vIy-z6-z49"/>
+                                    <constraint firstItem="a9u-Ia-KEX" firstAttribute="top" secondItem="NIJ-V3-NpL" secondAttribute="bottom" constant="32" id="wZx-rx-Vmt"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="ghT-Ae-92i"/>
-                        <color key="backgroundColor" red="0.76734521786375187" green="0.94718309859154926" blue="0.76374975203332673" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.32707966549295775" blue="0.088716190390854058" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="yEe-AH-rsr" secondAttribute="trailing" id="6hb-Qt-RV8"/>
                             <constraint firstItem="Sd1-4U-jsd" firstAttribute="top" secondItem="Zct-pN-WQt" secondAttribute="top" id="E6p-gk-4o7"/>
@@ -99,9 +159,11 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="infoTable" destination="NIJ-V3-NpL" id="MVc-Gh-ijP"/>
                         <outlet property="loadingBackground" destination="Sd1-4U-jsd" id="oGA-cg-0zT"/>
                         <outlet property="loadingBackgroundTrailing" destination="Xl8-Re-0ql" id="BX9-az-2fc"/>
                         <outlet property="nameLabel" destination="DVW-2y-e4I" id="cyN-o4-vZQ"/>
+                        <outlet property="typeSegments" destination="9hO-yQ-B4J" id="ENI-Wn-8KC"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9ZE-rf-pHy" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
diff --git a/PatientScannerDemo/ViewControllers/CertificateViewer.swift b/PatientScannerDemo/ViewControllers/CertificateViewer.swift
index ee52cf0..22efd9c 100644
--- a/PatientScannerDemo/ViewControllers/CertificateViewer.swift
+++ b/PatientScannerDemo/ViewControllers/CertificateViewer.swift
@@ -12,9 +12,11 @@ import FloatingPanel
 let DISMISS_TIMEOUT = 15.0
 
 class CertificateViewerVC: UIViewController {
-  @IBOutlet var nameLabel: UILabel!
-  @IBOutlet var loadingBackground: UIView!
-  @IBOutlet var loadingBackgroundTrailing: NSLayoutConstraint!
+  @IBOutlet weak var nameLabel: UILabel!
+  @IBOutlet weak var loadingBackground: UIView!
+  @IBOutlet weak var loadingBackgroundTrailing: NSLayoutConstraint!
+  @IBOutlet weak var typeSegments: UISegmentedControl!
+  @IBOutlet weak var infoTable: UITableView!
 
   var hCert: HCert! {
     didSet {
@@ -26,10 +28,17 @@ class CertificateViewerVC: UIViewController {
 
   func draw() {
     nameLabel.text = hCert.fullName
+    infoTable.reloadData()
   }
 
   override func viewDidLoad() {
     super.viewDidLoad()
+    // selected option color
+    typeSegments.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.black], for: .selected)
+    // color of other options
+    typeSegments.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal)
+
+    infoTable.dataSource = self
 
     return
   }
@@ -59,3 +68,18 @@ class CertificateViewerVC: UIViewController {
     dismiss(animated: true, completion: nil)
   }
 }
+
+extension CertificateViewerVC: UITableViewDataSource {
+  func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    return hCert.info.count
+  }
+
+  func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let base = tableView.dequeueReusableCell(withIdentifier: "infoCell", for: indexPath)
+    guard let cell = base as? InfoCell else {
+      return base
+    }
+    cell.draw(hCert.info[indexPath.row])
+    return cell
+  }
+}
diff --git a/PatientScannerDemo/ViewControllers/Scan.swift b/PatientScannerDemo/ViewControllers/Scan.swift
index 097c519..c3a82b9 100644
--- a/PatientScannerDemo/ViewControllers/Scan.swift
+++ b/PatientScannerDemo/ViewControllers/Scan.swift
@@ -27,11 +27,11 @@ class ScanVC: UIViewController {
 
   override func viewDidLoad() {
     super.viewDidLoad()
-    checkPermissions()
-    setupCameraLiveView()
-//    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-//      self.observationHandler(payloadS: nil)
-//    }
+//    checkPermissions()
+//    setupCameraLiveView()
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+      self.observationHandler(payloadS: nil)
+    }
   }
   override func viewWillDisappear(_ animated: Bool) {
     super.viewWillDisappear(animated)