Mobile/record sleep scaffold

.github/workflows/mobile.yml

@@ -23,6 +23,8 @@ jobs:
       - uses: subosito/flutter-action@v1
 
       - run: flutter pub get
+
+      - run: flutter packages pub run build_runner build --delete-conflicting-outputs
 
       - run: flutter analyze
 

README.md

@@ -24,18 +24,25 @@ This projects aims to offer a comprehensive guide to **record polysomnographic E
 
 ## Dev workflow
 
+### Web
+
 - Open workspace `polydodo.code-workspace`
 - Install Python packages by running `pip install --user -r backend/requirements.txt`
 - Install node modules by running `yarn install --cwd web`
 - Fetch Flutter dependencies through the `Flutter` extension
 - Start dev server by running `python backend/app.py`
 
-## Building the server as a single executable
+### Building the server as a single executable
 
 Run `python -m PyInstaller --onefile app.py`
 
-## Running the server locally
+### Running the server locally
 
 - [Login](https://docs.github.com/en/free-pro-team@latest/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-with-a-personal-access-token) to Github Docker registry
 - `docker pull docker.pkg.github.com/polycortex/polydodo/backend:latest`
 - `docker run -p 8080:8080 docker.pkg.github.com/polycortex/polydodo/backend:latest`
+
+### Mobile
+
+Prior to build execute build-runner to generate the app's routes.  
+`flutter packages pub run build_runner watch --delete-conflicting-outputs`

mobile/.gitignore

@@ -8,7 +8,6 @@
 .buildlog/
 .history
 .svn/
-.vscode/    
 
 # IntelliJ related
 *.iml
@@ -19,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/settings.json
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -40,3 +39,6 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+
+# Project related
+*.gr.dart

mobile/.vscode/launch.json

@@ -13,6 +13,18 @@
         "--dart-define",
         "HOST=10.0.2.2"
       ]
-    }
-  ]
+    },
+    {
+      "name": "Flutter debug",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "debug"
+},
+{
+      "name": "Flutter release",
+      "flutterMode": "release",
+      "type": "dart",
+      "request": "launch"
 }
+  ]
+}

mobile/lib/src/app.dart

@@ -1,8 +1,9 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:polydodo/src/presentation/bluetooth_route/bluetoothSelector_route.dart';
 
 import 'locator.dart';
+import 'presentation/navigation/routes/router.gr.dart' as auto_router;
 import 'theme.dart';
 
 class App extends StatelessWidget {
@@ -18,10 +19,8 @@ class App extends StatelessWidget {
       child: MaterialApp(
         title: 'PolyDodo',
         theme: theme,
-        initialRoute: BluetoothSelectorRoute.name,
-        routes: {
-          BluetoothSelectorRoute.name: (context) => BluetoothSelectorRoute(),
-        },
+        builder: ExtendedNavigator.builder<auto_router.Router>(
+            router: auto_router.Router()),
       ),
     );
   }

mobile/lib/src/application/blocs.dart

@@ -0,0 +1,2 @@
+export './device/device_selector_cubit.dart';
+export './eeg_data/data_cubit.dart';

mobile/lib/src/application/eeg_data/data_cubit.dart

@@ -1,10 +1,11 @@
 import 'package:polydodo/src/domain/acquisition_device/i_acquisition_device_repository.dart';
 import 'package:polydodo/src/domain/eeg_data/i_eeg_data_repository.dart';
 
-import 'data_states.dart';
 import 'package:bloc/bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+part './data_states.dart';
