updates

Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "Screenshot 2019-05-28 at 14.09.29.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "Screenshot 2019-05-28 at 14.09.29-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "Screenshot 2019-05-28 at 14.09.29-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/LoadScreenDark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/appLogo.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "appLogo.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "ad.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "appLogo-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "ad-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "appLogo-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ad-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/headingButton.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "headingButton.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "headingDark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "headingButton-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "headingDark-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "headingButton-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "headingDark-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/headingButtonDark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "headingDark-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/loadScreen-1-dark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "g-dark-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/loadScreen-1.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "startScreen.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "startScreen-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "startScreen-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "g-dark-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/menuBtnImg.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "manuBtnImg.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "mbd.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "manuBtnImg-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "mbd-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "manuBtnImg-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mbd-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/menuBtnImgDark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "mbd.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "mbd-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "mbd-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/s1l.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "s1l-1.png",
+      "filename" : "nl.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "s1l-2.png",
+      "filename" : "nl-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "s1l-3.png",
+      "filename" : "nl-2.png",
       "scale" : "3x"
     }
   ],

Guibe/Assets.xcassets/s1r.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "s1r-1.png",
+      "filename" : "nr.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "s1r-2.png",
+      "filename" : "nr-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "s1r-3.png",
+      "filename" : "nr-2.png",
       "scale" : "3x"
     }
   ],

Guibe/Assets.xcassets/serparator.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "sep.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "sdark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "sep-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "sdark-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "sep-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sdark-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/stop.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "stop.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "sd.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "stop-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "sd-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "stop-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "sd-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/stopDark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "sd.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "sd-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "sd-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Assets.xcassets/welcome2Screen.imageset/Contents.json

@@ -5,15 +5,48 @@
       "filename" : "welcome2Screen.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "gd.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "welcome2Screen-1.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "gd-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "welcome2Screen-2.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "gd-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {

Guibe/Assets.xcassets/welcome2ScreenDark.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "gd.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "gd-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "gd-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Guibe/Base.lproj/Main.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_5" orientation="portrait" appearance="light"/>
+    <device id="retina6_5" orientation="portrait" appearance="dark"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
@@ -808,7 +808,7 @@ wear Guibe?</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <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"/>
+                                <rect key="frame" x="0.0" y="-48" width="414" height="53"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="bsB-YW-ZT9">
@@ -855,7 +855,7 @@ wear Guibe?</string>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yUo-9A-eP3" userLabel="leftBtn">
                                 <rect key="frame" x="25" y="232" width="175" height="178"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <state key="normal" backgroundImage="s1l"/>
                                 <connections>
                                     <action selector="leftBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="8S8-ne-cal"/>
@@ -865,7 +865,7 @@ wear Guibe?</string>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wdb-kA-JMS" userLabel="rightBtn">
                                 <rect key="frame" x="213" y="232" width="183" height="178"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <state key="normal" backgroundImage="s1r"/>
                                 <connections>
                                     <action selector="rightBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="fKN-wJ-853"/>
@@ -875,7 +875,7 @@ wear Guibe?</string>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="THO-p7-oiF" userLabel="bTopBtn">
                                 <rect key="frame" x="18" y="640" width="182" height="180"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <state key="normal" backgroundImage="s2t"/>
                                 <connections>
                                     <action selector="bTopBtnPressed:" destination="C7R-cA-IIg" eventType="touchUpInside" id="Sp8-Ef-FWw"/>
@@ -885,7 +885,7 @@ wear Guibe?</string>
                             <button opaque="NO" contentMode="scaleAspectFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nvb-Td-arP" userLabel="sTopBtn">
                                 <rect key="frame" x="213" y="640" width="183" height="180"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <state key="normal" backgroundImage="s2b"/>
                                 <connections>
                                     <action selector="bottomBigPressed:" destination="Y31-kj-JwL" eventType="touchUpInside" id="N70-Ou-Cc5"/>
@@ -949,7 +949,7 @@ wear Guibe?</string>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
                     </view>
                     <connections>

Guibe/ViewController.swift

@@ -16,6 +16,8 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        
+        
         guibeScreen.accessibilityLabel = "ghibe"
         
         let setupDone = defaults.integer(forKey: "setupDone")