Merge pull request #63 from mattermost/PLT-8327

PLT-8327 removing spacing
mattermost · Dec 15, 2017 · c060d62 · c060d62
2 parents ef20b20 + b53dc39
commit c060d62
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/Mattermost/Base.lproj/Main.storyboard b/Mattermost/Base.lproj/Main.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Tb4-yk-oRs">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Tb4-yk-oRs">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -118,14 +119,14 @@
                                 <exclude reference="eOu-wY-L4h"/>
                                 <exclude reference="hIu-9f-nxp"/>
                                 <exclude reference="l7j-aj-O4T"/>
+                                <exclude reference="jCS-dB-t4w"/>
+                                <exclude reference="rhx-k5-bVA"/>
                                 <exclude reference="2Uo-rN-Pd7"/>
                                 <exclude reference="LJq-sq-nc8"/>
                                 <exclude reference="NyJ-3g-Dne"/>
                                 <exclude reference="Qi7-hr-nU8"/>
                                 <exclude reference="SES-AK-Bcx"/>
                                 <exclude reference="Z7r-ui-B4U"/>
-                                <exclude reference="jCS-dB-t4w"/>
-                                <exclude reference="rhx-k5-bVA"/>
                                 <exclude reference="1XC-LX-KkS"/>
                                 <exclude reference="RBq-M8-mSe"/>
                             </mask>
@@ -293,11 +294,11 @@
                         <viewControllerLayoutGuide type="bottom" id="uyC-uS-asL"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="D6w-fx-6Jx">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VLP-5K-hJS">
-                                <rect key="frame" x="0.0" y="20" width="375" height="583"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                                 <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </webView>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="CTC-Ae-BI3">
@@ -306,7 +307,7 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="VLP-5K-hJS" firstAttribute="top" secondItem="D6w-fx-6Jx" secondAttribute="topMargin" constant="20" id="2Gb-J9-G7f"/>
+                            <constraint firstItem="VLP-5K-hJS" firstAttribute="top" secondItem="D6w-fx-6Jx" secondAttribute="topMargin" id="2Gb-J9-G7f"/>
                             <constraint firstAttribute="centerX" secondItem="CTC-Ae-BI3" secondAttribute="centerX" id="3Kx-fu-mPC"/>
                             <constraint firstItem="VLP-5K-hJS" firstAttribute="leading" secondItem="D6w-fx-6Jx" secondAttribute="leading" id="DZi-J0-44G"/>
                             <constraint firstAttribute="centerX" secondItem="CTC-Ae-BI3" secondAttribute="centerX" id="LKQ-0V-hji"/>
@@ -472,10 +473,10 @@
         <!--Navigation Controller-->
         <scene sceneID="hvB-ip-MAe">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Tb4-yk-oRs" sceneMemberID="viewController">
+                <navigationController id="Tb4-yk-oRs" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="dT8-O7-4xH">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="barTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">

diff --git a/Mattermost/HomeViewController.swift b/Mattermost/HomeViewController.swift
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 import UIKit
+import JavaScriptCore
 
 
 class MyURLProtocol: URLProtocol {
@@ -160,6 +161,14 @@ class HomeViewController: UIViewController, UIWebViewDelegate, MattermostApiProt
         self.navigationController?.isNavigationBarHidden = true
         api.delegate = self
 
+        let context = webView.value(forKeyPath: "documentView.webView.mainFrame.javaScriptContext") as! JSContext
+        let logFunction : @convention(block) (String) -> Void =
+        {
+            (msg: String) in
+            NSLog("Console: %@", msg)
+        }
+        context.objectForKeyedSubscript("console").setObject(unsafeBitCast(logFunction, to: AnyObject.self), forKeyedSubscript: "log" as NSCopying & NSObjectProtocol)
+
         let type: UIUserNotificationType = [UIUserNotificationType.badge, UIUserNotificationType.alert, UIUserNotificationType.sound];
         let setting = UIUserNotificationSettings(types: type, categories: nil);
         UIApplication.shared.registerUserNotificationSettings(setting);

diff --git a/Mattermost/Info.plist b/Mattermost/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.10.2</string>
+	<string>3.10.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>41</string>
+	<string>42</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>