[#231] [NF] BrandBook and Custom Theme. Unify field background

lyskouski · Sep 15, 2023 · 8da669d · 8da669d
1 parent 0080ec7
commit 8da669d
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 10 deletions.
diff --git a/lib/_configs/custom_color_scheme.dart b/lib/_configs/custom_color_scheme.dart
@@ -0,0 +1,5 @@
+import 'package:flutter/material.dart';
+
+extension CustomTextTheme on ColorScheme {
+  Color get fieldBackground => inversePrimary.withOpacity(0.3);
+}
diff --git a/lib/pages/automation/widgets/sync_tab.dart b/lib/pages/automation/widgets/sync_tab.dart
@@ -4,6 +4,7 @@
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/herald/app_sync.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/simple_input.dart';
@@ -88,7 +89,7 @@ class SyncTabState extends State<SyncTab> {
                     ),
                     Container(
                       padding: EdgeInsets.all(indent),
-                      color: context.colorScheme.inversePrimary.withOpacity(0.3),
+                      color: context.colorScheme.fieldBackground,
                       child: SelectableText(
                         sync.getUuid() ?? AppLocale.labels.pearDisabled,
                         style: textTheme.bodyLarge,

diff --git a/lib/pages/budget/budget_add_page.dart b/lib/pages/budget/budget_add_page.dart
@@ -6,6 +6,7 @@ import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
 import 'package:app_finance/_classes/structure/budget_app_data.dart';
 import 'package:app_finance/_classes/controller/focus_controller.dart';
 import 'package:app_finance/_classes/storage/app_preferences.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/pages/abstract_add_page.dart';
@@ -200,7 +201,7 @@ class BudgetAddPageState<T extends BudgetAddPage> extends AbstractAddPageState<B
                     ],
                     [
                       Container(
-                        color: context.colorScheme.inversePrimary.withOpacity(0.3),
+                        color: context.colorScheme.fieldBackground,
                         child: Slider(
                           value: e.value,
                           onChanged: (v) => setState(() => amountSet[e.key] = v),

diff --git a/lib/pages/start/widgets/setting_tab.dart b/lib/pages/start/widgets/setting_tab.dart
@@ -6,6 +6,7 @@ import 'package:app_finance/_classes/herald/app_theme.dart';
 import 'package:app_finance/_classes/herald/app_zoom.dart';
 import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
 import 'package:app_finance/_classes/storage/app_preferences.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/currency_selector.dart';
@@ -143,7 +144,7 @@ class SettingTabState<T extends SettingTab> extends AbstractTabState<T> {
             style: textTheme.bodyLarge,
           ),
           Container(
-            color: context.colorScheme.inversePrimary.withOpacity(0.3),
+            color: context.colorScheme.fieldBackground,
             child: Slider(
               value: zoom.value,
               onChanged: zoom.set,

diff --git a/lib/widgets/form/color_selector.dart b/lib/widgets/form/color_selector.dart
@@ -3,6 +3,7 @@
 
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/controller/focus_controller.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/_ext/color_ext.dart';
 import 'package:app_finance/widgets/form/abstract_selector.dart';
@@ -69,7 +70,7 @@ class ColorSelectorState extends AbstractSelectorState<ColorSelector> {
       decoration: InputDecoration(
         filled: true,
         border: InputBorder.none,
-        fillColor: widget.value ?? context.colorScheme.inversePrimary.withOpacity(0.3),
+        fillColor: widget.value ?? context.colorScheme.fieldBackground,
         suffixIcon: GestureDetector(
           child: const Icon(Icons.color_lens),
         ),

diff --git a/lib/widgets/form/date_input.dart b/lib/widgets/form/date_input.dart
@@ -3,6 +3,7 @@
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
 import 'package:app_finance/_classes/herald/app_locale.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/custom_text_theme.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/abstract_selector.dart';
@@ -57,7 +58,7 @@ class DateInputState extends AbstractSelectorState<DateInput> {
     final style = textTheme.numberMedium.copyWith(color: textTheme.headlineSmall?.color);
     final DateFormat formatterDate = DateFormat.yMd(AppLocale.code);
     return Container(
-      color: context.colorScheme.inversePrimary.withOpacity(0.3),
+      color: context.colorScheme.fieldBackground,
       child: ListTile(
         title: widget.value != null
             ? Text(

diff --git a/lib/widgets/form/date_time_input.dart b/lib/widgets/form/date_time_input.dart
@@ -3,6 +3,7 @@
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
 import 'package:app_finance/_classes/herald/app_locale.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/custom_text_theme.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
@@ -60,7 +61,7 @@ class DateTimeInputState extends AbstractSelectorState<DateTimeInput> {
         ],
         [
           Container(
-            color: context.colorScheme.inversePrimary.withOpacity(0.3),
+            color: context.colorScheme.fieldBackground,
             child: ListTile(
               focusNode: widget.focus,
               autofocus: isFocused,

diff --git a/lib/widgets/form/icon_selector.dart b/lib/widgets/form/icon_selector.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/abstract_selector.dart';
 import 'package:flutter/material.dart';
@@ -41,7 +42,7 @@ class IconSelectorState extends AbstractSelectorState<IconSelector> {
       decoration: InputDecoration(
         filled: true,
         border: InputBorder.none,
-        fillColor: context.colorScheme.inversePrimary.withOpacity(0.3),
+        fillColor: context.colorScheme.fieldBackground,
         prefixIcon: Icon(widget.value),
         suffixIcon: GestureDetector(
           child: const Icon(Icons.arrow_drop_down),

diff --git a/lib/widgets/form/list_selector.dart b/lib/widgets/form/list_selector.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/custom_text_theme.dart';
 import 'package:app_finance/_configs/theme_helper.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
@@ -86,7 +87,7 @@ class ListSelectorState<T extends ListSelector, K extends ListSelectorItem> exte
         onTap: () => onTap(null),
         child: Container(
           width: double.infinity,
-          color: context.colorScheme.inversePrimary.withOpacity(0.3),
+          color: context.colorScheme.fieldBackground,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [

diff --git a/lib/widgets/form/month_year_input.dart b/lib/widgets/form/month_year_input.dart
@@ -3,6 +3,7 @@
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
 import 'package:app_finance/_classes/herald/app_locale.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/custom_text_theme.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/abstract_selector.dart';
@@ -50,7 +51,7 @@ class MonthYearInputState extends AbstractSelectorState<MonthYearInput> {
     final textTheme = context.textTheme;
     final style = textTheme.numberMedium.copyWith(color: textTheme.headlineSmall?.color);
     return Container(
-      color: context.colorScheme.inversePrimary.withOpacity(0.3),
+      color: context.colorScheme.fieldBackground,
       child: ListTile(
         title: widget.value != null
             ? Text(

diff --git a/lib/widgets/form/simple_input.dart b/lib/widgets/form/simple_input.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
 
 import 'package:app_finance/_classes/controller/focus_controller.dart';
+import 'package:app_finance/_configs/custom_color_scheme.dart';
 import 'package:app_finance/_configs/custom_text_theme.dart';
 import 'package:app_finance/_ext/build_context_ext.dart';
 import 'package:app_finance/widgets/form/abstract_input.dart';
@@ -46,7 +47,7 @@ class SimpleInput extends AbstractInput {
       decoration: InputDecoration(
         filled: true,
         border: InputBorder.none,
-        fillColor: context.colorScheme.inversePrimary.withOpacity(0.3),
+        fillColor: context.colorScheme.fieldBackground,
         hintText: tooltip,
         hintStyle: textTheme.numberMedium.copyWith(color: textTheme.headlineSmall?.color!.withOpacity(0.4)),
       ),