Merge pull request #8 from v2ex/settings-dark-mode

Initial support for themes
v2ex · Jan 12, 2022 · e4043b5 · e4043b5
2 parents 76ec15d + 553e705
commit e4043b5
Show file tree

Hide file tree

Showing 19 changed files with 375 additions and 81 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*.swift]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/Launcher.xcodeproj/project.pbxproj b/Launcher.xcodeproj/project.pbxproj
@@ -667,15 +667,14 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_ASSET_PATHS = "\"Launcher/Preview Content\"";
 				DEVELOPMENT_TEAM = 3SCMMGZXY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/Frameworks",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Info.plist;
@@ -686,7 +685,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.3;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -705,15 +704,14 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_ASSET_PATHS = "\"Launcher/Preview Content\"";
 				DEVELOPMENT_TEAM = 3SCMMGZXY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/Frameworks",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Info.plist;
@@ -724,7 +722,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.3;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -743,7 +741,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_TEAM = 3SCMMGZXY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -757,7 +755,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.3;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher.helper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -776,7 +774,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_TEAM = 3SCMMGZXY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -790,7 +788,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.3;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.v2ex.CodeLauncher.helper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Launcher/Assets.xcassets/ConsoleOutputsBackground.colorset/Contents.json b/Launcher/Assets.xcassets/ConsoleOutputsBackground.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.208",
-          "green" : "0.165",
-          "red" : "0.051"
+          "blue" : "0x35",
+          "green" : "0x2A",
+          "red" : "0x0D"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.902",
-          "green" : "0.965",
-          "red" : "0.988"
+          "blue" : "0xE6",
+          "green" : "0xF6",
+          "red" : "0xFB"
         }
       },
       "idiom" : "universal"

diff --git a/Launcher/Assets.xcassets/ConsoleOutputsBackgroundIndexed.colorset/Contents.json b/Launcher/Assets.xcassets/ConsoleOutputsBackgroundIndexed.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.255",
-          "green" : "0.208",
-          "red" : "0.086"
+          "blue" : "0x41",
+          "green" : "0x35",
+          "red" : "0x15"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.843",
-          "green" : "0.910",
-          "red" : "0.925"
+          "blue" : "0xD6",
+          "green" : "0xE8",
+          "red" : "0xEB"
         }
       },
       "idiom" : "universal"

diff --git a/Launcher/Assets.xcassets/ConsoleOutputsForeground.colorset/Contents.json b/Launcher/Assets.xcassets/ConsoleOutputsForeground.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.675",
-          "green" : "0.671",
-          "red" : "0.620"
+          "blue" : "0xAC",
+          "green" : "0xAB",
+          "red" : "0x9E"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.455",
-          "green" : "0.427",
-          "red" : "0.361"
+          "blue" : "0x74",
+          "green" : "0x6C",
+          "red" : "0x5C"
         }
       },
       "idiom" : "universal"

diff --git a/Launcher/Assets.xcassets/ConsoleOutputsForegroundIndexed.colorset/Contents.json b/Launcher/Assets.xcassets/ConsoleOutputsForegroundIndexed.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.698",
-          "green" : "0.706",
-          "red" : "0.667"
+          "blue" : "0xB1",
+          "green" : "0xB4",
+          "red" : "0xAA"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.451",
-          "green" : "0.427",
-          "red" : "0.357"
+          "blue" : "0x73",
+          "green" : "0x6C",
+          "red" : "0x5B"
         }
       },
       "idiom" : "universal"

diff --git a/...tSidebarBackground.colorset/Contents.json → .../ConsoleBackground.colorset/Contents.json b/...tSidebarBackground.colorset/Contents.json → .../ConsoleBackground.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xE6",
+          "green" : "0xF6",
+          "red" : "0xFB"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0x35",
+          "green" : "0x2A",
+          "red" : "0x0D"
         }
       },
       "idiom" : "universal"

diff --git a/...tSidebarForeground.colorset/Contents.json → ...ackgroundAlternate.colorset/Contents.json b/...tSidebarForeground.colorset/Contents.json → ...ackgroundAlternate.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xD6",
+          "green" : "0xE8",
+          "red" : "0xEB"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0x41",
+          "green" : "0x35",
+          "red" : "0x15"
         }
       },
       "idiom" : "universal"

diff --git a/...egroundAlternative.colorset/Contents.json → .../ConsoleForeground.colorset/Contents.json b/...egroundAlternative.colorset/Contents.json → .../ConsoleForeground.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0x74",
+          "green" : "0x6C",
+          "red" : "0x5C"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0xAC",
+          "green" : "0xAB",
+          "red" : "0x9E"
         }
       },
       "idiom" : "universal"

diff --git a/Launcher/Assets.xcassets/DeviceTheme/ConsoleForegroundAlternate.colorset/Contents.json b/Launcher/Assets.xcassets/DeviceTheme/ConsoleForegroundAlternate.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x73",
+          "green" : "0x6C",
+          "red" : "0x5B"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xB1",
+          "green" : "0xB4",
+          "red" : "0xAA"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Launcher/Assets.xcassets/DeviceTheme/Contents.json b/Launcher/Assets.xcassets/DeviceTheme/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Launcher/Assets.xcassets/ReverseDeviceTheme/Contents.json b/Launcher/Assets.xcassets/ReverseDeviceTheme/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Launcher/Assets.xcassets/ReverseDeviceTheme/ReverseConsoleBackground.colorset/Contents.json b/Launcher/Assets.xcassets/ReverseDeviceTheme/ReverseConsoleBackground.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x35",
+          "green" : "0x2A",
+          "red" : "0x0D"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xE6",
+          "green" : "0xF6",
+          "red" : "0xFB"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}