diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json index 11fe846af82de9b3fcafd70c5ca1b359df645318..0c45db49cd988d19eb0baa4a50e6b9faf55bc9f6 100644 --- a/www/i18n/locale-en-GB.json +++ b/www/i18n/locale-en-GB.json @@ -154,6 +154,7 @@ "ENABLE_HELPTIP": "Enable contextual help tips", "DISABLE_HELPTIP": "Disable contextual help tips", "ENABLE_UI_EFFECTS": "Enable visual effects", + "ENABLE_UI_EFFECTS_HELP": "Transition between pages, animation of lists", "HISTORY_SETTINGS": "Account operations", "DISPLAY_UD_HISTORY": "Display produced dividends?", "TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?", diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json index 3e5f959f2f1962c93b2718b6be0a4f8137cd4297..c96c2d63523a656b063a17291e04e18c5d9edfc3 100644 --- a/www/i18n/locale-en.json +++ b/www/i18n/locale-en.json @@ -154,6 +154,7 @@ "ENABLE_HELPTIP": "Enable contextual help tips", "DISABLE_HELPTIP": "Disable contextual help tips", "ENABLE_UI_EFFECTS": "Enable visual effects", + "ENABLE_UI_EFFECTS_HELP": "Transition between pages, animation of list", "HISTORY_SETTINGS": "Account operations", "DISPLAY_UD_HISTORY": "Display produced dividends?", "TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?", diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index 51421335c58e63148f0ccb589e71f4817f5fcfe4..af01a10aa08cf1db9ada4cf04ad8b25b16157baf 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -151,9 +151,10 @@ "WALLETS_SETTINGS": "Mes portefeuilles", "USE_WALLETS_ENCRYPTION": "Sécuriser la liste ?", "USE_WALLETS_ENCRYPTION_HELP": "Permet de sécuriser la liste de vos portefeuilles (par chiffrement), en exigeant une authentification pour y accéder.", - "ENABLE_HELPTIP": "Activer les bulles d'aide contextuelles", + "ENABLE_HELPTIP": "Activer les bulles d'aide contextuelles ?", "DISABLE_HELPTIP": "Désactiver les bulles d'aide contextuelles", - "ENABLE_UI_EFFECTS": "Activer les effets visuels", + "ENABLE_UI_EFFECTS": "Activer les effets visuels ?", + "ENABLE_UI_EFFECTS_HELP": "Transition entre les pages, animation des listes, etc.", "HISTORY_SETTINGS": "Mes opérations", "DISPLAY_UD_HISTORY": "Afficher les dividendes produits ?", "TX_HISTORY_AUTO_REFRESH": "Rafraîchir automatiquement", diff --git a/www/js/controllers/settings-controllers.js b/www/js/controllers/settings-controllers.js index 0239a70f41783582505d17b80b4a3610a53e0f51..2e7082d320823934a709cf34bdd4b77e1c334098 100644 --- a/www/js/controllers/settings-controllers.js +++ b/www/js/controllers/settings-controllers.js @@ -291,6 +291,9 @@ function SettingsController($scope, $q, $window, $ionicHistory, $ionicPopup, $ti // Applying csSettings.apply($scope.formData); + // Applying UI effect + UIUtils.setEffects($scope.formData.uiEffects); + // Store return csSettings.store(); diff --git a/www/js/services/settings-services.js b/www/js/services/settings-services.js index 26d7199be78162690cf96ba7beaba81af8a629ab..c79925b2a35e735ba8cfe6b7ec041d017e2249b5 100644 --- a/www/js/services/settings-services.js +++ b/www/js/services/settings-services.js @@ -163,7 +163,7 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) store = function() { if (!started) { - console.debug('[setting] Waiting start finished...'); + console.debug('[settings] Waiting start finished...'); return (startPromise || start()).then(store); } @@ -190,7 +190,7 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) return promise .then(function() { if (data.useLocalStorage) { - console.debug('[setting] Saved locally'); + console.debug('[settings] Saved locally'); } // Emit event on store @@ -232,7 +232,6 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) if (localeChanged) { $translate.use(data.locale.id); } - }, restore = function() { diff --git a/www/js/services/utils-services.js b/www/js/services/utils-services.js index 215863dc99ea071eb0e4851f8a394bd7edad178f..764fd5777af783efe4f3991a821fa99b8cd16a1b 100644 --- a/www/js/services/utils-services.js +++ b/www/js/services/utils-services.js @@ -713,7 +713,7 @@ angular.module('cesium.utils.services', ['angular-fullscreen-toggle']) } function setEffects(enable) { - if (exports.motion.enable === enable) return; // same + if (exports.motion.enable === enable) return; // unchanged console.debug('[UI] [effects] ' + (enable ? 'Enable' : 'Disable')); exports.motion.enable = enable; diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html index 85edf849b8b11865330abe3d3eac55d2e48bbb57..450db38b37d1d53d83540e27a98b10d7a0cab4cf 100644 --- a/www/templates/settings/settings.html +++ b/www/templates/settings/settings.html @@ -63,16 +63,18 @@ </label> </div> - <!--div class="item item-toggle dark item-text-wrap"> + <div class="item item-toggle dark item-text-wrap"> <div class="input-label" ng-bind-html="'SETTINGS.ENABLE_UI_EFFECTS' | translate"> </div> + <h4 class="gray" ng-bind-html="'SETTINGS.ENABLE_UI_EFFECTS_HELP' | translate"> + </h4> <label class="toggle toggle-royal"> <input type="checkbox" ng-model="formData.uiEffects" > <div class="track"> <div class="handle"></div> </div> </label> - </div--> + </div> <span class="item item-divider" translate>SETTINGS.STORAGE_DIVIDER</span>