EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3363 settings: Allow auto dark mode on iOS

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2020-04-14 12:16:09 +02:00
parent 333f3f7188
commit 98dcb3ae16
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/settings/pages/general/general.ts
View File

@ -14,7 +14,6 @@
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { IonicPage, Segment } from 'ionic-angular'; import { IonicPage, Segment } from 'ionic-angular';
import { CoreAppProvider } from '@providers/app';
import { CoreConstants } from '@core/constants'; import { CoreConstants } from '@core/constants';
import { CoreConfigProvider } from '@providers/config'; import { CoreConfigProvider } from '@providers/config';
import { CoreFileProvider } from '@providers/file'; import { CoreFileProvider } from '@providers/file';
@ -49,10 +48,14 @@ export class CoreSettingsGeneralPage {
selectedScheme: string; selectedScheme: string;
colorSchemeDisabled: boolean; colorSchemeDisabled: boolean;
constructor(private appProvider: CoreAppProvider, private configProvider: CoreConfigProvider, fileProvider: CoreFileProvider, constructor(protected configProvider: CoreConfigProvider,
private eventsProvider: CoreEventsProvider, private langProvider: CoreLangProvider, fileProvider: CoreFileProvider,
private domUtils: CoreDomUtilsProvider, private pushNotificationsProvider: CorePushNotificationsProvider, protected eventsProvider: CoreEventsProvider,
localNotificationsProvider: CoreLocalNotificationsProvider, private settingsHelper: CoreSettingsHelper) { protected langProvider: CoreLangProvider,
protected domUtils: CoreDomUtilsProvider,
protected pushNotificationsProvider: CorePushNotificationsProvider,
localNotificationsProvider: CoreLocalNotificationsProvider,
protected settingsHelper: CoreSettingsHelper) {
// Get the supported languages. // Get the supported languages.
const languages = CoreConfigConstants.languages; const languages = CoreConfigConstants.languages;
@ -72,9 +75,8 @@ export class CoreSettingsGeneralPage {
} else { } else {
let defaultColorScheme = 'light'; let defaultColorScheme = 'light';
// Auto is not working on iOS right now until we update Webkit. if (window.matchMedia('(prefers-color-scheme: dark)').matches ||
if (!this.appProvider.isIOS() && (window.matchMedia('(prefers-color-scheme: dark)').matches || window.matchMedia('(prefers-color-scheme: light)').matches) {
window.matchMedia('(prefers-color-scheme: light)').matches)) {
this.colorSchemes.push('auto'); this.colorSchemes.push('auto');
defaultColorScheme = 'auto'; defaultColorScheme = 'auto';
} }