Merge branch 'release/1.0.0'

MiniSpaceJourney WatchKit App/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

MiniSpaceJourney WatchKit App/en.lproj/Interface.storyboard

@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14490.70" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="kfn-Bo-AGf">
-    <device id="watch38" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="15505" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="kfn-Bo-AGf">
+    <device id="watch38"/>
     <dependencies>
-        <deployment identifier="watchOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14490.21"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="15501"/>
     </dependencies>
     <scenes>
         <!--Menu-->
         <scene sceneID="CzN-PW-ubj">
             <objects>
-                <controller identifier="MainMenu" title="Menu" id="kfn-Bo-AGf" customClass="MainMenuController" customModule="MiniSpaceJourney" customModuleProvider="target">
+                <controller identifier="MainMenu" title="Menu" id="kfn-Bo-AGf" customClass="MainMenuController" customModule="MiniSpaceJourney_WatchKit_App" customModuleProvider="target">
                     <items>
-                        <label height="40" alignment="left" text="Mini Space Journey" textAlignment="center" minimumScaleFactor="0.90000000000000002" id="YYM-0V-GaN"/>
+                        <label width="1" height="61" alignment="left" text="Mini Space Journey" textAlignment="center" numberOfLines="2" id="YYM-0V-GaN">
+                            <fontDescription key="font" style="UICTFontTextStyleTitle3"/>
+                        </label>
+                        <label height="30" alignment="left" text="Highest score: 0" id="4gk-lV-rf4"/>
                         <button width="1" alignment="center" title="Play 🚀" id="GEZ-Qr-nAa">
                             <fontDescription key="font" type="system" pointSize="24"/>
                             <connections>
                                 <segue destination="AgC-eL-Hgc" kind="push" id="Vy2-YZ-CVT"/>
                             </connections>
                         </button>
-                        <button width="1" alignment="left" title="Settings" id="UAF-QU-lXC">
+                        <button width="1" alignment="left" hidden="YES" title="Settings" id="UAF-QU-lXC">
                             <fontDescription key="font" type="system" pointSize="20"/>
                             <connections>
                                 <segue destination="mZe-Cs-aIe" kind="push" id="yse-sB-mfv"/>
                             </connections>
                         </button>
                     </items>
+                    <variation key="default">
+                        <mask key="items">
+                            <exclude reference="UAF-QU-lXC"/>
+                        </mask>
+                    </variation>
+                    <connections>
+                        <outlet property="highestScoreLabel" destination="4gk-lV-rf4" id="cye-eF-ben"/>
+                    </connections>
                 </controller>
             </objects>
             <point key="canvasLocation" x="-258" y="31"/>
         </scene>
         <!--Settings-->
         <scene sceneID="5FS-e5-3MO">
             <objects>
-                <controller identifier="SettingsMenu" title="Settings" id="mZe-Cs-aIe" customClass="SettingsMenuController" customModule="MiniSpaceJourney" customModuleProvider="target">
+                <controller identifier="SettingsMenu" title="Settings" id="mZe-Cs-aIe" customClass="SettingsMenuController" customModule="MiniSpaceJourney_WatchKit_App" customModuleProvider="target">
                     <items>
                         <picker height="100" alignment="left" id="7bu-sK-xkA">
                             <connections>
@@ -50,7 +58,7 @@
         <!--GameScene-->
         <scene sceneID="aou-V4-d1y">
             <objects>
-                <controller identifier="GameScreen" title="GameScene" fullScreen="YES" id="AgC-eL-Hgc" customClass="GameScreenController" customModule="MiniSpaceJourney" customModuleProvider="target">
+                <controller identifier="GameScreen" title="GameScene" fullScreen="YES" id="AgC-eL-Hgc" customClass="GameScreenController" customModule="MiniSpaceJourney_WatchKit_App" customModuleProvider="target">
                     <items>
                         <spriteKitScene alignment="left" id="ARY-87-yzO">
                             <gestureRecognizers>

MiniSpaceJourney WatchKit Extension/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,146 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-Notification@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-Notification@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small-40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "filename" : "AppIcon24x24@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "filename" : "AppIcon27.5x27.5@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "AppIcon29x29@2x.png",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "AppIcon29x29@3x.png",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "filename" : "AppIcon44x44@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "filename" : "AppIcon50x50@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "filename" : "AppIcon86x86@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "filename" : "AppIcon98x98@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "filename" : "AppIcon108x108@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "watchicon.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MiniSpaceJourney WatchKit Extension/Controller/GameScreenController.swift

@@ -47,8 +47,7 @@ class GameScreenController: WKInterfaceController, WKCrownDelegate {
         let step   = NSNumber.init(value: rotationalDelta * crownSensivity).floatValue
         let cgStep = CGFloat(step)
 
-        // log whats happened
-        // print("Crown: \(cgStep)")
+        WKInterfaceDevice.current().play(.click)
 
         gameScene.moveSpaceshipBy(amountX: cgStep, amountY: 0)
     }

MiniSpaceJourney WatchKit Extension/Controller/MainMenuController.swift

@@ -10,11 +10,19 @@ import WatchKit
 
 
 class MainMenuController: WKInterfaceController {
+
+    var highestScorekey: String = "MiniSpaceJourneyHighestScore";
+
+    @IBOutlet weak var highestScoreLabel: WKInterfaceLabel!
 
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
 
         // Configure interface objects here.
+        let defaults = UserDefaults.standard;
+        let highestScore = defaults.integer(forKey: self.highestScorekey);
+
+        highestScoreLabel.setText("Highest score: \(highestScore)");
     }
 
     override func willActivate() {