From 6060e80c42820b4644ae247878eed42f9cfeb39b Mon Sep 17 00:00:00 2001 From: Jordy de Jonghe Date: Wed, 22 Jan 2025 11:30:40 +0100 Subject: [PATCH] #336: implemented PR feedback --- lib/screen/debug/debug_screen.dart | 2 +- lib/screen/license/license_screen.dart | 2 +- lib/screen/login/login_screen.dart | 2 +- .../analytics_permission_screen.dart | 2 +- .../todo/todo_list/todo_list_screen.dart | 2 +- .../base_screen.dart | 4 +- .../base_screen_content.dart | 42 +++++++++---------- .../base_screen_header.dart | 4 +- .../base_screen_header_safe_area.dart | 0 9 files changed, 29 insertions(+), 31 deletions(-) rename lib/widget/general/{simple_screen => base_screen}/base_screen.dart (96%) rename lib/widget/general/{simple_screen => base_screen}/base_screen_content.dart (66%) rename lib/widget/general/{simple_screen => base_screen}/base_screen_header.dart (95%) rename lib/widget/general/{simple_screen => base_screen}/base_screen_header_safe_area.dart (100%) diff --git a/lib/screen/debug/debug_screen.dart b/lib/screen/debug/debug_screen.dart index e1059b79..fe40fc72 100644 --- a/lib/screen/debug/debug_screen.dart +++ b/lib/screen/debug/debug_screen.dart @@ -7,7 +7,7 @@ import 'package:flutter_template/viewmodel/global/global_viewmodel.dart'; import 'package:flutter_template/widget/debug/debug_row_item.dart'; import 'package:flutter_template/widget/debug/debug_row_title.dart'; import 'package:flutter_template/widget/debug/debug_switch_row_item.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screen/license/license_screen.dart b/lib/screen/license/license_screen.dart index 42e88a5b..1f6fb210 100644 --- a/lib/screen/license/license_screen.dart +++ b/lib/screen/license/license_screen.dart @@ -2,7 +2,7 @@ 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/viewmodel/license/license_viewmodel.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; @flutterRoute diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart index 67cab812..27c34f43 100644 --- a/lib/screen/login/login_screen.dart +++ b/lib/screen/login/login_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter_navigation_generator_annotations/flutter_navigation_gene import 'package:flutter_template/di/injectable.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'; +import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_button.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_input_field.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_progress_indicator.dart'; diff --git a/lib/screen/permission/analytics_permission_screen.dart b/lib/screen/permission/analytics_permission_screen.dart index 43c7297d..3d79efc5 100644 --- a/lib/screen/permission/analytics_permission_screen.dart +++ b/lib/screen/permission/analytics_permission_screen.dart @@ -4,7 +4,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_template/di/injectable.dart'; import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/viewmodel/permission/analytics_permission_viewmodel.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_button.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; diff --git a/lib/screen/todo/todo_list/todo_list_screen.dart b/lib/screen/todo/todo_list/todo_list_screen.dart index cb66aed0..a7dc1a7b 100644 --- a/lib/screen/todo/todo_list/todo_list_screen.dart +++ b/lib/screen/todo/todo_list/todo_list_screen.dart @@ -5,7 +5,7 @@ import 'package:flutter_template/styles/theme_assets.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'; -import 'package:flutter_template/widget/general/simple_screen/base_screen.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_progress_indicator.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; import 'package:flutter_template/widget/todo/todo_row_item.dart'; diff --git a/lib/widget/general/simple_screen/base_screen.dart b/lib/widget/general/base_screen/base_screen.dart similarity index 96% rename from lib/widget/general/simple_screen/base_screen.dart rename to lib/widget/general/base_screen/base_screen.dart index 6f5e1730..920bab0f 100644 --- a/lib/widget/general/simple_screen/base_screen.dart +++ b/lib/widget/general/base_screen/base_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen_content.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen_header.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen_content.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen_header.dart'; import 'package:flutter_template/widget/general/status_bar.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_progress_indicator.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; diff --git a/lib/widget/general/simple_screen/base_screen_content.dart b/lib/widget/general/base_screen/base_screen_content.dart similarity index 66% rename from lib/widget/general/simple_screen/base_screen_content.dart rename to lib/widget/general/base_screen/base_screen_content.dart index b6d556eb..2187bae3 100644 --- a/lib/widget/general/simple_screen/base_screen_content.dart +++ b/lib/widget/general/base_screen/base_screen_content.dart @@ -22,37 +22,35 @@ class BaseScreenContent extends StatelessWidget { @override Widget build(BuildContext context) { - final Widget content; - + // single child + if (itemBuilder != null) { + return ListView.builder( + padding: padding, + itemBuilder: itemBuilder!, + itemCount: itemCount, + ); + } + + // multiple children if (children.isNotEmpty) { if (useSlivers) { - content = CustomScrollView( - slivers: children, - ); - } else if (isScrollable) { - content = ListView( + return CustomScrollView(slivers: children); + } + if (isScrollable) { + return ListView( padding: padding, children: children, ); - } else { - content = Padding( - padding: padding, - child: Column(children: children), - ); } - } else if (itemBuilder != null) { - content = ListView.builder( - padding: padding, - itemBuilder: itemBuilder!, - itemCount: itemCount, - ); - } else { - content = Padding( + return Padding( padding: padding, - child: child, + child: Column(children: children), ); } - return content; + return Padding( + padding: padding, + child: child, + ); } } diff --git a/lib/widget/general/simple_screen/base_screen_header.dart b/lib/widget/general/base_screen/base_screen_header.dart similarity index 95% rename from lib/widget/general/simple_screen/base_screen_header.dart rename to lib/widget/general/base_screen/base_screen_header.dart index 2e4c5c6d..47ba6e25 100644 --- a/lib/widget/general/simple_screen/base_screen_header.dart +++ b/lib/widget/general/base_screen/base_screen_header.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_template/util/platform/platform_util.dart'; -import 'package:flutter_template/widget/general/simple_screen/base_screen_header_safe_area.dart'; +import 'package:flutter_template/widget/general/base_screen/base_screen_header_safe_area.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_back_button.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; @@ -67,7 +67,7 @@ class BaseScreenHeader extends StatelessWidget { actions: trailingItems, child: titleWidget, ), - ] + ], ], ), ), diff --git a/lib/widget/general/simple_screen/base_screen_header_safe_area.dart b/lib/widget/general/base_screen/base_screen_header_safe_area.dart similarity index 100% rename from lib/widget/general/simple_screen/base_screen_header_safe_area.dart rename to lib/widget/general/base_screen/base_screen_header_safe_area.dart