From d02298a1d1c793c571a00c2cc88b72b7617dd0a9 Mon Sep 17 00:00:00 2001
From: Tyler Burgett <tyler.j.burgett.ctr@nga.mil>
Date: Fri, 4 Oct 2019 14:51:33 -0600
Subject: [PATCH] Text fixes

---
 mapcache-ios.xcodeproj/project.pbxproj             |  4 ++--
 mapcache-ios/geopackage/MCGeoPackageList.m         | 14 ++++++++++++--
 .../DisplayCells/MCGeoPackageOperationsCell.xib    | 14 ++++++--------
 mapcache-ios/views/MCDownloadGeopackage.xib        |  6 +++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/mapcache-ios.xcodeproj/project.pbxproj b/mapcache-ios.xcodeproj/project.pbxproj
index de9f1c5..6915e88 100644
--- a/mapcache-ios.xcodeproj/project.pbxproj
+++ b/mapcache-ios.xcodeproj/project.pbxproj
@@ -1280,7 +1280,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = ZL8G5D9G2H;
 				INFOPLIST_FILE = "mapcache-ios/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -1299,7 +1299,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = ZL8G5D9G2H;
 				INFOPLIST_FILE = "mapcache-ios/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
diff --git a/mapcache-ios/geopackage/MCGeoPackageList.m b/mapcache-ios/geopackage/MCGeoPackageList.m
index 95311e2..277a24f 100644
--- a/mapcache-ios/geopackage/MCGeoPackageList.m
+++ b/mapcache-ios/geopackage/MCGeoPackageList.m
@@ -158,8 +158,18 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         GPKGSDatabase *database = [_geoPackages objectAtIndex:indexPath.row];
         
         cell.geoPackageNameLabel.text = database.name;
-        cell.featureLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Feature layers", (long)[database getFeatures].count];
-        cell.tileLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Tile layers", (long)[database getTileCount]];
+        
+        if ([database getFeatures].count == 1) {
+            cell.featureLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Feature layer", (long)[database getFeatures].count];
+        } else {
+            cell.featureLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Feature layers", (long)[database getFeatures].count];
+        }
+        
+        if ([database getTileCount] == 1) {
+            cell.tileLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Tile layer", (long)[database getTileCount]];
+        } else {
+            cell.tileLayerDetailsLabel.text = [NSString stringWithFormat:@"%ld Tile layers", (long)[database getTileCount]];
+        }
         
         if ([_active isActive:database]) {
             [cell activeLayersIndicatorOn];
diff --git a/mapcache-ios/views/DisplayCells/MCGeoPackageOperationsCell.xib b/mapcache-ios/views/DisplayCells/MCGeoPackageOperationsCell.xib
index 24864a5..828b25a 100644
--- a/mapcache-ios/views/DisplayCells/MCGeoPackageOperationsCell.xib
+++ b/mapcache-ios/views/DisplayCells/MCGeoPackageOperationsCell.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -22,7 +20,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Feo-qb-1yY">
                             <rect key="frame" x="0.0" y="0.0" width="94" height="70"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="-31" minY="0.0" maxX="0.0" maxY="-38"/>
+                            <inset key="titleEdgeInsets" minX="-37" minY="0.0" maxX="0.0" maxY="-38"/>
                             <inset key="imageEdgeInsets" minX="28" minY="-28" maxX="0.0" maxY="0.0"/>
                             <state key="normal" title="Rename" image="Edit">
                                 <color key="titleColor" red="0.29411764709999999" green="0.6705882353" blue="0.68627450980000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -34,7 +32,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rBQ-Gx-QK3">
                             <rect key="frame" x="94" y="0.0" width="93.5" height="70"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="-34" minY="0.0" maxX="0.0" maxY="-38"/>
+                            <inset key="titleEdgeInsets" minX="-36" minY="0.0" maxX="0.0" maxY="-38"/>
                             <inset key="imageEdgeInsets" minX="30" minY="-28" maxX="0.0" maxY="0.0"/>
                             <state key="normal" title="Share" image="Share">
                                 <color key="titleColor" red="0.29411764709999999" green="0.6705882353" blue="0.68627450980000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -58,7 +56,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jph-2y-YgO">
                             <rect key="frame" x="281.5" y="0.0" width="93.5" height="70"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="-31" minY="0.0" maxX="0.0" maxY="-38"/>
+                            <inset key="titleEdgeInsets" minX="-34" minY="0.0" maxX="0.0" maxY="-38"/>
                             <inset key="imageEdgeInsets" minX="30" minY="-28" maxX="0.0" maxY="0.0"/>
                             <state key="normal" title="Delete" image="Delete">
                                 <color key="titleColor" red="0.97575825449999998" green="0.38110277059999997" blue="0.28535854820000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/mapcache-ios/views/MCDownloadGeopackage.xib b/mapcache-ios/views/MCDownloadGeopackage.xib
index 090e72a..35d5724 100644
--- a/mapcache-ios/views/MCDownloadGeopackage.xib
+++ b/mapcache-ios/views/MCDownloadGeopackage.xib
@@ -129,12 +129,12 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <textInputTraits key="textInputTraits"/>
                                 </textField>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GeoPackage Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QZB-QV-48k">
-                                    <rect key="frame" x="20" y="68" width="130.5" height="18"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QZB-QV-48k">
+                                    <rect key="frame" x="20" y="68" width="40.5" height="18"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Download from URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b95-gl-eU7">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Download a GeoPackage" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b95-gl-eU7">
                                     <rect key="frame" x="20" y="28" width="335" height="24"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                     <nil key="highlightedColor"/>