diff --git a/Guibe/5_HandChoiceViewController.swift b/Guibe/5_HandChoiceViewController.swift index 1bf45d3..5b9f079 100644 --- a/Guibe/5_HandChoiceViewController.swift +++ b/Guibe/5_HandChoiceViewController.swift @@ -14,6 +14,9 @@ class H5ndChoiceViewController: UIViewController { @IBOutlet weak var rBtn: UIButton! @IBOutlet weak var textLbl: UITextView! @IBOutlet weak var altLbl: UILabel! + @IBOutlet var vCtrl: UIView! + @IBOutlet weak var lHand: UIButton! + @IBOutlet weak var rHand: UIButton! let defaults = UserDefaults.standard @@ -34,6 +37,9 @@ class H5ndChoiceViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + altLbl.textColor = UIColor.secondaryLabel + vCtrl.backgroundColor = UIColor.secondarySystemBackground + lBtn.accessibilityLabel = "Left Hand" rBtn.accessibilityLabel = "Right Hand" textLbl.accessibilityLabel = "where would you like to wear ghibe" diff --git a/Guibe/6_SideChoiceViewController.swift b/Guibe/6_SideChoiceViewController.swift index 90a2c33..bd2b933 100644 --- a/Guibe/6_SideChoiceViewController.swift +++ b/Guibe/6_SideChoiceViewController.swift @@ -14,6 +14,8 @@ class S6deChoiceViewController: UIViewController { @IBOutlet weak var sBtn: UIButton! @IBOutlet weak var textLbl: UITextView! @IBOutlet weak var altLbl: UILabel! + @IBOutlet var vCtrl: UIView! + let defaults = UserDefaults.standard @@ -35,6 +37,9 @@ class S6deChoiceViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + vCtrl.backgroundColor = UIColor.secondarySystemBackground + textLbl.textColor = UIColor.secondaryLabel + bTtn.accessibilityLabel = "Big on top" sBtn.accessibilityLabel = "Small on top" textLbl.accessibilityLabel = "How would you like to wear ghibe" diff --git a/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json b/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json index 526a7ad..40005bb 100644 --- a/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json +++ b/Guibe/Assets.xcassets/SetLblColour.colorset/Contents.json @@ -27,10 +27,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0.055", + "red" : "0.673", "alpha" : "1.000", - "blue" : "1.000", - "green" : "0.138" + "blue" : "0.180", + "green" : "0.144" } } } diff --git a/Guibe/Assets.xcassets/buttonMedSize.imageset/Contents.json b/Guibe/Assets.xcassets/buttonMedSize.imageset/Contents.json index e6d1abd..e93e113 100644 --- a/Guibe/Assets.xcassets/buttonMedSize.imageset/Contents.json +++ b/Guibe/Assets.xcassets/buttonMedSize.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "buttonMedSize.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "med-d.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "buttonMedSize-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "med-d-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "buttonMedSize-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "med-d-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-1.png b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-1.png new file mode 100644 index 0000000..616075b Binary files /dev/null and b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-1.png differ diff --git a/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-2.png b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-2.png new file mode 100644 index 0000000..616075b Binary files /dev/null and b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d-2.png differ diff --git a/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d.png b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d.png new file mode 100644 index 0000000..616075b Binary files /dev/null and b/Guibe/Assets.xcassets/buttonMedSize.imageset/med-d.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json b/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json index 2e01a7c..2f8c3a1 100644 --- a/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json +++ b/Guibe/Assets.xcassets/nextBtn.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "nextBtn.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "next-d.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "nextBtn-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "next-d-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "nextBtn-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "next-d-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/next-d-1.png b/Guibe/Assets.xcassets/nextBtn.imageset/next-d-1.png new file mode 100644 index 0000000..4518a58 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/next-d-1.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/next-d-2.png b/Guibe/Assets.xcassets/nextBtn.imageset/next-d-2.png new file mode 100644 index 0000000..4518a58 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/next-d-2.png differ diff --git a/Guibe/Assets.xcassets/nextBtn.imageset/next-d.png b/Guibe/Assets.xcassets/nextBtn.imageset/next-d.png new file mode 100644 index 0000000..4518a58 Binary files /dev/null and b/Guibe/Assets.xcassets/nextBtn.imageset/next-d.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/Contents.json b/Guibe/Assets.xcassets/s1l.imageset/Contents.json index e6559f5..ed35403 100644 --- a/Guibe/Assets.xcassets/s1l.imageset/Contents.json +++ b/Guibe/Assets.xcassets/s1l.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "nl.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "lhd.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "nl-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "lhd-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "nl-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "lhd-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/s1l.imageset/lhd-1.png b/Guibe/Assets.xcassets/s1l.imageset/lhd-1.png new file mode 100644 index 0000000..f4ee225 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/lhd-1.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/lhd-2.png b/Guibe/Assets.xcassets/s1l.imageset/lhd-2.png new file mode 100644 index 0000000..f4ee225 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/lhd-2.png differ diff --git a/Guibe/Assets.xcassets/s1l.imageset/lhd.png b/Guibe/Assets.xcassets/s1l.imageset/lhd.png new file mode 100644 index 0000000..f4ee225 Binary files /dev/null and b/Guibe/Assets.xcassets/s1l.imageset/lhd.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/Contents.json b/Guibe/Assets.xcassets/s1r.imageset/Contents.json index 1d068cb..1ec5c42 100644 --- a/Guibe/Assets.xcassets/s1r.imageset/Contents.json +++ b/Guibe/Assets.xcassets/s1r.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "nr.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "rhd.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "nr-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "rhd-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "nr-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "rhd-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/s1r.imageset/rhd-1.png b/Guibe/Assets.xcassets/s1r.imageset/rhd-1.png new file mode 100644 index 0000000..ac2bcf7 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/rhd-1.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/rhd-2.png b/Guibe/Assets.xcassets/s1r.imageset/rhd-2.png new file mode 100644 index 0000000..ac2bcf7 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/rhd-2.png differ diff --git a/Guibe/Assets.xcassets/s1r.imageset/rhd.png b/Guibe/Assets.xcassets/s1r.imageset/rhd.png new file mode 100644 index 0000000..ac2bcf7 Binary files /dev/null and b/Guibe/Assets.xcassets/s1r.imageset/rhd.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/Contents.json b/Guibe/Assets.xcassets/s2b.imageset/Contents.json index d9a9609..bbdb1aa 100644 --- a/Guibe/Assets.xcassets/s2b.imageset/Contents.json +++ b/Guibe/Assets.xcassets/s2b.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "s2b.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "s2b-d.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "s2b-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "s2b-d-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "s2b-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "s2b-d-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b-d-1.png b/Guibe/Assets.xcassets/s2b.imageset/s2b-d-1.png new file mode 100644 index 0000000..3756a1b Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b-d-1.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b-d-2.png b/Guibe/Assets.xcassets/s2b.imageset/s2b-d-2.png new file mode 100644 index 0000000..3756a1b Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b-d-2.png differ diff --git a/Guibe/Assets.xcassets/s2b.imageset/s2b-d.png b/Guibe/Assets.xcassets/s2b.imageset/s2b-d.png new file mode 100644 index 0000000..3756a1b Binary files /dev/null and b/Guibe/Assets.xcassets/s2b.imageset/s2b-d.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/Contents.json b/Guibe/Assets.xcassets/s2t.imageset/Contents.json index 4379d15..2d5910c 100644 --- a/Guibe/Assets.xcassets/s2t.imageset/Contents.json +++ b/Guibe/Assets.xcassets/s2t.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "s2t.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "s2t-d.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "s2t-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "s2t-d-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "s2t-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "s2t-d-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t-d-1.png b/Guibe/Assets.xcassets/s2t.imageset/s2t-d-1.png new file mode 100644 index 0000000..a1d0c49 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t-d-1.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t-d-2.png b/Guibe/Assets.xcassets/s2t.imageset/s2t-d-2.png new file mode 100644 index 0000000..a1d0c49 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t-d-2.png differ diff --git a/Guibe/Assets.xcassets/s2t.imageset/s2t-d.png b/Guibe/Assets.xcassets/s2t.imageset/s2t-d.png new file mode 100644 index 0000000..a1d0c49 Binary files /dev/null and b/Guibe/Assets.xcassets/s2t.imageset/s2t-d.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/Contents.json b/Guibe/Assets.xcassets/startScreen.imageset/Contents.json index 1b7a36c..6ff676a 100644 --- a/Guibe/Assets.xcassets/startScreen.imageset/Contents.json +++ b/Guibe/Assets.xcassets/startScreen.imageset/Contents.json @@ -5,15 +5,48 @@ "filename" : "startScreen.png", "scale" : "1x" }, + { + "idiom" : "universal", + "filename" : "startScrDark.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "1x" + }, { "idiom" : "universal", "filename" : "startScreen-1.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "startScrDark-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "startScreen-2.png", "scale" : "3x" + }, + { + "idiom" : "universal", + "filename" : "startScrDark-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "3x" } ], "info" : { diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-1.png b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-1.png new file mode 100644 index 0000000..1ec7653 Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-1.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-2.png b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-2.png new file mode 100644 index 0000000..1ec7653 Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark-2.png differ diff --git a/Guibe/Assets.xcassets/startScreen.imageset/startScrDark.png b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark.png new file mode 100644 index 0000000..1ec7653 Binary files /dev/null and b/Guibe/Assets.xcassets/startScreen.imageset/startScrDark.png differ diff --git a/Guibe/AudioInstrViewController.swift b/Guibe/AudioInstrViewController.swift index 3515572..80d93b6 100644 --- a/Guibe/AudioInstrViewController.swift +++ b/Guibe/AudioInstrViewController.swift @@ -21,6 +21,7 @@ @IBOutlet weak var b4: UIButton! @IBOutlet weak var b5: UIButton! @IBOutlet weak var stopBtn: UIButton! + @IBOutlet var vCtrl: UIView! @IBAction func b1p(_ sender: Any) { @@ -68,6 +69,14 @@ override func viewDidLoad() { super.viewDidLoad() + + vCtrl.backgroundColor = UIColor.secondarySystemBackground + b1.setTitleColor(UIColor.secondaryLabel, for: .normal) + b2.setTitleColor(UIColor.secondaryLabel, for: .normal) + b3.setTitleColor(UIColor.secondaryLabel, for: .normal) + b4.setTitleColor(UIColor.secondaryLabel, for: .normal) + b5.setTitleColor(UIColor.secondaryLabel, for: .normal) + b1.accessibilityLabel = "connecting your ghibe" b2.accessibilityLabel = "wearing your ghibe" b3.accessibilityLabel = "ghibe language" diff --git a/Guibe/Base.lproj/Main.storyboard b/Guibe/Base.lproj/Main.storyboard index 934307a..28a1eb0 100644 --- a/Guibe/Base.lproj/Main.storyboard +++ b/Guibe/Base.lproj/Main.storyboard @@ -81,7 +81,7 @@ - + @@ -170,11 +170,10 @@ - + - @@ -186,6 +185,7 @@ + @@ -203,7 +203,7 @@