Merge branch 'feature/#336-base-screen' into feature/#334-text-theme

Author: jorre127

lib/screen/debug/debug_platform_selector_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/viewmodel/debug/debug_platform_selector_viewmodel.dart';
 import 'package:flutter_template/widget/debug/selector_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';
 
 @flutterRoute

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';
 

lib/screen/license/license_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/styles/theme_data.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

lib/screen/log_detail/log_detail_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/styles/theme_data.dart';
 import 'package:flutter_template/viewmodel/log_detail/log_detail_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';
 

lib/screen/login/login_screen.dart

@@ -4,7 +4,7 @@ import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/styles/theme_data.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';

lib/screen/logs/logs_screen.dart

@@ -4,7 +4,7 @@ import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/styles/theme_data.dart';
 import 'package:flutter_template/util/extension/date_time_extension.dart';
 import 'package:flutter_template/viewmodel/logs/logs_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';
 import 'package:icapps_architecture/icapps_architecture.dart';

lib/screen/permission/analytics_permission_screen.dart

@@ -5,7 +5,7 @@ import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
 import 'package:flutter_template/styles/theme_data.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';
 

lib/screen/todo/todo_list/todo_list_screen.dart

@@ -6,7 +6,7 @@ import 'package:flutter_template/styles/theme_data.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';

lib/widget/general/simple_screen/base_screen.dart renamed to 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';

lib/widget/general/simple_screen/base_screen_content.dart renamed to lib/widget/general/base_screen/base_screen_content.dart

@@ -24,43 +24,42 @@ class BaseScreenContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final Widget content;
+    if (itemBuilder != null) {
+      return ListView.builder(
+        padding: padding,
+        itemBuilder: itemBuilder!,
+        itemCount: itemCount,
+        reverse: reversed,
+      );
+    }
 
     if (children.isNotEmpty) {
       if (useSlivers) {
-        content = CustomScrollView(
+        return CustomScrollView(
           slivers: children,
           reverse: reversed,
         );
-      } else if (isScrollable) {
-        content = ListView(
+      }
+      if (isScrollable) {
+        return ListView(
           padding: padding,
           reverse: reversed,
           children: children,
         );
-      } else {
-        content = Padding(
-          padding: padding,
-          child: Column(
-            verticalDirection: reversed ? VerticalDirection.up : VerticalDirection.down,
-            children: children,
-          ),
-        );
       }
-    } else if (itemBuilder != null) {
-      content = ListView.builder(
+      
+      return Padding(
         padding: padding,
-        itemBuilder: itemBuilder!,
-        itemCount: itemCount,
-        reverse: reversed,
-      );
-    } else {
-      content = Padding(
-        padding: padding,
-        child: child,
+        child: Column(
+          verticalDirection: reversed ? VerticalDirection.up : VerticalDirection.down,
+          children: children,
+        ),
       );
     }
 
-    return content;
+    return Padding(
+      padding: padding,
+      child: child,
+    );
   }
 }

lib/widget/general/simple_screen/base_screen_header.dart renamed to lib/widget/general/base_screen/base_screen_header.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/styles/theme_data.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';
 
@@ -68,7 +68,7 @@ class BaseScreenHeader extends StatelessWidget {
                     actions: trailingItems,
                     child: titleWidget,
                   ),
-                ]
+                ],
               ],
             ),
           ),