From ae644fdee2c1337766828c90028ef8d2a9e7f9fe Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 26 Jul 2021 22:02:00 +0300 Subject: [PATCH] Custom colors --- lib/main.dart | 6 +++--- lib/ui/app/menu_drawer.dart | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index af6efae4f..9db230a33 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -129,12 +129,12 @@ Future _initialState(bool isTesting) async { final prefs = await SharedPreferences.getInstance(); final prefString = prefs?.getString(kSharedPrefs); - String url = WebUtils.browserUrl ?? prefs.getString(kSharedPrefUrl) ?? ''; + final url = WebUtils.browserUrl ?? prefs.getString(kSharedPrefUrl) ?? ''; if (!kReleaseMode) { //url = kAppStagingUrl; + //url = kAppProductionUrl; + //url = kAppDemoUrl; } - //url = kAppProductionUrl; - //url = kAppDemoUrl; var prefState = PrefState(); if (prefString != null) { diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index fefc20f53..fcd28e53f 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -56,6 +56,9 @@ class MenuDrawer extends StatelessWidget { final enableDarkMode = state.prefState.enableDarkMode; final localization = AppLocalization.of(context); final company = viewModel.selectedCompany; + final inactiveColor = state.prefState + .customColors[PrefState.THEME_SIDEBAR_INACTIVE_BACKGROUND_COLOR] ?? + ''; if (company == null) { return Container(); @@ -240,7 +243,9 @@ class MenuDrawer extends StatelessWidget { ? SizedBox() : Expanded( child: Container( - color: Theme.of(context).cardColor, + color: inactiveColor.isNotEmpty + ? convertHexStringToColor(inactiveColor) + : Theme.of(context).cardColor, child: ScrollableListView( hideMobileThumb: true, children: [