From d2f391ab7f47d2f2957559d3f0b2044882e6ad3d Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 19 Nov 2020 18:06:16 +0300 Subject: [PATCH] setting page inprogress --- lib/pages/settings/general_setting.dart | 11 ++++++----- .../permission/permission_service.dart | 18 +++++++++++++++++- lib/widgets/buttons/button.dart | 6 ++++-- lib/widgets/buttons/defaultButton.dart | 5 ++++- pubspec.yaml | 1 + 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/lib/pages/settings/general_setting.dart b/lib/pages/settings/general_setting.dart index 5e174fbc..7fef62a5 100644 --- a/lib/pages/settings/general_setting.dart +++ b/lib/pages/settings/general_setting.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/services/permission/permission_service.dart'; import 'package:diplomaticquarterapp/theme/theme_notifier.dart'; import 'package:diplomaticquarterapp/theme/theme_value.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; @@ -24,7 +25,7 @@ class _GeneralSettings extends State bool camera =false; bool location =false; var sharedPref = new AppSharedPreferences(); - + var permission = new PermissionService(); @override void initState() { getValues(); @@ -256,16 +257,16 @@ class _GeneralSettings extends State } break; } - sharedPref.setInt(THEME_VALUE, value); + permission.setTheme(value); } setVibration(value){ - sharedPref.setBool(IS_VIBRATION, value); + permission.setVibrationPermission(value); } getValues() async{ - blindValue= await sharedPref.getInt(THEME_VALUE) ?? 0; - vibration= await sharedPref.getBool(IS_VIBRATION) ?? false; + blindValue= permission.isThemeEnabled() == null ? 0 : permission.isThemeEnabled(); + vibration = permission.isVibrationEnabled() ==null ? false : permission.isVibrationEnabled(); } getTheme(value) async{ if(value ==1){ diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart index 80eb19c5..292724f2 100644 --- a/lib/services/permission/permission_service.dart +++ b/lib/services/permission/permission_service.dart @@ -6,11 +6,27 @@ import 'package:diplomaticquarterapp/models/Request.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:flutter/material.dart'; +import 'package:localstorage/localstorage.dart'; class PermissionService extends BaseService { - AppSharedPreferences sharedPref = AppSharedPreferences(); + final LocalStorage storage = new LocalStorage("permission"); + AppGlobal appGlobal = new AppGlobal(); + setVibrationPermission(flag) async { + storage.setItem('isVibration', flag); + } + + isVibrationEnabled() { + return storage.getItem('isVibration'); + } + + setTheme(flag) async { + storage.setItem('isTheme', flag); + } + isThemeEnabled() { + return storage.getItem('isTheme'); + } } diff --git a/lib/widgets/buttons/button.dart b/lib/widgets/buttons/button.dart index d37eb039..5b0e6489 100644 --- a/lib/widgets/buttons/button.dart +++ b/lib/widgets/buttons/button.dart @@ -1,4 +1,6 @@ +import 'package:diplomaticquarterapp/services/permission/permission_service.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:hexcolor/hexcolor.dart'; /// Button widget @@ -33,7 +35,7 @@ class _ButtonState extends State