#336: removed padding from theme dimens

icapps · Oct 11, 2024 · b40727e · b40727e
1 parent 8ad0a23
commit b40727e
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 65 deletions.
diff --git a/lib/screen/license/license_screen.dart b/lib/screen/license/license_screen.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
 import 'package:flutter_template/di/injectable.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/viewmodel/license/license_viewmodel.dart';
 import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
 import 'package:flutter_template/widget/provider/provider_widget.dart';
@@ -28,15 +27,15 @@ class LicenseScreenState extends State<LicenseScreen> {
           return Card(
             color: theme.colorsTheme.background,
             child: Padding(
-              padding: const EdgeInsets.all(ThemeDimens.padding16),
+              padding: const EdgeInsets.all(16),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
                     item.name,
                     style: theme.coreTextTheme.titleNormal,
                   ),
-                  Container(height: ThemeDimens.padding8),
+                  Container(height: 8),
                   Text(
                     item.license,
                     style: theme.coreTextTheme.bodySmall,

diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
 import 'package:flutter_template/di/injectable.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/util/keys.dart';
 import 'package:flutter_template/viewmodel/login/login_viewmodel.dart';
 import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
@@ -29,32 +28,32 @@ class LoginScreenState extends State<LoginScreen> {
       consumerWithThemeAndLocalization: (context, viewModel, child, theme, localization) => BaseScreen(
         showHeader: false,
         children: [
-          Container(height: ThemeDimens.padding16),
+          Container(height: 16),
           Text(
             'Login',
             style: theme.coreTextTheme.titleNormal,
             textAlign: TextAlign.center,
           ),
-          Container(height: ThemeDimens.padding32),
+          Container(height: 32),
           Text(
             'Just fill in some text. There is no validator for the login',
             style: theme.coreTextTheme.labelButtonSmall,
           ),
-          Container(height: ThemeDimens.padding32),
+          Container(height: 32),
           FlutterTemplateInputField(
             key: Keys.emailInput,
             enabled: !viewModel.isLoading,
             onChanged: viewModel.onEmailUpdated,
             hint: 'Email',
           ),
-          Container(height: ThemeDimens.padding16),
+          Container(height: 16),
           FlutterTemplateInputField(
             key: Keys.passwordInput,
             enabled: !viewModel.isLoading,
             onChanged: viewModel.onPasswordUpdated,
             hint: 'Password',
           ),
-          Container(height: ThemeDimens.padding16),
+          Container(height: 16),
           if (viewModel.isLoading) ...[
             const FlutterTemplateProgressIndicator.light(),
           ] else ...[

diff --git a/lib/screen/todo/todo_add/todo_add_screen.dart b/lib/screen/todo/todo_add/todo_add_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
 import 'package:flutter_template/di/injectable.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/viewmodel/todo/todo_add/todo_add_viewmodel.dart';
 import 'package:flutter_template/widget/general/styled/flutter_template_back_button.dart';
 import 'package:flutter_template/widget/general/styled/flutter_template_button.dart';
@@ -39,13 +38,13 @@ class TodoAddScreenState extends State<TodoAddScreen> {
           child: Scrollbar(
             child: ListView(
               physics: ScrollWhenNeededPhysics(targetPlatform: Theme.of(context).platform),
-              padding: const EdgeInsets.all(ThemeDimens.padding16),
+              padding: const EdgeInsets.all(16),
               children: [
                 FlutterTemplateInputField(
                   hint: localization.todoAddInputHint,
                   onChanged: viewModel.onTodoChanged,
                 ),
-                Container(height: ThemeDimens.padding16),
+                Container(height: 16),
                 FlutterTemplateButton(
                   text: localization.generalLabelSave,
                   isEnabled: viewModel.isSaveEnabled,

diff --git a/lib/screen/todo/todo_list/todo_list_screen.dart b/lib/screen/todo/todo_list/todo_list_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/model/webservice/todo/todo.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/util/keys.dart';
 import 'package:flutter_template/viewmodel/todo/todo_list/todo_list_viewmodel.dart';
 import 'package:flutter_template/widget/general/action/action_item.dart';
@@ -64,7 +63,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                     if (data.isEmpty) {
                       return Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(ThemeDimens.padding32),
+                          padding: const EdgeInsets.all(32),
                           child: Text(
                             localization.todoEmptyState,
                             textAlign: TextAlign.center,
@@ -84,7 +83,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                         );
                       },
                       separatorBuilder: (context, index) => Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: ThemeDimens.padding16),
+                        padding: const EdgeInsets.symmetric(horizontal: 16),
                         child: Container(
                           height: 1,
                           color: theme.colorsTheme.primary.withOpacity(0.1),

diff --git a/lib/styles/theme_dimens.dart b/lib/styles/theme_dimens.dart
@@ -1,20 +1,6 @@
 class ThemeDimens {
   ThemeDimens._();
 
-  static const double padding4 = 4;
-  static const double padding8 = 8;
-  static const double padding12 = 12;
-  static const double padding16 = 16;
-  static const double padding24 = 24;
-  static const double padding32 = 32;
-  static const double padding40 = 40;
-  static const double padding48 = 48;
-  static const double padding56 = 56;
-  static const double padding64 = 64;
-  static const double padding72 = 72;
-  static const double padding80 = 80;
-  static const double padding96 = 96;
-  static const double padding128 = 128;
   static const double cardBorderRadius = 5;
 
   static const double enabledOpacity = 1;

diff --git a/lib/widget/debug/debug_row_item.dart b/lib/widget/debug/debug_row_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
 
@@ -21,7 +20,7 @@ class DebugRowItem extends StatelessWidget {
       return TouchFeedBack(
         onTapped: onClick,
         child: Padding(
-          padding: const EdgeInsets.all(ThemeDimens.padding16),
+          padding: const EdgeInsets.all(16),
           child: Row(
             children: [
               Expanded(
@@ -33,7 +32,7 @@ class DebugRowItem extends StatelessWidget {
                       style: theme.coreTextTheme.bodyBig,
                     ),
                     if (subTitle != null) ...[
-                      Container(height: ThemeDimens.padding4),
+                      Container(height: 4),
                       Text(
                         subTitle!,
                         style: theme.coreTextTheme.bodySmall,

diff --git a/lib/widget/debug/debug_row_title.dart b/lib/widget/debug/debug_row_title.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 
 class DebugRowTitle extends StatelessWidget {
@@ -15,8 +14,8 @@ class DebugRowTitle extends StatelessWidget {
     return DataProviderWidget(
       childBuilderTheme: (context, theme) => Container(
         padding: const EdgeInsets.symmetric(
-          horizontal: ThemeDimens.padding16,
-          vertical: ThemeDimens.padding8,
+          horizontal: 16,
+          vertical: 8,
         ),
         color: theme.colorsTheme.debugTitleBackground,
         child: Text(

diff --git a/lib/widget/debug/debug_switch_row_item.dart b/lib/widget/debug/debug_switch_row_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/styled/flutter_template_switch.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
@@ -24,7 +23,7 @@ class DebugRowSwitchItem extends StatelessWidget {
       return TouchFeedBack(
         onTapped: () => onChanged(!value),
         child: Padding(
-          padding: const EdgeInsets.all(ThemeDimens.padding16),
+          padding: const EdgeInsets.all(16),
           child: Row(
             children: [
               Expanded(

diff --git a/lib/widget/debug/selector_item.dart b/lib/widget/debug/selector_item.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/svg_icon.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,7 +22,7 @@ class SelectorItem extends StatelessWidget {
       childBuilderTheme: (context, theme) => TouchFeedBack(
         onTapped: onClick,
         child: Padding(
-          padding: const EdgeInsets.all(ThemeDimens.padding16),
+          padding: const EdgeInsets.all(16),
           child: Row(
             children: [
               Expanded(

diff --git a/lib/widget/general/action/action_item.dart b/lib/widget/general/action/action_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/svg_icon.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
@@ -20,19 +19,19 @@ class ActionItem extends StatelessWidget {
   Widget build(BuildContext context) {
     return DataProviderWidget(
       childBuilderTheme: (context, theme) => SizedBox(
-        height: ThemeDimens.padding56,
-        width: ThemeDimens.padding56,
+        height: 56,
+        width: 56,
         child: Center(
           child: SizedBox(
-            height: ThemeDimens.padding48,
-            width: ThemeDimens.padding48,
+            height: 48,
+            width: 48,
             child: TouchFeedBack(
-              borderRadius: BorderRadius.circular(ThemeDimens.padding48),
+              borderRadius: BorderRadius.circular(48),
               onTapped: onClick,
               child: Center(
                 child: SvgIcon(
                   svgAsset: svgAsset,
-                  size: ThemeDimens.padding24,
+                  size: 24,
                   color: color ?? theme.colorsTheme.icon,
                 ),
               ),

diff --git a/lib/widget/general/action/text_action_item.dart b/lib/widget/general/action/text_action_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/styles/theme_durations.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,10 +22,10 @@ class TextActionItem extends StatelessWidget {
     return DataProviderWidget(
       childBuilderTheme: (context, theme) => Center(
         child: TouchFeedBack(
-          borderRadius: BorderRadius.circular(ThemeDimens.padding4),
+          borderRadius: BorderRadius.circular(4),
           onTapped: enabled ? onClick : null,
           child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: ThemeDimens.padding16, vertical: ThemeDimens.padding8),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
             child: AnimatedDefaultTextStyle(
               style: style ?? theme.inverseCoreTextTheme.labelButtonSmall,
               duration: ThemeDurations.shortAnimationDuration,

diff --git a/lib/widget/general/styled/flutter_template_checkbox.dart b/lib/widget/general/styled/flutter_template_checkbox.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/svg_icon.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,14 +22,14 @@ class FlutterTemplateCheckBox extends StatelessWidget {
           onTap: () => onChanged(!value),
           child: Container(
             color: Colors.transparent,
-            height: ThemeDimens.padding48,
-            width: ThemeDimens.padding48,
+            height: 48,
+            width: 48,
             child: value
                 ? Center(
                     child: SvgIcon(
                       svgAsset: ThemeAssets.doneIcon(context),
                       color: theme.colorsTheme.accent,
-                      size: ThemeDimens.padding24,
+                      size: 24,
                     ),
                   )
                 : Container(),

diff --git a/lib/widget/todo/todo_row_item.dart b/lib/widget/todo/todo_row_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/styled/flutter_template_checkbox.dart';
 import 'package:flutter_template/widget/provider/data_provider_widget.dart';
 
@@ -23,8 +22,8 @@ class TodoRowItem extends StatelessWidget {
         child: Container(
           color: Colors.transparent,
           padding: const EdgeInsets.symmetric(
-            horizontal: ThemeDimens.padding16,
-            vertical: ThemeDimens.padding8,
+            horizontal: 16,
+            vertical: 8,
           ),
           child: Row(
             children: [

diff --git a/test/styles/theme_assets_test.dart b/test/styles/theme_assets_test.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
 import 'package:flutter_template/styles/theme_data.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../util/test_util.dart';
@@ -126,8 +125,8 @@ class IconAssetTesterAndroid extends StatelessWidget {
       child: LayoutBuilder(
         builder: (context, constraint) => SvgPicture.asset(
           getAsset(context),
-          height: ThemeDimens.padding64,
-          width: ThemeDimens.padding64,
+          height: 64,
+          width: 64,
           colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
         ),
       ),
@@ -150,8 +149,8 @@ class IconAssetTesterIOS extends StatelessWidget {
       child: LayoutBuilder(
         builder: (context, constraint) => SvgPicture.asset(
           getAsset(context),
-          height: ThemeDimens.padding64,
-          width: ThemeDimens.padding64,
+          height: 64,
+          width: 64,
           colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
         ),
       ),

diff --git a/test/widget/general/svg_icon_test.dart b/test/widget/general/svg_icon_test.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
-import 'package:flutter_template/styles/theme_dimens.dart';
 import 'package:flutter_template/widget/general/svg_icon.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -27,7 +26,7 @@ void main() {
   testWidgets('SvgIcon custom size', (tester) async {
     const sut = SvgIcon(
       svgAsset: 'assets/images/icons/android/done.svg',
-      size: ThemeDimens.padding64,
+      size: 64,
     );
 
     await TestUtil.loadWidgetWithText(tester, sut);
@@ -38,7 +37,7 @@ void main() {
     const sut = SvgIcon(
       svgAsset: 'assets/images/icons/android/done.svg',
       color: Colors.purple,
-      size: ThemeDimens.padding64,
+      size: 64,
     );
 
     await TestUtil.loadWidgetWithText(tester, sut);
@@ -49,7 +48,7 @@ void main() {
         builder: (context, constraints) => SvgIcon(
               svgAsset: ThemeAssets.doneIcon(context),
               color: Colors.purple,
-              size: ThemeDimens.padding64,
+              size: 64,
             ));
 
     await TestUtil.loadWidgetWithText(tester, sut);