Skip to content

Commit

Permalink
Text fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Burgett committed Oct 4, 2019
1 parent 083dac5 commit d02298a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 15 deletions.
4 changes: 2 additions & 2 deletions mapcache-ios.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
14 changes: 12 additions & 2 deletions mapcache-ios/geopackage/MCGeoPackageList.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
14 changes: 6 additions & 8 deletions mapcache-ios/views/DisplayCells/MCGeoPackageOperationsCell.xib
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand Down
6 changes: 3 additions & 3 deletions mapcache-ios/views/MCDownloadGeopackage.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down

0 comments on commit d02298a

Please sign in to comment.