@sumaris-net/ngx-components 2.7.3-rc67 → 2.7.3-rc69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "2.7.3-rc67",
+  "version": "2.7.3-rc69",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/src/app/core/menu/testing/menu-other.testing.d.ts

@@ -1,7 +1,7 @@
-import { MenuService } from '../menu.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AlertController, NavController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
+import { MenuService } from '../menu.service';
 import { MenuTestingPage } from './menu.testing';
 import * as i0 from "@angular/core";
 export declare class OtherMenuTestingPage extends MenuTestingPage {

package/src/app/core/menu/testing/menu.testing.d.ts

@@ -1,10 +1,11 @@
-import { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
+import { AfterViewInit, EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { MenuService } from '../menu.service';
 import { AppTabEditor } from '../../form/entity/editor.class';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AlertController, NavController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
+import { MatTabGroup } from '@angular/material/tabs';
 import * as i0 from "@angular/core";
 export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnDestroy, AfterViewInit {
     protected menuService: MenuService;
@@ -17,6 +18,12 @@ export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnD
     protected showThirdTab: boolean;
     protected $title: Subject<string>;
     protected $secondTabTitle: Subject<string>;
+    protected _subSelectedTabIndex: number;
+    subTabCount: number;
+    set subSelectedTabIndex(value: number);
+    get subSelectedTabIndex(): number;
+    readonly subSelectedTabIndexChange: EventEmitter<number>;
+    subTabGroup: MatTabGroup;
     protected set title(value: string);
     protected set secondTabTitle(value: string);
     constructor(route: ActivatedRoute, // Modal editor give 'null'
@@ -38,6 +45,7 @@ export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnD
     protected getFirstInvalidTabIndex(): number;
     protected getDefaultTitle(): string;
     protected computeTitle(): Promise<string>;
+    setSubSelectedTabIndex(value: number): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuTestingPage, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MenuTestingPage, "app-testing-menu", never, {}, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MenuTestingPage, "app-testing-menu", never, { "subSelectedTabIndex": { "alias": "subSelectedTabIndex"; "required": false; }; }, { "subSelectedTabIndexChange": "subSelectedTabIndexChange"; }, never, never, false, never>;
 }

package/src/app/core/services/local-settings.service.d.ts

@@ -40,6 +40,8 @@ export declare class LocalSettingsService extends StartableService<LocalSettings
     get mobile(): boolean;
     set mobile(value: boolean);
     get pageHistory(): HistoryPageReference[];
+    get enableDarkMode(): boolean;
+    get isDarkMode(): boolean;
     constructor(platform: Platform, translate: TranslateService, storage: Storage, environment: Environment, defaultSettings: LocalSettings, options: LocalSettingsOptions);
     ngOnStart(): Promise<LocalSettings>;
     isUsageMode(mode: UsageMode): boolean;

package/src/app/core/services/model/settings.model.d.ts

@@ -23,4 +23,5 @@ export declare interface LocalSettings {
     pageHistory?: HistoryPageReference[];
     offlineFeatures?: (string | OfflineFeature)[];
     pageHistoryMaxSize: number;
+    darkMode?: boolean;
 }

package/src/app/core/settings/settings.page.d.ts

@@ -44,6 +44,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     get accountInheritance(): boolean;
     get isLogin(): boolean;
     get propertiesForm(): UntypedFormArray;
+    get darkMode(): boolean;
     constructor(injector: Injector, platform: PlatformService, navController: NavController, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: UntypedFormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[], menuItems?: IMenuItem[]);
     ngOnInit(): Promise<void>;
     getPropertyDefinition(index: number): FormFieldDefinition;
@@ -62,6 +63,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     executeAction(event: Event, item: IMenuItem): Promise<void>;
     protected getValue(): Promise<LocalSettings>;
     protected getJsonValueToSave(): Promise<any>;
+    protected toggleDarkMode(): Promise<void>;
     protected markForCheck(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SettingsPage, [null, null, null, null, null, null, null, null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<SettingsPage, "page-settings", never, {}, {}, never, never, false, never>;

package/src/app/shared/inputs.d.ts

@@ -16,7 +16,7 @@ export interface InputElement extends FocusableElement {
 }
 export declare function isInputElement(object: any): object is InputElement;
 export declare function asInputElement(object: ElementRef): InputElement | undefined;
-export declare function tabindexComparator(a: InputElement, b: InputElement): 1 | -1 | 0;
+export declare function tabindexComparator(a: InputElement, b: InputElement): 0 | 1 | -1;
 export interface CanGainFocusOptions {
     minTabindex?: number;
     maxTabindex?: number;

package/src/assets/i18n/en-US.json

@@ -370,6 +370,7 @@
     "NETWORK_DIVIDER": "Network settings",
     "PEER_URL": "Network node address",
     "BTN_CHANGE_PEER": "See available nodes",
+    "BTN_DARK_MODE": "Light/dark theme",
     "BTN_SHOW_MORE_HELP": "Show more parameters",
     "BTN_CLEAR_CACHE": "Clear data cache",
     "OFFLINE_MODE": "Force offline mode? (experimental)",

package/src/assets/i18n/en.json

@@ -370,6 +370,7 @@
     "NETWORK_DIVIDER": "Network settings",
     "PEER_URL": "Network node address",
     "BTN_CHANGE_PEER": "See available nodes",
+    "BTN_DARK_MODE": "Light/dark theme",
     "BTN_SHOW_MORE_HELP": "Show more parameters",
     "BTN_CLEAR_CACHE": "Clear data cache",
     "OFFLINE_MODE": "Force offline mode? (experimental)",

package/src/assets/i18n/fr.json

@@ -370,6 +370,7 @@
     "NETWORK_DIVIDER": "Paramètres réseau",
     "PEER_URL": "Adresse du nœud réseau",
     "BTN_CHANGE_PEER": "Voir les nœuds disponibles",
+    "BTN_DARK_MODE": "Mode sombre/clair",
     "BTN_SHOW_MORE_HELP": "Afficher plus de paramètres",
     "BTN_CLEAR_CACHE": "Vider le cache",
     "OFFLINE_MODE": "Forcer le mode hors-ligne ?",

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "2.7.3-rc67",
+  "version": "2.7.3-rc69",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{

package/src/environments/environment.class.d.ts

@@ -10,7 +10,6 @@ export declare class Environment {
     production: boolean;
     externalEnvironmentUrl?: string;
     baseUrl: string;
-    useHash?: boolean;
     connectionTimeout?: number;
     sameUrlPeer?: boolean;
     defaultPeer?: {
@@ -35,6 +34,8 @@ export declare class Environment {
     defaultDepartmentId?: number;
     defaultAppName?: string;
     defaultAndroidInstallUrl?: string;
+    useHash?: boolean;
+    allowDarkMode?: boolean;
     logging?: Partial<LoggingServiceConfig>;
     cache?: Partial<CacheConfig>;
     storage?: Partial<StorageConfig>;

package/src/theme/_ionic.globals.scss

@@ -68,6 +68,8 @@ $text-color: $dark-primary-text;
 // --------------------------------------------------
 $overlay-background-color: var(--ion-overlay-background-color, #fafafa) !default;
 $ripple-background-color: var(--ion-ripple-background-color, #000) !default;
+$ion-toolbar-background: whitesomke !default;
+
 
 // Default padding
 // --------------------------------------------------

package/src/theme/_material.globals.scss

@@ -68,3 +68,4 @@ $mat-tab-bar-height: 48px !default;
 $mat-tab-animation-duration: 200ms !default;
 $mat-toolbar-height-desktop: 64px !default;
 $mat-toolbar-height-mobile: 56px !default;
+$mat-toolbar-background-color: var(--ion-toolbar-background) !default;

package/src/theme/_material.scss

@@ -94,6 +94,7 @@
   color: var(--ion-color-warning-contrast);
 }
 
+
 // Progress bar
 .mat-progress-bar {
   --background-color: var(--ion-color-primary-tint, mix(#fff, $primary, 10%));

package/src/theme/_mixins.scss

@@ -99,6 +99,7 @@
   --ion-padding: #{$ion-padding};
   --ion-margin: #{$ion-margin};
   --ion-toolbar-height: #{$ion-toolbar-height};
+  --ion-toolbar-background: #{$ion-toolbar-background};
 
   --expansion-panel-padding: var(--ion-padding);
   --expansion-panel-header-padding: var(--ion-padding);
@@ -107,18 +108,22 @@
   --mat-tab-bar-height: #{$mat-tab-bar-height};
 
   --mat-toolbar-height: #{$mat-toolbar-height-desktop};
-  --mat-toolbar-background-color: #{$mat-toolbar-background-color};
   --mat-paginator-height: mat.$paginator-height;
+  --mat-toolbar-background-color: var(--ion-toolbar-background);
+  --mat-table-background-color: var(--ion-background);
 
   --app-table-header-height: #{$app-table-header-height};
   --app-paginator-height: #{$app-paginator-height};
   --app-toolbar-height: #{$app-toolbar-height};
   --app-footer-height: var(--app-form-buttons-bar-height);
   --app-form-buttons-bar-height: #{$app-form-buttons-bar-height};
+  --app-form-color: #{$app-form-color};
   --app-form-color-disabled: #{$app-form-color-disabled};
   --app-form-color-computed: #{$app-form-color-computed};
   --app-form-field-background-color: #{$app-form-field-background-color};
   --app-form-field-disabled-background-color: #{$app-form-field-disabled-background-color};
+  --app-table-row-item-selected-background-color: #{$app-table-row-item-selected-background-color};
+  --app-table-row-item-selected-text-color: #{$app-table-row-item-selected-text-color};
 }
 
 @mixin css-variables-to-root-mobile() {

package/src/theme/_ngx-components.forms.scss

@@ -4,7 +4,8 @@
 // --------------------------------------------------
 .form-container,
 form.form-container {
-  color: #{$app-form-color};
+  --ion-text-color: var(--app-form-color, #{$app-form-color});
+  color: var(--ion-text-color);
   @include font-size(16px);
 
   --mdc-filled-text-field-container-color: var(--app-form-field-background-color);

package/src/theme/_ngx-components.globals.scss

@@ -2,7 +2,6 @@ $app-menu-width: 300px !default;
 
 $app-toolbar-height: 60px !default; // = $mat-toolbar-height-mobile + 4 (progress bar);
 
-
 $app-table-header-height: 44px !default;
 $app-table-cell-horizontal-padding: 8px !default;
 $app-table-row-height: 48px !default;
@@ -13,11 +12,13 @@ $app-form-buttons-bar-height: 56px !default;
 $app-form-color: rgba(0, 0, 0, 0.87) !default;
 $app-form-color-disabled: rgba(0, 0, 0, 0.55) !default;
 $app-form-color-computed: var(--ion-color-primary-tint) !default;
-$app-form-field-background-color: rgb(245,245,245) !default; // Form's field background
+$app-form-field-background-color: #f5f5f5 !default; // Form's field background
 $app-form-field-disabled-background-color: #fafafa !default;
 
 $app-select-option-border-color: rgba(0, 0, 0, 0.12) !default;
 $app-table-border-color: rgba(0, 0, 0, 0.08) !default;
+$app-table-row-item-selected-background-color: var(--ion-color-secondary100) !default;
+$app-table-row-item-selected-text-color: var(--ion-color-secondary100-contrast) !default;
 
 // Form fields background : transparent
 //$app-form-field-background-color: transparent !default;

package/src/theme/_ngx-components.scss

@@ -128,12 +128,12 @@ ion-menu.menu-side-left {
 
 
 mat-form-field {
-
   .mat-paginator-page-size-select {
     @include font-size-important(14px);
   }
 }
 
+
 // --- mat-date-short-field
 mat-calendar.mat-date-short-panel {
   // Hide some buttons (e.g. to change the period)
@@ -345,7 +345,7 @@ ion-list,
     bottom: 0;
     z-index: 1001;
     border-top: 1px solid #{$app-select-option-border-color};
-    background-color: whitesmoke;
+    background-color: var(--ion-toolbar-background, #{$ion-toolbar-background});
     color: var(--ion-color-medium) !important; // not working on mobile form because the mat-option is disabled
     @include font-size(12px);
     font-weight: 500;

package/src/theme/_ngx-components.table.scss

@@ -8,10 +8,21 @@
   overflow-x: auto;
 }
 
+.dark .mat-mdc-table {
+  --mdc-checkbox-selected-checkmark-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-icon-color: var(--ion-text-color);
+  --mdc-checkbox-selected-icon-color: var(--ion-color-accent);
+  --mdc-checkbox-unselected-focus-icon-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-hover-icon-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-pressed-icon-color: var(--ion-color-accent);
+}
 
 .mat-mdc-table {
   min-width: calc(100% - 1px);
   border-collapse: separate;
+  --mat-table-background-color: var(--ion-background-color);
+  --mat-table-row-item-label-text-color: var(--ion-text-color);
+  --mat-table-row-item-outline-color: var(--ion-border-color);
   --mat-table-row-item-label-text-size: 14px;
   --mat-table-row-item-label-text-tracking: normal;
   --mat-row-height: #{$app-table-row-height};
@@ -28,9 +39,10 @@
   --mdc-checkbox-state-layer-size: 20px;
   --mdc-filled-text-field-container-color: transparent;
   --mdc-filled-text-field-disabled-container-color: transparent;
-  --mat-select-enabled-trigger-text-color: var(--mat-table-row-item-label-text-color);
-  --mat-select-disabled-trigger-text-color: var(--mat-table-row-item-label-text-color);
-
+  --mdc-filled-text-field-input-text-color: var(--ion-text-color);
+  --mat-select-enabled-trigger-text-color: var(--ion-text-color);
+  --mat-select-disabled-trigger-text-color: var(--ion-text-color);
+  --mdc-form-field-label-text-color: var(--ion-text-color);
 
   .mat-mdc-header-cell {
     color: var(--ion-color-primary);
@@ -208,10 +220,8 @@
     .mat-cell-computed,
     .mat-mdc-cell ion-text.computed,
     .mat-mdc-cell ion-label.computed,{
-      --color: var(--app-form-color-computed, #{$app-form-color-computed}) !important;
-      --mdc-filled-text-field-input-text-color: var(--app-form-color-computed, #{$app-form-color-computed}) !important;
-
-      color: var(--color) !important;
+      --ion-text-color: var(--app-form-color-computed, #{$app-form-color-computed}) !important;
+      color: var(--ion-text-color) !important;
       font-style: italic;
     }
   }
@@ -237,19 +247,27 @@
 
     &.mat-mdc-row-selected,
     &.mat-row-selected {
-      background-color: var(--ion-color-secondary100);
+      --ion-text-color: var(--app-table-row-item-selected-text-color) !important;
+      --ion-background-color: var(--app-table-row-item-selected-background-color) !important;;
+
+      --mdc-filled-text-field-input-text-color: var(--ion-text-color);
+      --mat-select-enabled-trigger-text-color: var(--ion-text-color);
+      --mat-select-disabled-trigger-text-color: var(--ion-text-color);
+      --mdc-form-field-label-text-color: var(--ion-text-color);
+
+      background-color: var(--ion-background-color);
 
       &:not(.mat-mdc-row-error):not(.mat-row-error):hover {
-        background-color: var(--ion-color-secondary100);
+        background-color: var(--ion-background-color);
       }
 
       .mat-mdc-cell {
-        color: var(--ion-color-secondary100-contrast);
+        color: var(--ion-text-color);
       }
 
       &.mat-mdc-row-disabled:hover,
       &.mat-row-disabled:hover {
-        background-color: var(--ion-color-secondary100-shade) !important;
+        background-color: var(--ion-background-color) !important;
       }
 
     }
@@ -267,7 +285,6 @@
     // Error row
     &.mat-mdc-row-error,
     &.mat-row-error {
-      //border-left: 3px solid var(--ion-color-danger-tint) !important;
       background-color: var(--ion-color-warning-tint);
 
       &.mat-mdc-row-disabled:hover,
@@ -526,9 +543,13 @@
   }
 }
 
+// Paginator
 .mat-mdc-paginator {
   --mat-paginator-container-size: var(--app-paginator-height, #{$app-paginator-height});
-  --mat-paginator-container-background-color: whitesmoke;
+  --mat-paginator-container-background-color: var(--ion-toolbar-background, #{$ion-toolbar-background});
+  --mat-paginator-container-text-tracking: normal;
+  --mat-paginator-container-text-color: var(--app-form-color, #{$app-form-color});
+
   overflow-y: hidden;
 
   .mat-mdc-paginator-page-size-select {

package/src/theme/_ngx-components.tabs.scss

@@ -37,3 +37,16 @@
   display: inherit;
 }
 
+// --- Dark mode
+.dark {
+  .mat-mdc-tab-group, .mat-mdc-tab-nav-bar {
+    --mat-tab-header-active-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-active-focus-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-active-hover-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-inactive-label-text-color: var(--app-form-color-disabled);
+    --mat-tab-header-inactive-hover-label-text-color: var(--ion-text-color, #000000de);
+  }
+  .mat-mdc-tab-label-container, .mat-mdc-tab-link-container {
+    --mat-tab-header-divider-color: var(--ion-border-color, rgba(0,0,0,.12)) !important;
+  }
+}

package/src/theme/_theme.variables.scss

@@ -0,0 +1,130 @@
+
+/** Ionic CSS Variables **/
+html {
+  @include css-variables-to-root();
+
+  --ion-background-color: white;
+  --ion-background-color-rgb: 255, 255, 255;
+  --ion-toolbar-background: whitesmoke;
+
+}
+
+html.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: #75C4FD;
+  --ion-color-secondary-rgb: 117, 196, 253;
+  --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: #FF6434;
+  --ion-color-warning-rgb: 255, 100, 52;
+  --ion-color-warning-contrast: #000000;
+  --ion-color-warning-contrast-rgb: 0, 0, 0;
+  --ion-color-warning-shade: #E0BB4B;
+  --ion-color-warning-tint: #FFDA48;
+
+  --ion-color-danger: #fa0021;
+  --ion-color-danger-rgb: 255, 0, 33;
+  --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;
+
+}
+
+
+html.md.dark {
+
+  --app-form-color-disabled: #949494;
+  --app-form-color: var(--ion-text-color);
+
+  --ion-background-color: #121212;
+  --ion-background-color-rgb: 18, 18, 18;
+
+  --ion-text-color: #ffffffde;
+  --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: #1e1e1e;
+
+  --ion-toolbar-background: #1f1f1f;
+
+  --ion-tab-bar-background: #1f1f1f;
+
+  --ion-card-background: #1e1e1e;
+
+  ion-menu ion-content {
+    --background: transparent;
+    --background-color: rgba(var(--ion-color-primary900-rgb), 0.4) !important;
+  }
+
+  //.mat-mdc-table {
+  //  --app-table-row-item-selected-background-color: var(--ion-color-accent);
+  //  --app-table-row-item-selected-text-color: var(--ion-color-accent-contrast);
+  //}
+}
+