Skip to content
This repository has been archived by the owner on Oct 15, 2018. It is now read-only.

Commit

Permalink
Bump to version 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreamazz
andreamazz committed Sep 27, 2016
1 parent 8fc3fd9 commit e501a03
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 103 deletions.
48 changes: 8 additions & 40 deletions Gulps WatchKit App/Base.lproj/Interface.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="AgC-eL-Hgc">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="9019"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11077"/>
</dependencies>
<scenes>
<!--InterfaceController-->
Expand All @@ -13,7 +13,7 @@
<group width="1" height="1" alignment="left" layout="vertical" id="djR-KX-Wvu">
<items>
<label width="1" alignment="left" text="DAILY GOAL: 0%" textAlignment="center" numberOfLines="0" id="jsO-fa-6Yq">
<color key="textColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="font" style="UICTFontTextStyleCaption2"/>
</label>
<imageView width="1" height="0.70000000000000007" alignment="left" verticalAlignment="center" image="activity-0" contentMode="scaleAspectFit" id="fDE-BM-tlV"/>
Expand Down Expand Up @@ -42,52 +42,20 @@
</objects>
<point key="canvasLocation" x="235" y="347"/>
</scene>
<!--GlanceInterface-->
<scene sceneID="BOz-TT-tkC">
<objects>
<glanceController identifier="GlanceInterface" spacing="0.0" id="0uZ-2p-rRc" customClass="GlanceController" customModule="Gulps_WatchKit_Extension">
<items>
<group alignment="left" id="t8f-Gd-c4y">
<items>
<imageView alignment="left" verticalAlignment="center" image="gulp" id="uwO-ne-ckB"/>
<label alignment="left" verticalAlignment="center" text="Gulps" id="3Gi-pF-rdn"/>
</items>
<edgeInsets key="margins" left="5" right="0.0" top="0.0" bottom="0.0"/>
</group>
<group alignment="left" layout="vertical" id="uCw-4Q-Ouw">
<items>
<label width="1" alignment="left" text="0%" textAlignment="center" id="fos-hc-9XJ">
<color key="textColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="font" type="system" pointSize="36"/>
</label>
<label width="1" alignment="left" text="of your daily goal" textAlignment="center" id="x2p-3r-dBm">
<fontDescription key="font" style="UICTFontTextStyleFootnote"/>
</label>
</items>
</group>
</items>
<edgeInsets key="margins" left="0.0" right="0.0" top="0.0" bottom="14"/>
<connections>
<outlet property="percentageLabel" destination="fos-hc-9XJ" id="Z9b-s0-txG"/>
</connections>
</glanceController>
</objects>
<point key="canvasLocation" x="235" y="672"/>
</scene>
<!--Static Notification Interface Controller-->
<scene sceneID="AEw-b0-oYE">
<objects>
<notificationController id="YCC-NB-fut">
<items>
<label width="0.90000000000000002" alignment="center" text="Remember to drink some water!" textAlignment="center" numberOfLines="0" id="XkS-y5-khE">
<color key="textColor" red="0.92424242420000002" green="0.92424242420000002" blue="0.92424242420000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.92424242420000002" green="0.92424242420000002" blue="0.92424242420000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="font" style="UICTFontTextStyleBody"/>
</label>
</items>
<notificationCategory key="notificationCategory" identifier="GULP_CATEGORY" id="JfB-70-Muf">
<color key="sashColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="calibratedRGB"/>
<color key="sashColor" red="0.15686274510000001" green="0.3921568627" blue="0.7725490196" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</notificationCategory>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="notificationAlertLabel" destination="XkS-y5-khE" id="49B-RR-99y"/>
</connections>
Expand Down
4 changes: 2 additions & 2 deletions Gulps WatchKit App/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.7</string>
<string>1.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>24</string>
<string>28</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
23 changes: 0 additions & 23 deletions Gulps WatchKit Extension/GlanceController.swift
View file

This file was deleted.

4 changes: 2 additions & 2 deletions Gulps WatchKit Extension/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.7</string>
<string>1.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>24</string>
<string>28</string>
<key>CLKComplicationPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
<key>CLKComplicationSupportedFamilies</key>
Expand Down
4 changes: 2 additions & 2 deletions Gulps WatchKit Extension/WatchEntryHelper.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class WatchEntryHelper {
lazy var userDefaults = UserDefaults.standard

/**
Save settings received by
Save settings received from the phone
- parameter goal: The daily goal
- parameter current: The current progress
- parameter small: The small portion size
Expand All @@ -21,7 +21,7 @@ class WatchEntryHelper {
}

/**
Save settings received by
Save settings received from the phone
- parameter portion: The portion key
*/
func addGulp(_ portion: String) {
Expand Down
Loading

0 comments on commit e501a03

Please sign in to comment.