+
 class DataCubit extends Cubit<DataState> {
   final IAcquisitionDeviceRepository _deviceRepository;
   final IEEGDataRepository _eegDataRepository;

mobile/lib/src/application/eeg_data/data_states.dart

@@ -1,3 +1,5 @@
+part of './data_cubit.dart';
+
 abstract class DataState {}
 
 class DataStateInitial extends DataState {}

mobile/lib/src/presentation/navigation/navdrawer_tabs.dart

@@ -0,0 +1 @@
+enum NavdrawerTab { Dashboard, RecordSleep, BluetoothSelector, History }

mobile/lib/src/presentation/navigation/navdrawer_widget.dart

@@ -0,0 +1,90 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:polydodo/src/presentation/navigation/routes/router.gr.dart';
+
+import 'navdrawer_tabs.dart';
+
+class NavDrawer extends StatelessWidget {
+  static const name = 'appDrawerRoute';
+  final NavdrawerTab activeTab;
+
+  const NavDrawer({
+    Key key,
+    @required this.activeTab,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Drawer(
+      child: ListView(
+        padding: EdgeInsets.zero, //only(top: 8.0),
+        children: <Widget>[
+          _createHeader(),
+          _createDrawerItem(
+            icon: Icons.dashboard,
+            text: 'Dashboard',
+            route: Routes.dashboardPage,
+            context: context,
+          ),
+          _createDrawerItem(
+            icon: Icons.bluetooth,
+            text: 'Bluetooth selector',
+            route: Routes.bluetoothSelectorPage,
+            context: context,
+          ),
+          _createDrawerItem(
+            icon: Icons.hotel,
+            text: 'Record Sleep sequence',
+            route: Routes.recordSleepGuidePage,
+            context: context,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _createHeader() {
+    return DrawerHeader(
+        margin: EdgeInsets.zero,
+        padding: EdgeInsets.zero,
+        decoration: BoxDecoration(
+            image: DecorationImage(
+                fit: BoxFit.fill,
+                image: AssetImage('common/assets/img/Material-Wallpaper.jpg'))),
+        child: Stack(children: <Widget>[
+          Positioned(
+              bottom: 12.0,
+              left: 16.0,
+              child: Text('Polydodo',
+                  style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 20.0,
+                      fontWeight: FontWeight.w500))),
+        ]));
+  }
+
+  Widget _createDrawerItem(
+      {IconData icon,
+      String text,
+      NavdrawerTab tab,
+      String route,
+      BuildContext context}) {
+    return ListTile(
+      title: Row(
+        children: <Widget>[
+          Icon(icon),
+          Padding(
+            padding: EdgeInsets.only(left: 8.0),
+            child: Text(text),
+          )
+        ],
+      ),
+      onTap: () {
+        //context.bloc<NavdrawerBloc>().add(NavdrawerUpdated(state));
+        ExtendedNavigator.of(context).popAndPush(route);
+        // ExtendedNavigator.of(context).replace(route);
+      },
+      selected: activeTab == tab,
+    );
+  }
+}

mobile/lib/src/presentation/navigation/routes/router.dart

@@ -0,0 +1,24 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:auto_route/auto_route_annotations.dart';
+import 'package:polydodo/src/presentation/pages/bluetooth_page/bluetoothSelector_page.dart';
+import 'package:polydodo/src/presentation/pages/dashboard/dashboard_page.dart';
+import 'package:polydodo/src/presentation/pages/record_sleep/record_sleep_guide_page.dart';
+
+@MaterialAutoRouter(
+    generateNavigationHelperExtension: true,
+    routes: <AutoRoute>[
+      CustomRoute(
+          page: DashboardPage,
+          initial: true,
+          transitionsBuilder: TransitionsBuilders.fadeIn),
+      CustomRoute(
+          page: RecordSleepGuidePage,
+          transitionsBuilder: TransitionsBuilders.fadeIn),
+      CustomRoute(
+          page: RecordSleepValidatePage,
+          transitionsBuilder: TransitionsBuilders.fadeIn),
+      CustomRoute(
+          page: BluetoothSelectorPage,
+          transitionsBuilder: TransitionsBuilders.fadeIn),
+    ])
+class $Router {}

mobile/lib/src/presentation/bluetooth_route/bluetoothSelector_route.dart → mobile/lib/src/presentation/pages/bluetooth_page/bluetoothSelector_page.dart

@@ -1,18 +1,22 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:polydodo/src/application/device/device_selector_cubit.dart';
 import 'package:polydodo/src/application/device/device_selector_state.dart';
-import 'package:polydodo/src/presentation/recording/recording_route.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_tabs.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_widget.dart';
+import 'package:polydodo/src/presentation/navigation/routes/router.gr.dart';
 
-class BluetoothSelectorRoute extends StatelessWidget {
+class BluetoothSelectorPage extends StatelessWidget {
   static const name = 'bluetoothRoute';
 
-  BluetoothSelectorRoute({Key key}) : super(key: key);
+  BluetoothSelectorPage({Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: Text('Polydodo')),
+      drawer: NavDrawer(activeTab: NavdrawerTab.BluetoothSelector),
       body: BlocConsumer<DeviceSelectorCubit, DeviceState>(
         listener: (context, state) {
           print(state.runtimeType);
@@ -27,11 +31,7 @@ class BluetoothSelectorRoute extends StatelessWidget {
                   Text('Unable to connect to device because ${state.cause}'),
             ));
           } else if (state is DeviceConnectionSuccess) {
-            Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => RecordingRoute(),
-                ));
+            ExtendedNavigator.of(context).replace(Routes.recordSleepGuidePage);
           }
         },
         builder: (context, state) {

mobile/lib/src/presentation/pages/dashboard/dashboard_page.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_tabs.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_widget.dart';
+
+class DashboardPage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      // appBar: AppBar(title: Text('Polydodo')),
+      drawer: NavDrawer(activeTab: NavdrawerTab.Dashboard),
+      body: NestedScrollView(
+        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+          return <Widget>[
+            SliverAppBar(
+              expandedHeight: 200.0,
+              floating: false,
+              pinned: true,
+              flexibleSpace: FlexibleSpaceBar(
+                  centerTitle: false,
+                  title: Text('Polydodo',
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 16.0,
+                      )),
+                  background: Image.network(
+                    'https://images.pexels.com/photos/396547/pexels-photo-396547.jpeg?auto=compress&cs=tinysrgb&h=350',
+                    fit: BoxFit.cover,
+                  )),
+            ),
+          ];
+        },
+        body: Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 50),
+            child: Padding(
+                padding: EdgeInsets.symmetric(vertical: 200),
+                child: Text('Dashboard')),
+          ),
+        ),
+      ),
+    );
+  }
+}

