checkpoint

lib/router/cubit/router_cubit.dart

@@ -1,13 +1,16 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:go_router/go_router.dart';
+import 'package:stream_transform/stream_transform.dart';
 
 import '../../../account_manager/account_manager.dart';
 import '../../init.dart';
 import '../../layout/layout.dart';
+import '../../settings/settings.dart';
 import '../../tools/tools.dart';
 import '../../veilid_processor/views/developer.dart';
 
@@ -15,6 +18,11 @@ part 'router_cubit.freezed.dart';
 part 'router_cubit.g.dart';
 part 'router_state.dart';
 
+final _rootNavKey = GlobalKey<NavigatorState>(debugLabel: 'rootNavKey');
+final _homeNavKey = GlobalKey<NavigatorState>(debugLabel: 'homeNavKey');
+final _readyAccountNavKey =
+    GlobalKey<NavigatorState>(debugLabel: 'readyAccountNavKey');
+
 class RouterCubit extends Cubit<RouterState> {
   RouterCubit(AccountRepository accountRepository)
       : super(const RouterState(
@@ -27,9 +35,9 @@ class RouterCubit extends Cubit<RouterState> {
       await eventualInitialized.future;
       emit(state.copyWith(isInitialized: true));
     });
+
     // Subscribe to repository streams
-    _accountRepositorySubscription =
-        accountRepository.stream().listen((event) {
+    _accountRepositorySubscription = accountRepository.stream.listen((event) {
       switch (event) {
         case AccountRepositoryChange.localAccounts:
           emit(state.copyWith(
@@ -40,7 +48,6 @@ class RouterCubit extends Cubit<RouterState> {
           break;
       }
     });
-    _chatListRepositorySubscription = ...
   }
 
   @override
@@ -50,34 +57,50 @@ class RouterCubit extends Cubit<RouterState> {
   }
 
   /// Our application routes
-  List<GoRoute> get routes => [
+  List<RouteBase> get routes => [
         GoRoute(
           path: '/',
           builder: (context, state) => const IndexPage(),
         ),
-        GoRoute(
-          path: '/home',
-          builder: (context, state) => const HomePage(),
-          routes: [
-            GoRoute(
-              path: 'settings',
-              builder: (context, state) => const SettingsPage(),
-            ),
-            GoRoute(
-              path: 'chat',
-              builder: (context, state) => const ChatOnlyPage(),
-            ),
-          ],
-        ),
+        ShellRoute(
+            navigatorKey: _homeNavKey,
+            builder: (context, state, child) => HomeShell(child: child),
+            routes: [
+              GoRoute(
+                path: '/home/no_active',
+                builder: (context, state) => const HomeNoActive(),
+              ),
+              GoRoute(
+                path: '/home/account_missing',
+                builder: (context, state) => const HomeAccountMissing(),
+              ),
+              GoRoute(
+                path: '/home/account_locked',
+                builder: (context, state) => const HomeAccountLocked(),
+              ),
+              ShellRoute(
+                navigatorKey: _readyAccountNavKey,
+                builder: (context, state, child) =>
+                    HomeAccountReadyShell(child: child),
+                routes: [
+                  GoRoute(
+                    path: '/home',
+                    builder: (context, state) => const HomeAccountReadyMain(),
+                  ),
+                  GoRoute(
+                    path: '/home/chat',
+                    builder: (context, state) => const HomeAccountReadyChat(),
+                  ),
+                ],
+              ),
+            ]),
         GoRoute(
           path: '/new_account',
           builder: (context, state) => const NewAccountPage(),
-          routes: [
-            GoRoute(
-              path: 'settings',
-              builder: (context, state) => const SettingsPage(),
-            ),
-          ],
+        ),
+        GoRoute(
+          path: '/settings',
+          builder: (context, state) => const SettingsPage(),
         ),
         GoRoute(
           path: '/developer',
@@ -87,11 +110,8 @@ class RouterCubit extends Cubit<RouterState> {
 
   /// Redirects when our state changes
   String? redirect(BuildContext context, GoRouterState goRouterState) {
-    // if (state.isLoading || state.hasError) {
-    //   return null;
-    // }
-
     // No matter where we are, if there's not
+
     switch (goRouterState.matchedLocation) {
       case '/':
 
@@ -133,8 +153,7 @@ class RouterCubit extends Cubit<RouterState> {
           return '/home';
         }
         return null;
-      case '/home/settings':
-      case '/new_account/settings':
+      case '/settings':
         return null;
       case '/developer':
         return null;
@@ -143,6 +162,18 @@ class RouterCubit extends Cubit<RouterState> {
     }
   }
 
+  /// Make a GoRouter instance that uses this cubit
+  GoRouter router() => GoRouter(
+        navigatorKey: _rootNavKey,
+        refreshListenable: StreamListenable(stream.startWith(state).distinct()),
+        debugLogDiagnostics: kDebugMode,
+        initialLocation: '/',
+        routes: routes,
+        redirect: redirect,
+      );
+
+  ////////////////
+
   late final StreamSubscription<AccountRepositoryChange>
       _accountRepositorySubscription;
 }

lib/router/cubit/router_cubit.freezed.dart

@@ -0,0 +1,193 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'router_cubit.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+RouterState _$RouterStateFromJson(Map<String, dynamic> json) {
+  return _RouterState.fromJson(json);
+}
+
+/// @nodoc
+mixin _$RouterState {
+  bool get isInitialized => throw _privateConstructorUsedError;
+  bool get hasAnyAccount => throw _privateConstructorUsedError;
+  bool get hasActiveChat => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $RouterStateCopyWith<RouterState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $RouterStateCopyWith<$Res> {
+  factory $RouterStateCopyWith(
+          RouterState value, $Res Function(RouterState) then) =
+      _$RouterStateCopyWithImpl<$Res, RouterState>;
+  @useResult
+  $Res call({bool isInitialized, bool hasAnyAccount, bool hasActiveChat});
+}
+
+/// @nodoc
+class _$RouterStateCopyWithImpl<$Res, $Val extends RouterState>
+    implements $RouterStateCopyWith<$Res> {
+  _$RouterStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isInitialized = null,
+    Object? hasAnyAccount = null,
+    Object? hasActiveChat = null,
+  }) {
+    return _then(_value.copyWith(
+      isInitialized: null == isInitialized
+          ? _value.isInitialized
+          : isInitialized // ignore: cast_nullable_to_non_nullable
+              as bool,
+      hasAnyAccount: null == hasAnyAccount
+          ? _value.hasAnyAccount
+          : hasAnyAccount // ignore: cast_nullable_to_non_nullable
+              as bool,
+      hasActiveChat: null == hasActiveChat
+          ? _value.hasActiveChat
+          : hasActiveChat // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$RouterStateImplCopyWith<$Res>
+    implements $RouterStateCopyWith<$Res> {
+  factory _$$RouterStateImplCopyWith(
+          _$RouterStateImpl value, $Res Function(_$RouterStateImpl) then) =
+      __$$RouterStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({bool isInitialized, bool hasAnyAccount, bool hasActiveChat});
+}
+
+/// @nodoc
+class __$$RouterStateImplCopyWithImpl<$Res>
+    extends _$RouterStateCopyWithImpl<$Res, _$RouterStateImpl>
+    implements _$$RouterStateImplCopyWith<$Res> {
+  __$$RouterStateImplCopyWithImpl(
+      _$RouterStateImpl _value, $Res Function(_$RouterStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isInitialized = null,
+    Object? hasAnyAccount = null,
+    Object? hasActiveChat = null,
+  }) {
+    return _then(_$RouterStateImpl(
+      isInitialized: null == isInitialized
+          ? _value.isInitialized
+          : isInitialized // ignore: cast_nullable_to_non_nullable
+              as bool,
+      hasAnyAccount: null == hasAnyAccount
+          ? _value.hasAnyAccount
+          : hasAnyAccount // ignore: cast_nullable_to_non_nullable
+              as bool,
+      hasActiveChat: null == hasActiveChat
+          ? _value.hasActiveChat
+          : hasActiveChat // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$RouterStateImpl implements _RouterState {
+  const _$RouterStateImpl(
+      {required this.isInitialized,
+      required this.hasAnyAccount,
+      required this.hasActiveChat});
+
+  factory _$RouterStateImpl.fromJson(Map<String, dynamic> json) =>
+      _$$RouterStateImplFromJson(json);
+
+  @override
+  final bool isInitialized;
+  @override
+  final bool hasAnyAccount;
+  @override
+  final bool hasActiveChat;
+
+  @override
+  String toString() {
+    return 'RouterState(isInitialized: $isInitialized, hasAnyAccount: $hasAnyAccount, hasActiveChat: $hasActiveChat)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$RouterStateImpl &&
+            (identical(other.isInitialized, isInitialized) ||
+                other.isInitialized == isInitialized) &&
+            (identical(other.hasAnyAccount, hasAnyAccount) ||
+                other.hasAnyAccount == hasAnyAccount) &&
+            (identical(other.hasActiveChat, hasActiveChat) ||
+                other.hasActiveChat == hasActiveChat));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, isInitialized, hasAnyAccount, hasActiveChat);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$RouterStateImplCopyWith<_$RouterStateImpl> get copyWith =>
+      __$$RouterStateImplCopyWithImpl<_$RouterStateImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$RouterStateImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _RouterState implements RouterState {
+  const factory _RouterState(
+      {required final bool isInitialized,
+      required final bool hasAnyAccount,
+      required final bool hasActiveChat}) = _$RouterStateImpl;
+
+  factory _RouterState.fromJson(Map<String, dynamic> json) =
+      _$RouterStateImpl.fromJson;
+
+  @override
+  bool get isInitialized;
+  @override
+  bool get hasAnyAccount;
+  @override
+  bool get hasActiveChat;
+  @override
+  @JsonKey(ignore: true)
+  _$$RouterStateImplCopyWith<_$RouterStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/router/cubit/router_cubit.g.dart

@@ -0,0 +1,21 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'router_cubit.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$RouterStateImpl _$$RouterStateImplFromJson(Map<String, dynamic> json) =>
+    _$RouterStateImpl(
+      isInitialized: json['is_initialized'] as bool,
+      hasAnyAccount: json['has_any_account'] as bool,
+      hasActiveChat: json['has_active_chat'] as bool,
+    );
+
+Map<String, dynamic> _$$RouterStateImplToJson(_$RouterStateImpl instance) =>
+    <String, dynamic>{
+      'is_initialized': instance.isInitialized,
+      'has_any_account': instance.hasAnyAccount,
+      'has_active_chat': instance.hasActiveChat,
+    };

lib/router/make_router.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:stream_transform/stream_transform.dart';
-
-import '../tools/stream_listenable.dart';
-import 'cubit/router_cubit.dart';
-
-final _key = GlobalKey<NavigatorState>(debugLabel: 'routerKey');
-
-/// This simple provider caches our GoRouter.
-GoRouter router({required RouterCubit routerCubit}) => GoRouter(
-      navigatorKey: _key,
-      refreshListenable: StreamListenable(
-          routerCubit.stream.startWith(routerCubit.state).distinct()),
-      debugLogDiagnostics: kDebugMode,
-      initialLocation: '/',
-      routes: routerCubit.routes,
-      redirect: routerCubit.redirect,
-    );

lib/router/router.dart

@@ -1,2 +1 @@
 export 'cubit/router_cubit.dart';
-export 'make_router.dart';