Add basic support for dark mode & update Swift schema. #1565

furby-tm · 2023-03-15T11:53:18Z

Within this PR is support for:

minimum, basic dark mode support (toggle-able via the View menu in the menubar).
updated Swift schema for the replacement of Objective-C properties with the new Swift @Persisted property wrappers.

cla-bot · 2023-03-15T11:53:25Z

Realm welcomes all contributions! The only requirement we have is that, like many other projects, we need to have a Contributor License Agreement (CLA) in place before we can accept any external code. Our own CLA is a modified version of the Apache Software Foundation’s CLA. Our records show that CLA has not been signed by @furby-tm. Please submit your CLA electronically using our Google form so we can accept your submissions. After signing the CLA you can recheck this PR with a @cla-bot check comment. The GitHub usernames you file there will need to match that of your Pull Requests. If you have any questions or cannot file the CLA electronically, make a comment here and we will be happy to help you out.

furby-tm · 2023-03-15T11:57:32Z

@cla-bot check

cla-bot · 2023-03-15T11:57:39Z

The cla-bot has been summoned, and re-checked this pull request!

kraenhansen · 2023-03-16T08:21:50Z

src/main/Updater.ts

@@ -216,7 +216,7 @@ export class Updater {
        dialog.showMessageBoxSync({
          type: 'info',
          message: `A new version of ${appName} is downloaded!`,
-          detail: `${appName} ${lastestVersion} is downloaded.\nClick "Ok" to quit and restart Realm Studio.`,
+          detail: `${appName} ${lastestVersion} is downloaded.\nClick "Ok" to quit and restart Cosmic Realms.`,


Please revert this.

kraenhansen · 2023-03-16T08:22:33Z

src/services/schema-export/languages/swift.ts

      case 'decimal128':
-        return str + 'Decimal128()';
+        return str;
      case 'object':
        return 'Objects must always be optional. Something is not right in this model!';


I would prefer if the changes to the swift schema export went into a separate PR.

kraenhansen · 2023-03-16T08:22:57Z

src/store.ts

@@ -48,6 +51,12 @@ class RealmStudioStore {
    this.store.set(KEY_SHOW_SYSTEM_CLASSES, !currentValue);
  }

+  public toggleDarkMode()
+  {
+    const currentValue = this.shouldShowInternalFeatures();


This line seems incorrect.

kraenhansen · 2023-03-16T08:23:43Z

src/testing/post-packaging/mocked-realm-studio/package.json

+    "appId": "foundation.wabi.realm-studio",
+    "productName": "Cosmic Realms",


Please revert this.

kraenhansen · 2023-03-16T08:24:12Z

Jenkinsfile

@@ -332,7 +332,7 @@ pipeline {
            def releaseUrl = "https://github.com/$GITHUB_OWNER/$GITHUB_REPO/releases/tag/$VERSION"
            // Post to Slack
            postToSlack('slack-releases-webhook', [[
-              'title': "Realm Studio $VERSION has been released!",
+              'title': "Cosmic Realms $VERSION has been released!",


Please revert this.

kraenhansen · 2023-03-16T08:24:15Z

package.json

@@ -1,6 +1,6 @@
 {
  "name": "realm-studio",
-  "productName": "Realm Studio",
+  "productName": "Cosmic Realms",


Please revert this.

kraenhansen · 2023-03-16T08:24:20Z

package.json

@@ -12,7 +12,7 @@
  "license": "Apache-2.0",
  "main": "./build/main.bundle.js",
  "build": {
-    "appId": "com.mongodb.realm-studio",
+    "appId": "foundation.wabi.realm-studio",


Please revert this.

kraenhansen · 2023-03-16T08:24:25Z

package.json

@@ -72,7 +72,7 @@
    },
    "protocols": [
      {
-        "name": "Realm Studio",
+        "name": "Cosmic Realms",


Please revert this.

kraenhansen · 2023-03-16T08:24:34Z

scripts/mac/notarize.js

+const appBundleId = "foundation.wabi.realm-studio";
+const ascProvider = "UQ9J5QT9DL"; // Apple: short team name


Please revert this.

kraenhansen · 2023-03-16T08:25:17Z

src/testing/post-packaging/mocked-realm-studio/index.js

@@ -12,7 +12,7 @@ electron.app.once('ready', () => {
    message: `Writing to the ready signal: ${p}`,
  });
  */
-  fs.writeFileSync(p, 'Hello from a future Realm Studio!', {
+  fs.writeFileSync(p, 'Hello from a future Cosmic Realms!', {


Please revert this.

kraenhansen · 2023-03-16T08:25:35Z

src/testing/post-packaging/mocked-realm-studio/package-lock.json

  "version": "999.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
  "requires": true,
-  "dependencies": {
-    "electron": {
-      "version": "file:../../../../node_modules/electron",
+  "packages": {
+    "": {
+      "name": "mocked-realm-studio",
+      "version": "999.0.0",
+      "license": "Apache-2.0",
+      "devDependencies": {
+        "electron": "file:../../../../node_modules/electron"
+      }
+    },
+    "../../../../node_modules/electron": {
+      "version": "19.1.8",
      "integrity": "sha512-Bp1CwnYaIWXNL9ZjgEaLlEkVEGpjJMupcAnxyCe00C2ZhQT9gY+RJaPzkrZC+J/Gc4MvvLtJcy/Hvsc+MTkfNg==",
-      "dev": true
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/get": "^1.14.1",
+        "@types/node": "^16.11.26",
+        "extract-zip": "^1.0.3"
+      },
+      "bin": {
+        "electron": "cli.js"
+      },
+      "engines": {
+        "node": ">= 8.6"
+      }
+    },
+    "node_modules/electron": {
+      "resolved": "../../../../node_modules/electron",
+      "link": true


Please revert this.

kraenhansen · 2023-03-16T08:27:42Z

src/ui/RealmBrowser/index.tsx

@@ -200,6 +203,10 @@ class RealmBrowserContainer
    );
  }

+  public changeTheme() {
+    this.setState({ darkModeEnabled: !this.state.darkModeEnabled });


Should this be persisted?

kraenhansen · 2023-03-16T08:27:48Z

src/ui/RealmBrowser/index.tsx

@@ -400,7 +421,7 @@ class RealmBrowserContainer
      }
    } else if (err.message === ARCHITECTURE_MISMATCH_MESSAGE) {
      const improvedError = new Error(
-        'The file is already opened by another process, with an incompatible lock file format. Try up- or downgrading Realm Studio or SDK to match their versions of Realm Core.\n\nSee Realm Studio changelog on GitHub for details on compatibility between versions.',
+        'The file is already opened by another process, with an incompatible lock file format. Try up- or downgrading Cosmic Realms or SDK to match their versions of Realm Core.\n\nSee Cosmic Realms changelog on GitHub for details on compatibility between versions.',


Please revert this.

kraenhansen · 2023-03-16T08:28:08Z

src/ui/RealmBrowser/variables.scss

@@ -22,7 +22,7 @@ $realm-browser-header-handle-width: 5px;
 $realm-browser-header-height: 50px;
 $realm-browser-header-icon-space: 24px;
 $realm-browser-header-handle-hover-bg: rgba(0, 0, 0, .1);
-$realm-browser-header-handle-dragging-bg: rgba($ultramarine, .5);
+$realm-browser-header-handle-dragging-bg: rgba(#39477f, .5);


Could this use a SCSS variable instead?

kraenhansen · 2023-03-16T08:28:33Z

static/index.development.html

@@ -2,7 +2,7 @@
 <html>
  <head>
    <meta charset="UTF-8">
-    <title>Realm Studio</title>
+    <title>Cosmic Realms</title>


Please revert this.

kraenhansen · 2023-03-16T08:28:37Z

static/index.html

@@ -2,7 +2,7 @@
 <html>
  <head>
    <meta charset="UTF-8">
-    <title>Realm Studio</title>
+    <title>Cosmic Realms</title>


Please revert this.

kraenhansen · 2023-03-16T08:29:22Z

styles/variables/_colors.scss

+@mixin themed() {
+  @each $theme, $map in $themes {
+    .theme--#{$theme} & {
+      $colors: () !global;
+      @each $key, $submap in $map {
+        $value: map-get(map-get($themes, $theme), '#{$key}');
+        $colors: map-merge($colors, ($key: $value)) !global;
+      }
+      @content;
+      $colors: null !global;
+    }
+  }
+}


Did you copy this from somewhere? If yes, please include a link.

takameyer · 2023-03-16T08:48:49Z

src/main/MainMenu.ts

+          label: "Enable Dark Mode",
+          id: 'toggle-appearance',
+          type: 'checkbox',
+          checked: store.shouldShowDarkMode(),


I would prefer if this was pulled from the system preferences. Would be great if there was a way to say "use my preferences" and then be able to provide an override.

kraenhansen · 2023-03-16T13:29:00Z

@furby-tm could you post a few screenshots from the app when in dark mode?

furby-tm · 2023-03-21T23:16:37Z

Hey guys! Sorry, I'm just now getting to your response -- I've been tied down with some projects getting rolled out into production over the last couple weeks, so things have been hectic.

I had just a couple hours to spare, and spent that time trying to tone down the blinding light mode of the app, since I use it frequently, and figured my eyes could spare a break.

I realize my PR was a 0 context shove in, so I apologize for that!

To quickly summarize these changes:

I added a basic dark mode, and made some additional changes to the light mode which integrated some of the UI aspects of MongoDB Compass. The dark mode will need some cleanup since I missed a lot of the text on the tables (lots of it is looking black on black so that won't do!).

I brought in the latest changes to the realm swift generation schema, which is the removal of any/all objc boilerplate and integrated the ‘@persisted’ swift property wrappers.

And I believe that was all. If dark mode & rolling in the latest swift schematic changes are something the realm team are looking to support I'd be happy to fixup a proper PR for your review.

Add basic support for dark mode.

ae4af79

cla-bot bot added the cla: yes label Mar 15, 2023

furby-tm added 3 commits March 15, 2023 09:17

Shift name off official for internal relase.

6702b54

Replace objc -> swift Persisted property wrappers.

ee573d2

Fix potential for duplicate primary key, cleanup.

07c75d3

furby-tm changed the title ~~Add basic support for dark mode.~~ Add basic support for dark mode & update Swift schema. Mar 15, 2023

kraenhansen reviewed Mar 16, 2023

View reviewed changes

package.json

@@ -72,7 +72,7 @@

},

"protocols": [

{

"name": "Realm Studio",

"name": "Cosmic Realms",

Copy link

Member

kraenhansen Mar 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this.

kraenhansen reviewed Mar 16, 2023

View reviewed changes

takameyer reviewed Mar 16, 2023

View reviewed changes

kraenhansen added the More-information-needed More information is needed to progress. The issue will close automatically in 2 weeks. label Mar 20, 2023

github-actions bot removed the More-information-needed More information is needed to progress. The issue will close automatically in 2 weeks. label Mar 21, 2023

takameyer mentioned this pull request Aug 11, 2023

Support Dark Mode on macOS #1154

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add basic support for dark mode & update Swift schema. #1565

Add basic support for dark mode & update Swift schema. #1565

furby-tm commented Mar 15, 2023 •

edited

Loading

cla-bot bot commented Mar 15, 2023

furby-tm commented Mar 15, 2023

cla-bot bot commented Mar 15, 2023

kraenhansen Mar 16, 2023 •

edited

Loading

kraenhansen Mar 16, 2023 •

edited

Loading

kraenhansen Mar 16, 2023 •

edited

Loading

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

kraenhansen Mar 16, 2023

takameyer Mar 16, 2023 •

edited

Loading

kraenhansen commented Mar 16, 2023 •

edited

Loading

furby-tm commented Mar 21, 2023

		"appId": "foundation.wabi.realm-studio",
		"productName": "Cosmic Realms",

		const appBundleId = "foundation.wabi.realm-studio";
		const ascProvider = "UQ9J5QT9DL"; // Apple: short team name

Add basic support for dark mode & update Swift schema. #1565

Are you sure you want to change the base?

Add basic support for dark mode & update Swift schema. #1565

Conversation

furby-tm commented Mar 15, 2023 • edited Loading

cla-bot bot commented Mar 15, 2023

furby-tm commented Mar 15, 2023

cla-bot bot commented Mar 15, 2023

kraenhansen Mar 16, 2023 • edited Loading

Choose a reason for hiding this comment

kraenhansen Mar 16, 2023 • edited Loading

Choose a reason for hiding this comment

kraenhansen Mar 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

takameyer Mar 16, 2023 • edited Loading

Choose a reason for hiding this comment

kraenhansen commented Mar 16, 2023 • edited Loading

furby-tm commented Mar 21, 2023

furby-tm commented Mar 15, 2023 •

edited

Loading

kraenhansen Mar 16, 2023 •

edited

Loading

kraenhansen Mar 16, 2023 •

edited

Loading

kraenhansen Mar 16, 2023 •

edited

Loading

takameyer Mar 16, 2023 •

edited

Loading

kraenhansen commented Mar 16, 2023 •

edited

Loading