Rename repo and app

Caps.xcodeproj/project.pbxproj

@@ -59,7 +59,7 @@
 		88A89ECD25AF420F00323B64 /* DispatchGroup+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DispatchGroup+Extensions.swift"; sourceTree = "<group>"; };
 		CE0A501024752A9800A9E753 /* TileImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileImage.swift; sourceTree = "<group>"; };
 		CE0A5012247D745200A9E753 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
-		CE56CECA209D81DD00932C01 /* CapCollector.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CapCollector.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		CE56CECA209D81DD00932C01 /* Caps.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Caps.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CE56CECD209D81DE00932C01 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		CE56CED2209D81DE00932C01 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		CE56CED4209D81E000932C01 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -107,7 +107,7 @@
 		CE56CEC1209D81DD00932C01 = {
 			isa = PBXGroup;
 			children = (
-				CE56CECC209D81DD00932C01 /* CapCollector */,
+				CE56CECC209D81DD00932C01 /* Caps */,
 				CE56CECB209D81DD00932C01 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -115,12 +115,12 @@
 		CE56CECB209D81DD00932C01 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				CE56CECA209D81DD00932C01 /* CapCollector.app */,
+				CE56CECA209D81DD00932C01 /* Caps.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CE56CECC209D81DD00932C01 /* CapCollector */ = {
+		CE56CECC209D81DD00932C01 /* Caps */ = {
 			isa = PBXGroup;
 			children = (
 				CE56CECD209D81DE00932C01 /* AppDelegate.swift */,
@@ -133,7 +133,7 @@
 				CE56CEF3209D83B600932C01 /* Logger.swift */,
 				CE56CEDF209D81FD00932C01 /* Support */,
 			);
-			path = CapCollector;
+			path = Caps;
 			sourceTree = "<group>";
 		};
 		CE56CEDF209D81FD00932C01 /* Support */ = {
@@ -217,9 +217,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		CE56CEC9209D81DD00932C01 /* CapCollector */ = {
+		CE56CEC9209D81DD00932C01 /* Caps */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = CE56CEDC209D81E000932C01 /* Build configuration list for PBXNativeTarget "CapCollector" */;
+			buildConfigurationList = CE56CEDC209D81E000932C01 /* Build configuration list for PBXNativeTarget "Caps" */;
 			buildPhases = (
 				CE56CEC6209D81DD00932C01 /* Sources */,
 				CE56CEC7209D81DD00932C01 /* Frameworks */,
@@ -229,13 +229,13 @@
 			);
 			dependencies = (
 			);
-			name = CapCollector;
+			name = Caps;
 			packageProductDependencies = (
 				CEB269562445DB56004B74B3 /* SQLite */,
 				CE5B7D022458C921002E5C06 /* Reachability */,
 			);
 			productName = CapCollector;
-			productReference = CE56CECA209D81DD00932C01 /* CapCollector.app */;
+			productReference = CE56CECA209D81DD00932C01 /* Caps.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -259,7 +259,7 @@
 					};
 				};
 			};
-			buildConfigurationList = CE56CEC5209D81DD00932C01 /* Build configuration list for PBXProject "CapCollector" */;
+			buildConfigurationList = CE56CEC5209D81DD00932C01 /* Build configuration list for PBXProject "Caps" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -276,7 +276,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				CE56CEC9209D81DD00932C01 /* CapCollector */,
+				CE56CEC9209D81DD00932C01 /* Caps */,
 			);
 		};
 /* End PBXProject section */
@@ -481,14 +481,14 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = H8WR4M6QQ4;
-				INFOPLIST_FILE = CapCollector/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Caps/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.4;
-				PRODUCT_BUNDLE_IDENTIFIER = christophhagen.CapCollector;
+				PRODUCT_BUNDLE_IDENTIFIER = de.christophhagen.Caps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -504,14 +504,14 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = H8WR4M6QQ4;
-				INFOPLIST_FILE = CapCollector/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Caps/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.4;
-				PRODUCT_BUNDLE_IDENTIFIER = christophhagen.CapCollector;
+				PRODUCT_BUNDLE_IDENTIFIER = de.christophhagen.Caps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -523,7 +523,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		CE56CEC5209D81DD00932C01 /* Build configuration list for PBXProject "CapCollector" */ = {
+		CE56CEC5209D81DD00932C01 /* Build configuration list for PBXProject "Caps" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				CE56CEDA209D81E000932C01 /* Debug */,
@@ -532,7 +532,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		CE56CEDC209D81E000932C01 /* Build configuration list for PBXNativeTarget "CapCollector" */ = {
+		CE56CEDC209D81E000932C01 /* Build configuration list for PBXNativeTarget "Caps" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				CE56CEDD209D81E000932C01 /* Debug */,

Caps.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ashleymills/Reachability.swift",
         "state": {
           "branch": null,
-          "revision": "98e968e7b6c1318fb61df23e347bc319761e8acb",
+          "revision": "c01bbdf2d633cf049ae1ed1a68a2020a8bda32e2",
-          "version": "5.0.0"
+          "version": "5.1.0"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/stephencelis/SQLite.swift",
         "state": {
           "branch": null,
-          "revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1",
+          "revision": "5f5ad81ac0d0a0f3e56e39e646e8423c617df523",
-          "version": "0.12.2"
+          "version": "0.13.2"
         }
       }
     ]

Caps.xcodeproj/xcuserdata/ch.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CapCollector.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>SQLite (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>SQLite (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+		<key>SQLite (Playground) 3.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>SQLite (Playground) 4.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+		<key>SQLite (Playground) 5.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
+		<key>SQLite (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

Caps/Base.lproj/Main.storyboard

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="qlf-I7-aOI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="qlf-I7-aOI">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -101,7 +102,7 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cap" rowHeight="100" id="B8D-Az-9Y6" customClass="CapCell" customModule="CapCollector" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="100"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="B8D-Az-9Y6" id="oId-SE-Vio">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
@@ -123,18 +124,18 @@
                                             </userDefinedRuntimeAttributes>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="# images" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jmW-Bp-iEs">
-                                            <rect key="frame" x="106" y="10" width="70" height="20.5"/>
+                                            <rect key="frame" x="106" y="10" width="59" height="17"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" systemColor="secondaryLabelColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Some brand with a long name of more than one line" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRK-Je-2c8">
-                                            <rect key="frame" x="106" y="32.5" width="261" height="54.5"/>
+                                            <rect key="frame" x="106" y="29" width="261" height="47"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="71 % match" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0S2-Kl-IEy">
-                                            <rect key="frame" x="279" y="10" width="88" height="21"/>
+                                            <rect key="frame" x="292" y="10" width="75" height="17"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" systemColor="secondaryLabelColor"/>
                                             <nil key="highlightedColor"/>
@@ -174,7 +175,7 @@
                                 <action selector="updateInfo:forEvent:" destination="2ro-5c-16N" id="MDf-gM-ErC"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" title="Item" image="circles.hexagongrid" catalog="system" id="Bii-kx-Exm">
+                        <barButtonItem key="rightBarButtonItem" title="Item" image="circle.hexagongrid" catalog="system" id="Bii-kx-Exm">
                             <connections>
                                 <action selector="showMosaic:" destination="2ro-5c-16N" id="TSM-H0-ljH"/>
                             </connections>
@@ -353,14 +354,14 @@
                         <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="SortCell" textLabel="2cU-Pz-MYZ" rowHeight="40" style="IBUITableViewCellStyleDefault" id="vYb-0s-NQp">
-                                <rect key="frame" x="0.0" y="73.5" width="150" height="40"/>
+                                <rect key="frame" x="0.0" y="49.5" width="150" height="40"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vYb-0s-NQp" id="8bD-vd-HWF">
-                                    <rect key="frame" x="0.0" y="0.0" width="110" height="40"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="113.5" height="40"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Ascending" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2cU-Pz-MYZ">
-                                            <rect key="frame" x="16" y="0.0" width="86" height="40"/>
+                                            <rect key="frame" x="16" y="0.0" width="89.5" height="40"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
@@ -407,7 +408,7 @@
     <resources>
         <image name="arrow.clockwise.icloud" catalog="system" width="128" height="88"/>
         <image name="camera" catalog="system" width="128" height="94"/>
-        <image name="circles.hexagongrid" catalog="system" width="128" height="112"/>
+        <image name="circle.hexagongrid" catalog="system" width="128" height="112"/>
         <image name="xmark" catalog="system" width="128" height="113"/>
         <systemColor name="secondaryLabelColor">
             <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>

Caps/Capture/PhotoCaptureHandler.swift

@@ -38,7 +38,7 @@ extension PhotoCaptureHandler: AVCapturePhotoCaptureDelegate {
             return
         }
 
-        guard let cgImage = photo.cgImageRepresentation()?.takeUnretainedValue() else {
+        guard let cgImage = photo.cgImageRepresentation() else {
             log("PhotoCaptureHandler: No image captured")
             delegate?.didCapture(nil)
             return

Caps/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Cap Collector</string>
+	<string>Caps</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>