Dark Mode (#27)

* Enable Dark Mode Background Color * Update Named Colors to use Dark Mode Equivalents
winsmith · Apr 22, 2019 · 61a2395 · 61a2395
1 parent 48ff3ea
commit 61a2395
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 7 deletions.
diff --git a/Assets/Assets.xcassets/AlmostBlack.colorset/Contents.json b/Assets/Assets.xcassets/AlmostBlack.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0x1E"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xE5",
+          "alpha" : "1.000",
+          "blue" : "0xCB",
+          "green" : "0xDD"
+        }
+      }
     }
   ]
 }
diff --git a/Assets/Assets.xcassets/BackgroundColor.colorset/Contents.json b/Assets/Assets.xcassets/BackgroundColor.colorset/Contents.json
@@ -15,6 +15,18 @@
           "green" : "0xFF"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "reference" : "controlBackgroundColor"
+      }
     }
   ]
 }
diff --git a/Assets/Assets.xcassets/DarkAccent.colorset/Contents.json b/Assets/Assets.xcassets/DarkAccent.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0x46"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0xE1",
+          "alpha" : "1.000",
+          "blue" : "0xE5",
+          "green" : "0xD6"
+        }
+      }
     }
   ]
 }
diff --git a/Assets/Assets.xcassets/DarkGray.colorset/Contents.json b/Assets/Assets.xcassets/DarkGray.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0xB3"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "55",
+          "alpha" : "1.000",
+          "blue" : "78",
+          "green" : "35"
+        }
+      }
     }
   ]
 }
diff --git a/Assets/Assets.xcassets/DrunkOnWhite.colorset/Contents.json b/Assets/Assets.xcassets/DrunkOnWhite.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0xDD"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x20",
+          "alpha" : "1.000",
+          "blue" : "0x19",
+          "green" : "0x1E"
+        }
+      }
     }
   ]
 }
diff --git a/Assets/Assets.xcassets/LightAccent.colorset/Contents.json b/Assets/Assets.xcassets/LightAccent.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0xD6"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x52",
+          "alpha" : "1.000",
+          "blue" : "0x56",
+          "green" : "0x46"
+        }
+      }
     }
   ]
 }
diff --git a/Launch Pad/Info.plist b/Launch Pad/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1</string>
 	<key>CFBundleVersion</key>
-	<string>a4</string>
+	<string>a5</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Launch Pad/UI/Base.lproj/Main.storyboard b/Launch Pad/UI/Base.lproj/Main.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -621,7 +622,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -1351,7 +1352,7 @@ Gw
                         <subviews>
                             <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jaF-Ou-zl3">
                                 <rect key="frame" x="0.0" y="0.0" width="300" height="482"/>
-                                <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="2WS-Fy-qTG">
+                                <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="2WS-Fy-qTG">
                                     <rect key="frame" x="1" y="1" width="298" height="480"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
@@ -1368,7 +1369,7 @@ Gw
                                             </connections>
                                         </collectionView>
                                     </subviews>
-                                    <color key="backgroundColor" name="BackgroundColor"/>
+                                    <color key="backgroundColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </clipView>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="iNK-qe-X61"/>
@@ -2447,6 +2448,6 @@ Gw
         </namedColor>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="Ezp-9p-85V"/>
+        <segue reference="1yj-1d-kgX"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Launch Pad/UI/Browse/ModuleCollectionViewItem.swift b/Launch Pad/UI/Browse/ModuleCollectionViewItem.swift
@@ -44,5 +44,6 @@ class ModuleCollectionViewItem: NSCollectionViewItem {
         view.layer?.backgroundColor = isSelected ? darkColor.cgColor : lightColor.cgColor
         nameLabel.textColor = isSelected ? lightColor : darkColor
         versionLabel.textColor = isSelected ? lightColor : darkColor
+        authorLabel.textColor = isSelected ? lightColor : darkColor
     }
 }