diff --git a/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json b/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json new file mode 100644 index 0000000..526a7ad --- /dev/null +++ b/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json @@ -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" + } + } + } + ] +} \ No newline at end of file diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index ff79d9f..fd9d69f 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -3,6 +3,7 @@ + @@ -444,7 +445,7 @@ wear Guibe? - - + @@ -806,11 +807,7 @@ wear Guibe? - - - - - + @@ -829,15 +826,7 @@ wear Guibe? - - - - - - - - - + @@ -919,6 +908,46 @@ wear Guibe? + + + + + + + + + + + + + + + + @@ -930,11 +959,17 @@ wear Guibe? + + + + + + @@ -1495,5 +1530,8 @@ And that’s all you need to know to follow the vibe! + + + diff --git a/Guibe/MainViewController.swift b/Guibe/MainViewController.swift index 3178b6b..687e8ff 100644 --- a/Guibe/MainViewController.swift +++ b/Guibe/MainViewController.swift @@ -148,6 +148,8 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol { override func viewDidLoad() { super.viewDidLoad() + + menuWindowView.backgroundColor = UIColor.secondarySystemBackground let debugVar = defaults.integer(forKey: "debug") diff --git a/Guibe/settingsViewController.swift b/Guibe/settingsViewController.swift index 73086f6..d33785d 100644 --- a/Guibe/settingsViewController.swift +++ b/Guibe/settingsViewController.swift @@ -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: