TASK #67 Dark mode toggle working

2020-02-08 15:07:47 -06:00 · 2020-02-08 15:07:47 -06:00 · 63fa78684c
commit 63fa78684c
parent 868262bb18
6 changed files with 236 additions and 44 deletions
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@ -1,4 +1,4 @@
-<ion-app>
+<ion-app class="dark">
  <ion-split-pane when="sm">
    <ion-menu class="sidebar">
      <ion-header>
@ -12,9 +12,15 @@
          <ion-list-header>
            Navigate
            <ion-buttons class="ion-padding-end">
-              <ion-button fill="outline" color="light"><ion-icon color="primary" name="add-circle"></ion-icon></ion-button>
-              <ion-button fill="outline" color="light"><ion-icon color="primary" name="add-circle"></ion-icon>&nbsp;<span style="color: #666;">Child</span></ion-button>
-              <ion-button fill="outline" color="light"><ion-icon color="danger" name="trash"></ion-icon></ion-button>
+              <ion-button fill="outline" color="light">
+                <ion-icon color="primary" name="add-circle"></ion-icon>
+              </ion-button>
+              <ion-button fill="outline" color="light">
+                <ion-icon color="primary" name="add-circle"></ion-icon>&nbsp;<span style="color: #666;">Child</span>
+              </ion-button>
+              <ion-button fill="outline" color="light">
+                <ion-icon color="danger" name="trash"></ion-icon>
+              </ion-button>
            </ion-buttons>
          </ion-list-header>

--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@ -1,3 +1,26 @@
 .sidebar {
  max-width: 20em !important;
 }
+
+@media (prefers-color-scheme: no-preference) {
+  ion-toolbar {
+    --background: black;
+    color: white;
+  }
+  :root {
+    --background: black;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --background: black;
+    color: white;
+  }
+}
+
+/* Fallback for older browsers or manual mode */
+.dark {
+  --background: black !important;
+  color: white !important;
+}
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -1,10 +1,10 @@
-import {Component, OnInit} from '@angular/core';
+import { Component, OnInit } from '@angular/core';

 import { Platform } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { ApiService } from './service/api.service';
-import {Router} from '@angular/router';
+import { Router } from '@angular/router';
 import { TREE_ACTIONS } from 'angular-tree-component';

@Component({
@ -13,18 +13,17 @@ import { TREE_ACTIONS } from 'angular-tree-component';
  styleUrls: ['app.component.scss']
 })
 export class AppComponent implements OnInit {
-
  public nodes = [];
  public options = {
    actionMapping: {
      mouse: {
        dblClick: (tree, node, $event) => {
-          console.log({tree, node, $event});
+          console.log({ tree, node, $event });
          const id = node.data.id;
-          this.router.navigate(['/editor', {id}]);
+          this.router.navigate(['/editor', { id }]);
        },
        click: (tree, node, $event) => {
-          console.log('click', {tree, node, $event});
+          console.log('click', { tree, node, $event });
          TREE_ACTIONS.FOCUS(tree, node, $event);
        }
      }
@ -32,12 +31,13 @@ export class AppComponent implements OnInit {
  };

  public darkMode = false;
+
  constructor(
    private platform: Platform,
    private splashScreen: SplashScreen,
    private statusBar: StatusBar,
    private api: ApiService,
-    protected router: Router,
+    protected router: Router
  ) {
    this.initializeApp();
  }
@ -56,12 +56,15 @@ export class AppComponent implements OnInit {
  }

  toggleDark() {
+    const prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
    this.darkMode = !this.darkMode;
-    console.log("toggel Dark mode");
+    console.log('toggel Dark mode');
+    document.body.classList.toggle('dark', this.darkMode);
+
    if (this.darkMode) {
-      console.log("Dark Mode On");
+      console.log('Dark Mode On');
    } else {
-      console.log("Dark Mode Off");
+      console.log('Dark Mode Off');
    }
  }
 }
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@ -1,6 +1,6 @@
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
-import { HostComponent } from "./editor/host/host.component";
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HostComponent } from './editor/host/host.component';

@NgModule({
  declarations: [HostComponent],
--- a/src/app/pages/editor/editor.page.html
+++ b/src/app/pages/editor/editor.page.html
@ -1,4 +1,5 @@
-<ion-header>
+<ng-container>
+  <ion-header>
    <ion-toolbar>
      <ion-buttons slot="start">
        <ion-menu-toggle>
@ -9,9 +10,9 @@
      </ion-buttons>
      <ion-title contenteditable="true" #titleBar>{{ pageRecord.Name }}</ion-title>
    </ion-toolbar>
-</ion-header>
+  </ion-header>

-<ion-content>
+  <ion-content>
    <ng-container>
      <div class="editor-root ion-padding">
        <div class="host-container ion-padding">
@ -25,4 +26,5 @@
        <ion-button (click)="onSaveClick()" class="ion-padding ion-margin">Save</ion-button>
      </div>
    </ng-container>
-</ion-content>
+  </ion-content>
+</ng-container>
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@ -75,3 +75,161 @@
  --ion-color-light-shade: #d7d8da;
  --ion-color-light-tint: #f5f6f9;
 }
+/*
+ * Dark Colors
+ * -------------------------------------------
+ */
+
+body.dark {
+  --ion-color-primary: #428cff;
+  --ion-color-primary-rgb: 66, 140, 255;
+  --ion-color-primary-contrast: #ffffff;
+  --ion-color-primary-contrast-rgb: 255, 255, 255;
+  --ion-color-primary-shade: #3a7be0;
+  --ion-color-primary-tint: #5598ff;
+
+  --ion-color-secondary: #50c8ff;
+  --ion-color-secondary-rgb: 80, 200, 255;
+  --ion-color-secondary-contrast: #ffffff;
+  --ion-color-secondary-contrast-rgb: 255, 255, 255;
+  --ion-color-secondary-shade: #46b0e0;
+  --ion-color-secondary-tint: #62ceff;
+
+  --ion-color-tertiary: #6a64ff;
+  --ion-color-tertiary-rgb: 106, 100, 255;
+  --ion-color-tertiary-contrast: #ffffff;
+  --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+  --ion-color-tertiary-shade: #5d58e0;
+  --ion-color-tertiary-tint: #7974ff;
+
+  --ion-color-success: #2fdf75;
+  --ion-color-success-rgb: 47, 223, 117;
+  --ion-color-success-contrast: #000000;
+  --ion-color-success-contrast-rgb: 0, 0, 0;
+  --ion-color-success-shade: #29c467;
+  --ion-color-success-tint: #44e283;
+
+  --ion-color-warning: #ffd534;
+  --ion-color-warning-rgb: 255, 213, 52;
+  --ion-color-warning-contrast: #000000;
+  --ion-color-warning-contrast-rgb: 0, 0, 0;
+  --ion-color-warning-shade: #e0bb2e;
+  --ion-color-warning-tint: #ffd948;
+
+  --ion-color-danger: #ff4961;
+  --ion-color-danger-rgb: 255, 73, 97;
+  --ion-color-danger-contrast: #ffffff;
+  --ion-color-danger-contrast-rgb: 255, 255, 255;
+  --ion-color-danger-shade: #e04055;
+  --ion-color-danger-tint: #ff5b71;
+
+  --ion-color-dark: #f4f5f8;
+  --ion-color-dark-rgb: 244, 245, 248;
+  --ion-color-dark-contrast: #000000;
+  --ion-color-dark-contrast-rgb: 0, 0, 0;
+  --ion-color-dark-shade: #d7d8da;
+  --ion-color-dark-tint: #f5f6f9;
+
+  --ion-color-medium: #989aa2;
+  --ion-color-medium-rgb: 152, 154, 162;
+  --ion-color-medium-contrast: #000000;
+  --ion-color-medium-contrast-rgb: 0, 0, 0;
+  --ion-color-medium-shade: #86888f;
+  --ion-color-medium-tint: #a2a4ab;
+
+  --ion-color-light: #222428;
+  --ion-color-light-rgb: 34, 36, 40;
+  --ion-color-light-contrast: #ffffff;
+  --ion-color-light-contrast-rgb: 255, 255, 255;
+  --ion-color-light-shade: #1e2023;
+  --ion-color-light-tint: #383a3e;
+}
+
+/*
+ * iOS Dark Theme
+ * -------------------------------------------
+ */
+
+.ios body.dark {
+  --ion-background-color: #000000;
+  --ion-background-color-rgb: 0, 0, 0;
+
+  --ion-text-color: #ffffff;
+  --ion-text-color-rgb: 255, 255, 255;
+
+  --ion-color-step-50: #0d0d0d;
+  --ion-color-step-100: #1a1a1a;
+  --ion-color-step-150: #262626;
+  --ion-color-step-200: #333333;
+  --ion-color-step-250: #404040;
+  --ion-color-step-300: #4d4d4d;
+  --ion-color-step-350: #595959;
+  --ion-color-step-400: #666666;
+  --ion-color-step-450: #737373;
+  --ion-color-step-500: #808080;
+  --ion-color-step-550: #8c8c8c;
+  --ion-color-step-600: #999999;
+  --ion-color-step-650: #a6a6a6;
+  --ion-color-step-700: #b3b3b3;
+  --ion-color-step-750: #bfbfbf;
+  --ion-color-step-800: #cccccc;
+  --ion-color-step-850: #d9d9d9;
+  --ion-color-step-900: #e6e6e6;
+  --ion-color-step-950: #f2f2f2;
+
+  --ion-toolbar-background: #0d0d0d;
+
+  --ion-item-background: #1c1c1c;
+  --ion-item-background-activated: #313131;
+}
+
+/*
+ * Material Design Dark Theme
+ * -------------------------------------------
+ */
+
+.md body.dark {
+  --ion-background-color: #121212;
+  --ion-background-color-rgb: 18, 18, 18;
+
+  --ion-text-color: #ffffff;
+  --ion-text-color-rgb: 255, 255, 255;
+
+  --ion-border-color: #222222;
+
+  --ion-color-step-50: #1e1e1e;
+  --ion-color-step-100: #2a2a2a;
+  --ion-color-step-150: #363636;
+  --ion-color-step-200: #414141;
+  --ion-color-step-250: #4d4d4d;
+  --ion-color-step-300: #595959;
+  --ion-color-step-350: #656565;
+  --ion-color-step-400: #717171;
+  --ion-color-step-450: #7d7d7d;
+  --ion-color-step-500: #898989;
+  --ion-color-step-550: #949494;
+  --ion-color-step-600: #a0a0a0;
+  --ion-color-step-650: #acacac;
+  --ion-color-step-700: #b8b8b8;
+  --ion-color-step-750: #c4c4c4;
+  --ion-color-step-800: #d0d0d0;
+  --ion-color-step-850: #dbdbdb;
+  --ion-color-step-900: #e7e7e7;
+  --ion-color-step-950: #f3f3f3;
+
+  --ion-item-background: #1a1b1e;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --color-toolbar-background: #2a2a2a;
+    --color-toolbar-text: white;
+  }
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    --color-toolbar-background: white;
+    --color-toolbar-text: dark;
+  }
+}