updates
This commit is contained in:
Max Hunt
parent
905f8d1b8c
commit
3c7e28fe78
38
Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json
Normal file
38
Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"colors" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"red" : "1.000",
|
||||
"alpha" : "1.000",
|
||||
"blue" : "0.000",
|
||||
"green" : "0.179"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"appearances" : [
|
||||
{
|
||||
"appearance" : "luminosity",
|
||||
"value" : "dark"
|
||||
}
|
||||
],
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"red" : "0.055",
|
||||
"alpha" : "1.000",
|
||||
"blue" : "1.000",
|
||||
"green" : "0.138"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -3,6 +3,7 @@
|
||||
<device id="retina6_5" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
|
||||
<capability name="Named colors" minToolsVersion="9.0"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
<capability name="iOS 13.0 system colors" minToolsVersion="11.0"/>
|
||||
@ -444,7 +445,7 @@ wear Guibe?</string>
|
||||
<rect key="frame" x="20" y="124" width="374" height="67"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Xt-Rr-hs1" userLabel="searchBarBg">
|
||||
<button opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Xt-Rr-hs1" userLabel="searchBarBg">
|
||||
<rect key="frame" x="0.0" y="8" width="374" height="59"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
@ -505,7 +506,7 @@ wear Guibe?</string>
|
||||
<action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
|
||||
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
|
||||
<rect key="frame" x="-34" y="-24" width="347" height="489"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
@ -806,11 +807,7 @@ wear Guibe?</string>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="5OC-U4-KxU">
|
||||
<rect key="frame" x="20" y="91" width="374" height="10"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="settingsScreen" translatesAutoresizingMaskIntoConstraints="NO" id="mY9-zh-MBf">
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="settingsScreen" translatesAutoresizingMaskIntoConstraints="NO" id="mY9-zh-MBf">
|
||||
<rect key="frame" x="0.0" y="-48" width="414" height="896"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
@ -829,15 +826,7 @@ wear Guibe?</string>
|
||||
</segue>
|
||||
</connections>
|
||||
</button>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ppx-kH-Zyc">
|
||||
<rect key="frame" x="27" y="71" width="361" height="88"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="30"/>
|
||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||
</textView>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qiS-sb-sRk">
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="How would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qiS-sb-sRk">
|
||||
<rect key="frame" x="27" y="477" width="361" height="88"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
@ -919,6 +908,46 @@ wear Guibe?</string>
|
||||
<rect key="frame" x="208" y="640" width="193" height="180"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Left hand" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TcD-cK-c7G">
|
||||
<rect key="frame" x="53" y="160" width="110" height="33"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="27"/>
|
||||
<color key="textColor" name="SetLblColour"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Right hand" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="up0-vV-Q1M">
|
||||
<rect key="frame" x="261" y="160" width="126" height="33"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="27"/>
|
||||
<color key="textColor" name="SetLblColour"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Big on top" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="evh-3D-dW2">
|
||||
<rect key="frame" x="42" y="590" width="117" height="33"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="27"/>
|
||||
<color key="textColor" name="SetLblColour"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Small on top" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JlL-xg-2G5">
|
||||
<rect key="frame" x="245" y="590" width="144" height="33"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="27"/>
|
||||
<color key="textColor" name="SetLblColour"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="OF4-mr-pvI">
|
||||
<rect key="frame" x="20" y="447" width="374" height="10"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" bouncesZoom="NO" editable="NO" text="Where would you like to wear Guibe?" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ppx-kH-Zyc">
|
||||
<rect key="frame" x="26" y="74" width="361" height="88"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="30"/>
|
||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||
</textView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
|
||||
@ -930,11 +959,17 @@ wear Guibe?</string>
|
||||
<outlet property="cBTop" destination="0ZX-JT-JpQ" id="Tyb-6u-Zls"/>
|
||||
<outlet property="cLeft" destination="WDv-sY-oOi" id="zwL-Wg-cRa"/>
|
||||
<outlet property="cRight" destination="ZDz-GQ-0Cc" id="ULK-qC-VTO"/>
|
||||
<outlet property="l1" destination="TcD-cK-c7G" id="Dgz-s4-DVR"/>
|
||||
<outlet property="l2" destination="up0-vV-Q1M" id="YG5-ic-tNS"/>
|
||||
<outlet property="l3" destination="evh-3D-dW2" id="VU0-8h-siE"/>
|
||||
<outlet property="l4" destination="JlL-xg-2G5" id="TZk-ws-0ai"/>
|
||||
<outlet property="leftBtn" destination="yUo-9A-eP3" id="bKX-rJ-30b"/>
|
||||
<outlet property="rightBtn" destination="wdb-kA-JMS" id="Ilb-qL-nNL"/>
|
||||
<outlet property="sTopBtn" destination="Nvb-Td-arP" id="GR6-cP-aaS"/>
|
||||
<outlet property="sideText" destination="Ppx-kH-Zyc" id="h5k-oI-gEB"/>
|
||||
<outlet property="teoSideText" destination="qiS-sb-sRk" id="MBQ-mx-rK8"/>
|
||||
<outlet property="titleLbl" destination="aP7-6Y-OXC" id="VjX-RV-hoG"/>
|
||||
<outlet property="v1ew" destination="LsY-LB-als" id="1Ag-a7-ngb"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="C73-06-ntv" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
@ -1495,5 +1530,8 @@ And that’s all you need to know to follow the vibe!</string>
|
||||
<image name="startScreen" width="297.33334350585938" height="645.33331298828125"/>
|
||||
<image name="stop" width="170.66667175292969" height="170.66667175292969"/>
|
||||
<image name="welcome2Screen" width="282.66665649414062" height="616.66668701171875"/>
|
||||
<namedColor name="SetLblColour">
|
||||
<color red="1" green="0.17900000512599945" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</namedColor>
|
||||
</resources>
|
||||
</document>
|
||||
|
||||
@ -148,6 +148,8 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
menuWindowView.backgroundColor = UIColor.secondarySystemBackground
|
||||
|
||||
let debugVar = defaults.integer(forKey: "debug")
|
||||
|
||||
|
||||
@ -26,6 +26,12 @@ class settingsViewController: UIViewController {
|
||||
@IBOutlet weak var sideText: UITextView!
|
||||
@IBOutlet weak var teoSideText: UITextView!
|
||||
|
||||
@IBOutlet weak var titleLbl: UILabel!
|
||||
@IBOutlet var v1ew: UIView!
|
||||
@IBOutlet weak var l1: UILabel!
|
||||
@IBOutlet weak var l2: UILabel!
|
||||
@IBOutlet weak var l3: UILabel!
|
||||
@IBOutlet weak var l4: UILabel!
|
||||
// OUTLETS--------------OUTLETS
|
||||
|
||||
|
||||
@ -66,6 +72,12 @@ class settingsViewController: UIViewController {
|
||||
// ACTIONS--------------ACTIONS
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
v1ew.backgroundColor = UIColor.systemBackground
|
||||
titleLbl.textColor = UIColor.label
|
||||
sideText.textColor = UIColor.secondaryLabel
|
||||
teoSideText.textColor = UIColor.secondaryLabel
|
||||
// l1.textColor =
|
||||
|
||||
|
||||
switch defaults.integer(forKey: "handSide") {
|
||||
case 1:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user