[#204] [CR] Drop Custom Date/Time Pickers. Fix right indentation

lyskouski · Sep 26, 2023 · 7e430e7 · 7e430e7
1 parent 615bce4
commit 7e430e7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/lib/_configs/theme_helper.dart b/lib/_configs/theme_helper.dart
@@ -29,8 +29,10 @@ class ThemeHelper {
 
   static double getIndent([double multiply = 1]) => _Sizes.normal / AppZoom.state * multiply;
 
-  static double getWidth(BuildContext context, [double multiply = 4]) =>
-      MediaQuery.sizeOf(context).width / AppZoom.state - getIndent(multiply) - (isNavRight(context) ? 40 : 0);
+  static double getWidth(BuildContext context, [double multiply = 4, BoxConstraints? constraints]) =>
+      MediaQuery.sizeOf(context).width / AppZoom.state -
+      getIndent(multiply) -
+      (isNavRight(context, constraints) ? 40 : 0);
 
   static double getHeight(BuildContext context, [double multiply = 2]) =>
       MediaQuery.sizeOf(context).height / AppZoom.state - getIndent(multiply);

diff --git a/lib/pages/bill/widgets/expenses_tab.dart b/lib/pages/bill/widgets/expenses_tab.dart
@@ -128,8 +128,7 @@ class ExpensesTabState<T extends ExpensesTab> extends AbstractPageState<T> {
   Widget buildContent(BuildContext context, BoxConstraints constraints) {
     final TextTheme textTheme = context.textTheme;
     double indent = ThemeHelper.getIndent(2);
-    double width = ThemeHelper.getWidth(context, 6);
-
+    double width = ThemeHelper.getWidth(context, 6, constraints);
     return SingleChildScrollView(
       controller: FocusController.getController(runtimeType),
       child: Container(

diff --git a/lib/pages/bill/widgets/income_tab.dart b/lib/pages/bill/widgets/income_tab.dart
@@ -118,7 +118,7 @@ class IncomeTabState extends AbstractPageState<IncomeTab> {
   Widget buildContent(BuildContext context, BoxConstraints constraints) {
     final TextTheme textTheme = context.textTheme;
     double indent = ThemeHelper.getIndent(2);
-    double width = ThemeHelper.getWidth(context, 6);
+    double width = ThemeHelper.getWidth(context, 6, constraints);
 
     return SingleChildScrollView(
       controller: FocusController.getController(runtimeType),

diff --git a/lib/pages/bill/widgets/transfer_tab.dart b/lib/pages/bill/widgets/transfer_tab.dart
@@ -120,7 +120,7 @@ class TransferTabState extends AbstractPageState<TransferTab> {
   Widget buildContent(BuildContext context, BoxConstraints constraints) {
     final TextTheme textTheme = context.textTheme;
     double indent = ThemeHelper.getIndent(2);
-    double width = ThemeHelper.getWidth(context, 6);
+    double width = ThemeHelper.getWidth(context, 6, constraints);
 
     return SingleChildScrollView(
       controller: FocusController.getController(runtimeType),

diff --git a/lib/widgets/form/list_account_selector.dart b/lib/widgets/form/list_account_selector.dart
@@ -80,7 +80,7 @@ class ListAccountSelectorState<K extends ListAccountSelectorItem> extends ListSe
       color: item.item?.color ?? Colors.transparent,
       icon: item.item?.icon ?? Icons.radio_button_unchecked_sharp,
       hidden: item.item?.hidden ?? false,
-      width: widget.width - 32,
+      width: widget.width - 34,
       showDivider: false,
     );
   }