mobile/lib/src/presentation/pages/record_sleep/record_sleep_guide_page.dart

@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:polydodo/src/application/eeg_data/data_cubit.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_tabs.dart';
+import 'package:polydodo/src/presentation/navigation/navdrawer_widget.dart';
+import 'package:polydodo/src/presentation/navigation/routes/router.gr.dart';
+
+part 'record_sleep_recording_page.dart';
+part 'record_sleep_validate_page.dart';
+
+class RecordSleepGuidePage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text('Record Sleep')),
+      drawer: NavDrawer(activeTab: NavdrawerTab.RecordSleep),
+      body: PageView(
+        children: [
+          Container(child: Center(child: Text('Record Sleep Guide'))),
+          Container(child: Center(child: Text('Record Sleep next'))),
+        ],
+      ),
+      floatingActionButton: FloatingActionButton.extended(
+        onPressed: () {
+          ExtendedNavigator.of(context).replace(Routes.recordSleepValidatePage);
+        },
+        icon: Icon(Icons.radio_button_checked),
+        label: Text('Record'),
+      ),
+    );
+  }
+}

mobile/lib/src/presentation/pages/record_sleep/record_sleep_recording_page.dart

@@ -0,0 +1 @@
+part of 'record_sleep_guide_page.dart';

mobile/lib/src/presentation/recording/recording_route.dart → mobile/lib/src/presentation/pages/record_sleep/record_sleep_validate_page.dart

@@ -1,21 +1,11 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:polydodo/src/application/eeg_data/data_cubit.dart';
-import 'package:polydodo/src/application/eeg_data/data_states.dart';
-
-class RecordingRoute extends StatelessWidget {
-  static const name = 'recordingRoute';
-
-  RecordingRoute({Key key}) : super(key: key);
+part of 'record_sleep_guide_page.dart';
 
+class RecordSleepValidatePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
-        title: Text('Recording'),
-      ),
+      appBar: AppBar(title: Text('Record Sleep')),
+      drawer: NavDrawer(activeTab: NavdrawerTab.RecordSleep),
       body: BlocConsumer<DataCubit, DataState>(
         listener: (context, state) {
           print(state.runtimeType);