#339: fixed debug selector screen

Author: jorre127

lib/di/injectable.config.dart

@@ -1,13 +1,10 @@
 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/viewmodel/debug/debug_platform_selector_viewmodel.dart';
-import 'package:flutter_template/viewmodel/global/global_viewmodel.dart';
 import 'package:flutter_template/widget/debug/selector_item.dart';
-import 'package:flutter_template/widget/general/styled/flutter_template_back_button.dart';
+import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
 import 'package:flutter_template/widget/provider/provider_widget.dart';
-import 'package:provider/provider.dart';
 
 @flutterRoute
 class DebugPlatformSelectorScreen extends StatefulWidget {
@@ -23,35 +20,26 @@ class DebugPlatformSelectorScreenState extends State<DebugPlatformSelectorScreen
   Widget build(BuildContext context) {
     return ProviderWidget<DebugPlatformSelectorViewModel>(
       create: getIt.call,
-      consumerWithThemeAndLocalization: (context, value, _, theme, localization) => Scaffold(
-        backgroundColor: theme.background,
-        appBar: AppBar(
-          systemOverlayStyle: SystemUiOverlayStyle.light,
-          leading: FlutterTemplateBackButton.light(onClick: value.onBackClicked),
-          title: const Text('Select a platform'),
-          backgroundColor: theme.primary,
-        ),
-        body: Consumer<GlobalViewModel>(
-          builder: (context, viewModel, child) => ListView(
-            children: [
-              SelectorItem(
-                title: localization.generalLabelSystemDefault,
-                onClick: viewModel.setSelectedPlatformToDefault,
-                selected: viewModel.targetPlatform == null,
-              ),
-              SelectorItem(
-                title: localization.generalLabelAndroid,
-                onClick: viewModel.setSelectedPlatformToAndroid,
-                selected: viewModel.targetPlatform == TargetPlatform.android,
-              ),
-              SelectorItem(
-                title: localization.generalLabelIos,
-                onClick: viewModel.setSelectedPlatformToIOS,
-                selected: viewModel.targetPlatform == TargetPlatform.iOS,
-              ),
-            ],
+      consumerWithThemeAndLocalization: (context, viewModel, _, theme, localization) => BaseScreen(
+        title: 'Select a platform',
+        isScrollable: true,
+        children: [
+          SelectorItem(
+            title: localization.generalLabelSystemDefault,
+            onClick: viewModel.setSelectedPlatformToDefault,
+            selected: viewModel.selectedPlatform == null,
           ),
-        ),
+          SelectorItem(
+            title: localization.generalLabelAndroid,
+            onClick: viewModel.setSelectedPlatformToAndroid,
+            selected: viewModel.selectedPlatform == TargetPlatform.android,
+          ),
+          SelectorItem(
+            title: localization.generalLabelIos,
+            onClick: viewModel.setSelectedPlatformToIOS,
+            selected: viewModel.selectedPlatform == TargetPlatform.iOS,
+          )
+        ],
       ),
     );
   }

lib/screen/debug/debug_platform_selector_screen.dart

@@ -1,12 +1,26 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter_template/navigator/main_navigator.dart';
+import 'package:flutter_template/viewmodel/global/global_viewmodel.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
 import 'package:injectable/injectable.dart';
 
 @injectable
 class DebugPlatformSelectorViewModel with ChangeNotifierEx {
   final MainNavigator _navigator;
+  final GlobalViewModel _globalViewModel;
 
-  DebugPlatformSelectorViewModel(this._navigator);
+  TargetPlatform? get selectedPlatform => _globalViewModel.targetPlatform;
+
+  DebugPlatformSelectorViewModel(
+    this._globalViewModel,
+    this._navigator,
+  );
 
   void onBackClicked() => _navigator.goBack();
+
+  void setSelectedPlatformToDefault() => _globalViewModel.setSelectedPlatformToDefault();
+
+  void setSelectedPlatformToAndroid() => _globalViewModel.setSelectedPlatformToAndroid();
+
+  void setSelectedPlatformToIOS() => _globalViewModel.setSelectedPlatformToIOS();
 }