Merge branch 'develop'

Author: tyburg

Podfile

@@ -1,9 +1,9 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '12.0'
 
 inhibit_all_warnings!
 
 target 'mapcache-ios' do
-  pod 'geopackage-ios', '~> 4.0.1'
+  pod 'geopackage-ios', '~> 6.0.0'
   pod 'Fingertips', '~> 0.5.0'
 end

mapcache-ios-geopackage.sketch

@@ -8,14 +8,16 @@
 
 #import "AppDelegate.h"
 #import "GPKGGeoPackageFactory.h"
-#import "GPKGSManagerViewController.h"
 #import "MCConstants.h"
 #import "MCProperties.h"
 #import "MBFingerTipWindow.h"
+#import "mapcache_ios-Swift.h"
+
 
 @interface AppDelegate ()
 @property (strong, nonatomic) NSMutableArray *childCoordinators;
 @property (strong, nonatomic) GPKGGeoPackageManager *manager;
+@property (strong, nonatomic) MCTileServerRepository *tileServerRepository;
 @property (nonatomic, strong) GPKGGeoPackageCache *geoPackages;
 @end
 
@@ -44,6 +46,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     mapCoordinator.drawerViewDelegate = drawerCoordinator;
     [_childCoordinators addObject:drawerCoordinator];
     [_childCoordinators addObject:mapCoordinator];
+    
     _window.rootViewController = mapViewController;
 
     BOOL preventDisclaimer = [[NSUserDefaults standardUserDefaults] boolForKey:@"preventDisclaimer"];
@@ -55,6 +58,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     _manager = [GPKGGeoPackageFactory manager];
     _geoPackages = [[GPKGGeoPackageCache alloc] initWithManager:self.manager];
 
+    _tileServerRepository = [MCTileServerRepository shared];
+    [_tileServerRepository loadUserDefaults];
+    
     return YES;
 }
 
@@ -141,8 +147,6 @@ - (BOOL) application:(UIApplication *)application openURL:(NSURL *)
 
 
 - (void) setupApplicationAppearance {
-    UIApplication.sharedApplication.statusBarStyle = UIStatusBarStyleLightContent;
-    
     [[UINavigationBar appearance] setBarTintColor:[MCColorUtil getPrimary]];
     [[UINavigationBar appearance] setTintColor:[UIColor whiteColor]];
     [[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];

mapcache-ios.xcodeproj/project.pbxproj

@@ -1,11 +1,10 @@
 <?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" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="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="17703"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,19 +17,31 @@
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LoadingScreen" translatesAutoresizingMaskIntoConstraints="NO" id="ezn-dY-R42">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                 </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VOr-px-ERH">
+                    <rect key="frame" x="0.0" y="239" width="375" height="428"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="ezn-dY-R42" secondAttribute="bottom" id="3a5-9Q-kcb"/>
+                <constraint firstItem="VOr-px-ERH" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="4Lg-kq-t0z"/>
+                <constraint firstItem="VOr-px-ERH" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="9Xo-q0-Edu"/>
                 <constraint firstItem="ezn-dY-R42" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="EDG-Qv-2Dk"/>
                 <constraint firstItem="ezn-dY-R42" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="MqU-qm-rgN"/>
+                <constraint firstAttribute="bottom" secondItem="VOr-px-ERH" secondAttribute="bottom" id="dsy-NT-WPN"/>
+                <constraint firstItem="VOr-px-ERH" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="239" id="lCk-os-gn5"/>
                 <constraint firstAttribute="trailing" secondItem="ezn-dY-R42" secondAttribute="trailing" id="p0X-1N-1ad"/>
+                <constraint firstAttribute="trailing" secondItem="VOr-px-ERH" secondAttribute="trailing" id="z6u-M3-BLa"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
+            <point key="canvasLocation" x="548" y="454.72263868065971"/>
         </view>
     </objects>
     <resources>
         <image name="LoadingScreen" width="375" height="667"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

mapcache-ios/AppDelegate.m

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

mapcache-ios/Base.lproj/LaunchScreen.xib

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Layer.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}