Skip to content

Commit b40727e

Browse files
committed
#336: removed padding from theme dimens
1 parent 8ad0a23 commit b40727e

15 files changed

+37
-65
lines changed

lib/screen/license/license_screen.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
33
import 'package:flutter_template/di/injectable.dart';
4-
import 'package:flutter_template/styles/theme_dimens.dart';
54
import 'package:flutter_template/viewmodel/license/license_viewmodel.dart';
65
import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
76
import 'package:flutter_template/widget/provider/provider_widget.dart';
@@ -28,15 +27,15 @@ class LicenseScreenState extends State<LicenseScreen> {
2827
return Card(
2928
color: theme.colorsTheme.background,
3029
child: Padding(
31-
padding: const EdgeInsets.all(ThemeDimens.padding16),
30+
padding: const EdgeInsets.all(16),
3231
child: Column(
3332
crossAxisAlignment: CrossAxisAlignment.start,
3433
children: [
3534
Text(
3635
item.name,
3736
style: theme.coreTextTheme.titleNormal,
3837
),
39-
Container(height: ThemeDimens.padding8),
38+
Container(height: 8),
4039
Text(
4140
item.license,
4241
style: theme.coreTextTheme.bodySmall,

lib/screen/login/login_screen.dart

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
33
import 'package:flutter_template/di/injectable.dart';
4-
import 'package:flutter_template/styles/theme_dimens.dart';
54
import 'package:flutter_template/util/keys.dart';
65
import 'package:flutter_template/viewmodel/login/login_viewmodel.dart';
76
import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
@@ -29,32 +28,32 @@ class LoginScreenState extends State<LoginScreen> {
2928
consumerWithThemeAndLocalization: (context, viewModel, child, theme, localization) => BaseScreen(
3029
showHeader: false,
3130
children: [
32-
Container(height: ThemeDimens.padding16),
31+
Container(height: 16),
3332
Text(
3433
'Login',
3534
style: theme.coreTextTheme.titleNormal,
3635
textAlign: TextAlign.center,
3736
),
38-
Container(height: ThemeDimens.padding32),
37+
Container(height: 32),
3938
Text(
4039
'Just fill in some text. There is no validator for the login',
4140
style: theme.coreTextTheme.labelButtonSmall,
4241
),
43-
Container(height: ThemeDimens.padding32),
42+
Container(height: 32),
4443
FlutterTemplateInputField(
4544
key: Keys.emailInput,
4645
enabled: !viewModel.isLoading,
4746
onChanged: viewModel.onEmailUpdated,
4847
hint: 'Email',
4948
),
50-
Container(height: ThemeDimens.padding16),
49+
Container(height: 16),
5150
FlutterTemplateInputField(
5251
key: Keys.passwordInput,
5352
enabled: !viewModel.isLoading,
5453
onChanged: viewModel.onPasswordUpdated,
5554
hint: 'Password',
5655
),
57-
Container(height: ThemeDimens.padding16),
56+
Container(height: 16),
5857
if (viewModel.isLoading) ...[
5958
const FlutterTemplateProgressIndicator.light(),
6059
] else ...[

lib/screen/todo/todo_add/todo_add_screen.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter/services.dart';
33
import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
44
import 'package:flutter_template/di/injectable.dart';
5-
import 'package:flutter_template/styles/theme_dimens.dart';
65
import 'package:flutter_template/viewmodel/todo/todo_add/todo_add_viewmodel.dart';
76
import 'package:flutter_template/widget/general/styled/flutter_template_back_button.dart';
87
import 'package:flutter_template/widget/general/styled/flutter_template_button.dart';
@@ -39,13 +38,13 @@ class TodoAddScreenState extends State<TodoAddScreen> {
3938
child: Scrollbar(
4039
child: ListView(
4140
physics: ScrollWhenNeededPhysics(targetPlatform: Theme.of(context).platform),
42-
padding: const EdgeInsets.all(ThemeDimens.padding16),
41+
padding: const EdgeInsets.all(16),
4342
children: [
4443
FlutterTemplateInputField(
4544
hint: localization.todoAddInputHint,
4645
onChanged: viewModel.onTodoChanged,
4746
),
48-
Container(height: ThemeDimens.padding16),
47+
Container(height: 16),
4948
FlutterTemplateButton(
5049
text: localization.generalLabelSave,
5150
isEnabled: viewModel.isSaveEnabled,

lib/screen/todo/todo_list/todo_list_screen.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_template/di/injectable.dart';
33
import 'package:flutter_template/model/webservice/todo/todo.dart';
44
import 'package:flutter_template/styles/theme_assets.dart';
5-
import 'package:flutter_template/styles/theme_dimens.dart';
65
import 'package:flutter_template/util/keys.dart';
76
import 'package:flutter_template/viewmodel/todo/todo_list/todo_list_viewmodel.dart';
87
import 'package:flutter_template/widget/general/action/action_item.dart';
@@ -64,7 +63,7 @@ class TodoListScreenState extends State<TodoListScreen> {
6463
if (data.isEmpty) {
6564
return Center(
6665
child: Padding(
67-
padding: const EdgeInsets.all(ThemeDimens.padding32),
66+
padding: const EdgeInsets.all(32),
6867
child: Text(
6968
localization.todoEmptyState,
7069
textAlign: TextAlign.center,
@@ -84,7 +83,7 @@ class TodoListScreenState extends State<TodoListScreen> {
8483
);
8584
},
8685
separatorBuilder: (context, index) => Padding(
87-
padding: const EdgeInsets.symmetric(horizontal: ThemeDimens.padding16),
86+
padding: const EdgeInsets.symmetric(horizontal: 16),
8887
child: Container(
8988
height: 1,
9089
color: theme.colorsTheme.primary.withOpacity(0.1),

lib/styles/theme_dimens.dart

-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
class ThemeDimens {
22
ThemeDimens._();
33

4-
static const double padding4 = 4;
5-
static const double padding8 = 8;
6-
static const double padding12 = 12;
7-
static const double padding16 = 16;
8-
static const double padding24 = 24;
9-
static const double padding32 = 32;
10-
static const double padding40 = 40;
11-
static const double padding48 = 48;
12-
static const double padding56 = 56;
13-
static const double padding64 = 64;
14-
static const double padding72 = 72;
15-
static const double padding80 = 80;
16-
static const double padding96 = 96;
17-
static const double padding128 = 128;
184
static const double cardBorderRadius = 5;
195

206
static const double enabledOpacity = 1;

lib/widget/debug/debug_row_item.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
43
import 'package:icapps_architecture/icapps_architecture.dart';
54

@@ -21,7 +20,7 @@ class DebugRowItem extends StatelessWidget {
2120
return TouchFeedBack(
2221
onTapped: onClick,
2322
child: Padding(
24-
padding: const EdgeInsets.all(ThemeDimens.padding16),
23+
padding: const EdgeInsets.all(16),
2524
child: Row(
2625
children: [
2726
Expanded(
@@ -33,7 +32,7 @@ class DebugRowItem extends StatelessWidget {
3332
style: theme.coreTextTheme.bodyBig,
3433
),
3534
if (subTitle != null) ...[
36-
Container(height: ThemeDimens.padding4),
35+
Container(height: 4),
3736
Text(
3837
subTitle!,
3938
style: theme.coreTextTheme.bodySmall,

lib/widget/debug/debug_row_title.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
43

54
class DebugRowTitle extends StatelessWidget {
@@ -15,8 +14,8 @@ class DebugRowTitle extends StatelessWidget {
1514
return DataProviderWidget(
1615
childBuilderTheme: (context, theme) => Container(
1716
padding: const EdgeInsets.symmetric(
18-
horizontal: ThemeDimens.padding16,
19-
vertical: ThemeDimens.padding8,
17+
horizontal: 16,
18+
vertical: 8,
2019
),
2120
color: theme.colorsTheme.debugTitleBackground,
2221
child: Text(

lib/widget/debug/debug_switch_row_item.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/widget/general/styled/flutter_template_switch.dart';
43
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
54
import 'package:icapps_architecture/icapps_architecture.dart';
@@ -24,7 +23,7 @@ class DebugRowSwitchItem extends StatelessWidget {
2423
return TouchFeedBack(
2524
onTapped: () => onChanged(!value),
2625
child: Padding(
27-
padding: const EdgeInsets.all(ThemeDimens.padding16),
26+
padding: const EdgeInsets.all(16),
2827
child: Row(
2928
children: [
3029
Expanded(

lib/widget/debug/selector_item.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_template/styles/theme_assets.dart';
3-
import 'package:flutter_template/styles/theme_dimens.dart';
43
import 'package:flutter_template/widget/general/svg_icon.dart';
54
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
65
import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,7 +22,7 @@ class SelectorItem extends StatelessWidget {
2322
childBuilderTheme: (context, theme) => TouchFeedBack(
2423
onTapped: onClick,
2524
child: Padding(
26-
padding: const EdgeInsets.all(ThemeDimens.padding16),
25+
padding: const EdgeInsets.all(16),
2726
child: Row(
2827
children: [
2928
Expanded(

lib/widget/general/action/action_item.dart

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/widget/general/svg_icon.dart';
43
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
54
import 'package:icapps_architecture/icapps_architecture.dart';
@@ -20,19 +19,19 @@ class ActionItem extends StatelessWidget {
2019
Widget build(BuildContext context) {
2120
return DataProviderWidget(
2221
childBuilderTheme: (context, theme) => SizedBox(
23-
height: ThemeDimens.padding56,
24-
width: ThemeDimens.padding56,
22+
height: 56,
23+
width: 56,
2524
child: Center(
2625
child: SizedBox(
27-
height: ThemeDimens.padding48,
28-
width: ThemeDimens.padding48,
26+
height: 48,
27+
width: 48,
2928
child: TouchFeedBack(
30-
borderRadius: BorderRadius.circular(ThemeDimens.padding48),
29+
borderRadius: BorderRadius.circular(48),
3130
onTapped: onClick,
3231
child: Center(
3332
child: SvgIcon(
3433
svgAsset: svgAsset,
35-
size: ThemeDimens.padding24,
34+
size: 24,
3635
color: color ?? theme.colorsTheme.icon,
3736
),
3837
),

lib/widget/general/action/text_action_item.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/styles/theme_durations.dart';
43
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
54
import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,10 +22,10 @@ class TextActionItem extends StatelessWidget {
2322
return DataProviderWidget(
2423
childBuilderTheme: (context, theme) => Center(
2524
child: TouchFeedBack(
26-
borderRadius: BorderRadius.circular(ThemeDimens.padding4),
25+
borderRadius: BorderRadius.circular(4),
2726
onTapped: enabled ? onClick : null,
2827
child: Padding(
29-
padding: const EdgeInsets.symmetric(horizontal: ThemeDimens.padding16, vertical: ThemeDimens.padding8),
28+
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
3029
child: AnimatedDefaultTextStyle(
3130
style: style ?? theme.inverseCoreTextTheme.labelButtonSmall,
3231
duration: ThemeDurations.shortAnimationDuration,

lib/widget/general/styled/flutter_template_checkbox.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_template/styles/theme_assets.dart';
3-
import 'package:flutter_template/styles/theme_dimens.dart';
43
import 'package:flutter_template/widget/general/svg_icon.dart';
54
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
65
import 'package:icapps_architecture/icapps_architecture.dart';
@@ -23,14 +22,14 @@ class FlutterTemplateCheckBox extends StatelessWidget {
2322
onTap: () => onChanged(!value),
2423
child: Container(
2524
color: Colors.transparent,
26-
height: ThemeDimens.padding48,
27-
width: ThemeDimens.padding48,
25+
height: 48,
26+
width: 48,
2827
child: value
2928
? Center(
3029
child: SvgIcon(
3130
svgAsset: ThemeAssets.doneIcon(context),
3231
color: theme.colorsTheme.accent,
33-
size: ThemeDimens.padding24,
32+
size: 24,
3433
),
3534
)
3635
: Container(),

lib/widget/todo/todo_row_item.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_template/styles/theme_dimens.dart';
32
import 'package:flutter_template/widget/general/styled/flutter_template_checkbox.dart';
43
import 'package:flutter_template/widget/provider/data_provider_widget.dart';
54

@@ -23,8 +22,8 @@ class TodoRowItem extends StatelessWidget {
2322
child: Container(
2423
color: Colors.transparent,
2524
padding: const EdgeInsets.symmetric(
26-
horizontal: ThemeDimens.padding16,
27-
vertical: ThemeDimens.padding8,
25+
horizontal: 16,
26+
vertical: 8,
2827
),
2928
child: Row(
3029
children: [

test/styles/theme_assets_test.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_svg/flutter_svg.dart';
33
import 'package:flutter_template/styles/theme_assets.dart';
44
import 'package:flutter_template/styles/theme_data.dart';
5-
import 'package:flutter_template/styles/theme_dimens.dart';
65
import 'package:flutter_test/flutter_test.dart';
76

87
import '../util/test_util.dart';
@@ -126,8 +125,8 @@ class IconAssetTesterAndroid extends StatelessWidget {
126125
child: LayoutBuilder(
127126
builder: (context, constraint) => SvgPicture.asset(
128127
getAsset(context),
129-
height: ThemeDimens.padding64,
130-
width: ThemeDimens.padding64,
128+
height: 64,
129+
width: 64,
131130
colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
132131
),
133132
),
@@ -150,8 +149,8 @@ class IconAssetTesterIOS extends StatelessWidget {
150149
child: LayoutBuilder(
151150
builder: (context, constraint) => SvgPicture.asset(
152151
getAsset(context),
153-
height: ThemeDimens.padding64,
154-
width: ThemeDimens.padding64,
152+
height: 64,
153+
width: 64,
155154
colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
156155
),
157156
),

test/widget/general/svg_icon_test.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_template/styles/theme_assets.dart';
3-
import 'package:flutter_template/styles/theme_dimens.dart';
43
import 'package:flutter_template/widget/general/svg_icon.dart';
54
import 'package:flutter_test/flutter_test.dart';
65

@@ -27,7 +26,7 @@ void main() {
2726
testWidgets('SvgIcon custom size', (tester) async {
2827
const sut = SvgIcon(
2928
svgAsset: 'assets/images/icons/android/done.svg',
30-
size: ThemeDimens.padding64,
29+
size: 64,
3130
);
3231

3332
await TestUtil.loadWidgetWithText(tester, sut);
@@ -38,7 +37,7 @@ void main() {
3837
const sut = SvgIcon(
3938
svgAsset: 'assets/images/icons/android/done.svg',
4039
color: Colors.purple,
41-
size: ThemeDimens.padding64,
40+
size: 64,
4241
);
4342

4443
await TestUtil.loadWidgetWithText(tester, sut);
@@ -49,7 +48,7 @@ void main() {
4948
builder: (context, constraints) => SvgIcon(
5049
svgAsset: ThemeAssets.doneIcon(context),
5150
color: Colors.purple,
52-
size: ThemeDimens.padding64,
51+
size: 64,
5352
));
5453

5554
await TestUtil.loadWidgetWithText(tester, sut);

0 commit comments

Comments
 (0)