eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-12 07:10:55 +00:00
Code Activity

- fixed: settings and about dialogs

Browse Source
This commit is contained in:
Konstantin Gonikman committed 2016-04-20 16:33:29 +02:00
1 parent 51e86f9fcc
commit 2ed571a54d
5 files changed
+23 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ios/SAPTracker/src/xcode/SAPTracker/Base.lproj/Main.storyboard
+11 -16
View File
@@ -213,8 +213,8 @@
<outlet property="vSplashScreen" destination="4Od-pk-xCd" id="3sj-Mx-34I"/>
<segue destination="G3a-SV-Maf" kind="show" identifier="Regatta" id="FMW-37-go1"/>
<segue destination="plm-Uw-c62" kind="show" identifier="Scan" id="U8l-If-CrF"/>
<segue destination="4Fb-v3-mkB" kind="presentation" identifier="Settings" id="Xxn-jp-xEB"/>
<segue destination="dfN-Ch-vpm" kind="presentation" identifier="About" id="QMa-LQ-D8c"/>
<segue destination="4Fb-v3-mkB" kind="presentation" identifier="SettingsFromHome" id="Xxn-jp-xEB"/>
<segue destination="dfN-Ch-vpm" kind="presentation" identifier="AboutFromHome" id="QMa-LQ-D8c"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
@@ -803,9 +803,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cached Fixes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="Ujw-jg-ilY">
<rect key="frame" x="20" y="71" width="102.5" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="aFo-6u-YNo">
<variation key="heightClass=compact" constant="0.0"/>
</constraint>
<constraint firstAttribute="height" constant="24" id="aFo-6u-YNo"/>
</constraints>
<fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -814,9 +812,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="dz3-w7-CCh">
<rect key="frame" x="570" y="71" width="10" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="itl-Pi-yYx">
<variation key="heightClass=compact" constant="0.0"/>
</constraint>
<constraint firstAttribute="height" constant="24" id="itl-Pi-yYx"/>
</constraints>
<fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="17"/>
<nil key="highlightedColor"/>
@@ -875,9 +871,7 @@
<constraints>
<constraint firstAttribute="trailingMargin" secondItem="tJY-RR-vpe" secondAttribute="trailing" id="4KI-fl-gq3"/>
<constraint firstAttribute="trailingMargin" secondItem="dz3-w7-CCh" secondAttribute="trailing" id="5YC-rH-Z2d"/>
<constraint firstItem="Ujw-jg-ilY" firstAttribute="top" secondItem="r6d-OU-cRI" secondAttribute="bottom" constant="8" symbolic="YES" id="76Y-1b-oFJ">
<variation key="heightClass=compact" constant="0.0"/>
</constraint>
<constraint firstItem="Ujw-jg-ilY" firstAttribute="top" secondItem="r6d-OU-cRI" secondAttribute="bottom" constant="8" symbolic="YES" id="76Y-1b-oFJ"/>
<constraint firstAttribute="trailingMargin" secondItem="mnl-aL-6R2" secondAttribute="trailing" id="8vV-66-vsk"/>
<constraint firstItem="UcT-H2-Fxp" firstAttribute="top" secondItem="Xww-rc-pOA" secondAttribute="bottom" constant="8" symbolic="YES" id="9el-UI-bzr"/>
<constraint firstItem="UcT-H2-Fxp" firstAttribute="bottom" secondItem="nE0-bK-d8x" secondAttribute="top" id="C25-aA-8XZ"/>
@@ -935,9 +929,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tracking Time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="IeZ-JM-OWw">
<rect key="frame" x="20" y="0.0" width="109.5" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="HVj-ZO-f4Y">
<variation key="heightClass=compact" constant="0.0"/>
</constraint>
<constraint firstAttribute="height" constant="24" id="HVj-ZO-f4Y"/>
</constraints>
<fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -988,6 +980,9 @@
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Speed" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V9h-qX-rao">
<rect key="frame" x="20" y="0.0" width="49.5" height="23.5"/>
<constraints>
<constraint firstAttribute="height" constant="23.5" id="lKq-NM-hVD"/>
</constraints>
<fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@@ -1559,7 +1554,7 @@ Cg
<image name="settings" width="22" height="22"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="Xxn-jp-xEB"/>
<segue reference="QMa-LQ-D8c"/>
<segue reference="tzB-PL-31j"/>
<segue reference="Irs-ey-Uhs"/>
</inferredMetricsTieBreakers>
</document>
ios/SAPTracker/src/xcode/SAPTracker/HomeViewController.swift
+6 -2
View File
@@ -166,12 +166,16 @@ class HomeViewController: UIViewController, UITableViewDataSource, UITableViewDe
}
let aSettings = UIAlertAction(title: NSLocalizedString("Settings", comment: ""), style: .Default) { (action) -> Void in
self.performSegueWithIdentifier("Settings", sender: actionSheet)
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(0.6 * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) { () -> Void in
self.performSegueWithIdentifier("SettingsFromHome", sender: actionSheet)
}
}
actionSheet.addAction(aSettings)
let aAbout = UIAlertAction(title: NSLocalizedString("About", comment: ""), style: .Default) { (action) -> Void in
self.performSegueWithIdentifier("About", sender: actionSheet)
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(0.6 * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) { () -> Void in
self.performSegueWithIdentifier("AboutFromHome", sender: actionSheet)
}
}
actionSheet.addAction(aAbout)
ios/SAPTracker/src/xcode/SAPTracker/Info.plist
+1 -1
View File
@@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>35</string>
<string>37</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
ios/SAPTracker/src/xcode/SAPTracker/LaunchScreen.storyboard
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
</dependencies>
<scenes>
ios/SAPTracker/src/xcode/SAPTracker/RegattaViewController.swift
+3 -1
View File
@@ -224,7 +224,9 @@ class RegattaViewController : UIViewController, UIActionSheetDelegate, UINavigat
case 0:
showCheckOutAlertView()
case 1:
performSegueWithIdentifier("Settings", sender: actionSheet)
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(0.6 * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) { () -> Void in
self.performSegueWithIdentifier("Settings", sender: actionSheet)
}
break
case 2:
showImageAlertView(actionSheet)