Skip to content

Commit 5cf0204

Browse files
committed
MOBILE-3572 settings: Add notice when auto color scheme is selected
1 parent b6cb643 commit 5cf0204

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

src/assets/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,6 +2001,7 @@
20012001
"core.settings.cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
20022002
"core.settings.colorscheme": "Color Scheme",
20032003
"core.settings.colorscheme-auto": "Auto (based on system settings)",
2004+
"core.settings.colorscheme-auto-notice": "Auto mode may not work in some Android devices.",
20042005
"core.settings.colorscheme-dark": "Dark",
20052006
"core.settings.colorscheme-light": "Light",
20062007
"core.settings.compilationinfo": "Compilation info",

src/core/settings/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
88
"colorscheme": "Color Scheme",
99
"colorscheme-auto": "Auto (based on system settings)",
10+
"colorscheme-auto-notice": "Auto mode may not work in some Android devices.",
1011
"colorscheme-dark": "Dark",
1112
"colorscheme-light": "Light",
1213
"compilationinfo": "Compilation info",

src/core/settings/pages/general/general.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ion-segment-button>
2121
</ion-segment>
2222
</ion-item>
23-
<ion-item text-wrap class="core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0">
23+
<ion-item text-wrap class="core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0" [attr.no-lines]="selectedScheme=='auto' && isAndroid ? true : null">
2424
<ion-label>
2525
<h2>{{ 'core.settings.colorscheme' | translate }}</h2>
2626
<p *ngIf="colorSchemeDisabled" class="text-danger">{{ 'core.settings.forcedsetting' | translate }}</p>
@@ -29,6 +29,9 @@ <h2>{{ 'core.settings.colorscheme' | translate }}</h2>
2929
<ion-option *ngFor="let scheme of colorSchemes" [value]="scheme">{{ 'core.settings.colorscheme-' + scheme | translate }}</ion-option>
3030
</ion-select>
3131
</ion-item>
32+
<ion-item text-wrap *ngIf="colorSchemes.length > 0 && selectedScheme=='auto' && isAndroid">
33+
<p class="text-danger">{{ 'core.settings.colorscheme-auto-notice' | translate }}</p>
34+
</ion-item>
3235
<ion-item text-wrap *ngIf="rteSupported">
3336
<ion-label>
3437
<h2>{{ 'core.settings.enablerichtexteditor' | translate }}</h2>

src/core/settings/pages/general/general.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import { Component, ViewChild } from '@angular/core';
1616
import { IonicPage, Segment } from 'ionic-angular';
1717
import { CoreConstants } from '@core/constants';
18+
import { CoreApp } from '@providers/app';
1819
import { CoreConfigProvider } from '@providers/config';
1920
import { CoreFileProvider } from '@providers/file';
2021
import { CoreEventsProvider } from '@providers/events';
@@ -46,6 +47,7 @@ export class CoreSettingsGeneralPage {
4647
colorSchemes = [];
4748
selectedScheme: string;
4849
colorSchemeDisabled: boolean;
50+
isAndroid: boolean;
4951

5052
constructor(protected configProvider: CoreConfigProvider,
5153
fileProvider: CoreFileProvider,
@@ -71,6 +73,8 @@ export class CoreSettingsGeneralPage {
7173
this.colorSchemes.push('light');
7274
this.selectedScheme = this.colorSchemes[0];
7375
} else {
76+
this.isAndroid = CoreApp.instance.isAndroid();
77+
7478
this.colorSchemes = this.settingsHelper.getAllowedColorSchemes();
7579

7680
this.configProvider.get(CoreConstants.SETTINGS_COLOR_SCHEME, 'light').then((scheme) => {

0 commit comments

Comments
 (0)