add multiple accounts menu

lib/account_manager/cubits/account_record_cubit.dart

@@ -4,7 +4,9 @@ import 'package:veilid_support/veilid_support.dart';
 
 import '../../proto/proto.dart' as proto;
 
-class AccountRecordCubit extends DefaultDHTRecordCubit<proto.Account> {
+typedef AccountRecordState = proto.Account;
+
+class AccountRecordCubit extends DefaultDHTRecordCubit<AccountRecordState> {
   AccountRecordCubit({
     required super.open,
   }) : super(decodeState: proto.Account.fromBuffer);

lib/account_manager/cubits/account_records_bloc_map_cubit.dart

@@ -0,0 +1,36 @@
+import 'package:async_tools/async_tools.dart';
+import 'package:bloc_advanced_tools/bloc_advanced_tools.dart';
+import 'package:veilid_support/veilid_support.dart';
+
+import '../../account_manager/account_manager.dart';
+
+typedef AccountRecordsBlocMapState
+    = BlocMapState<TypedKey, AsyncValue<AccountRecordState>>;
+
+// Map of the logged in user accounts to their account information
+class AccountRecordsBlocMapCubit extends BlocMapCubit<TypedKey,
+        AsyncValue<AccountRecordState>, AccountRecordCubit>
+    with StateMapFollower<UserLoginsState, TypedKey, UserLogin> {
+  AccountRecordsBlocMapCubit(AccountRepository accountRepository)
+      : _accountRepository = accountRepository;
+
+  // Add account record cubit
+  Future<void> _addAccountRecordCubit({required UserLogin userLogin}) async =>
+      add(() => MapEntry(
+          userLogin.superIdentityRecordKey,
+          AccountRecordCubit(
+              open: () => _accountRepository.openAccountRecord(userLogin))));
+
+  /// StateFollower /////////////////////////
+
+  @override
+  Future<void> removeFromState(TypedKey key) => remove(key);
+
+  @override
+  Future<void> updateState(TypedKey key, UserLogin value) async {
+    await _addAccountRecordCubit(userLogin: value);
+  }
+
+  ////////////////////////////////////////////////////////////////////////////
+  final AccountRepository _accountRepository;
+}

lib/account_manager/cubits/active_local_account_cubit.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:veilid_support/veilid_support.dart';
 
-import '../repository/account_repository/account_repository.dart';
+import '../repository/account_repository.dart';
 
 class ActiveLocalAccountCubit extends Cubit<TypedKey?> {
   ActiveLocalAccountCubit(AccountRepository accountRepository)

lib/account_manager/cubits/cubits.dart

@@ -1,4 +1,5 @@
 export 'account_record_cubit.dart';
+export 'account_records_bloc_map_cubit.dart';
 export 'active_local_account_cubit.dart';
 export 'local_accounts_cubit.dart';
 export 'user_logins_cubit.dart';

lib/account_manager/cubits/local_accounts_cubit.dart

@@ -4,7 +4,7 @@ import 'package:bloc/bloc.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 
 import '../models/models.dart';
-import '../repository/account_repository/account_repository.dart';
+import '../repository/account_repository.dart';
 
 class LocalAccountsCubit extends Cubit<IList<LocalAccount>> {
   LocalAccountsCubit(AccountRepository accountRepository)

lib/account_manager/cubits/user_logins_cubit.dart

@@ -1,12 +1,17 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:bloc_advanced_tools/bloc_advanced_tools.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
+import 'package:veilid_support/veilid_support.dart';
 
 import '../models/models.dart';
-import '../repository/account_repository/account_repository.dart';
+import '../repository/account_repository.dart';
 
-class UserLoginsCubit extends Cubit<IList<UserLogin>> {
+typedef UserLoginsState = IList<UserLogin>;
+
+class UserLoginsCubit extends Cubit<UserLoginsState>
+    with StateMapFollowable<UserLoginsState, TypedKey, UserLogin> {
   UserLoginsCubit(AccountRepository accountRepository)
       : _accountRepository = accountRepository,
         super(accountRepository.getUserLogins()) {
@@ -30,6 +35,16 @@ class UserLoginsCubit extends Cubit<IList<UserLogin>> {
     await _accountRepositorySubscription.cancel();
   }
 
+  /// StateMapFollowable /////////////////////////
+  @override
+  IMap<TypedKey, UserLogin> getStateMap(UserLoginsState state) {
+    final stateValue = state;
+    return IMap.fromIterable(stateValue,
+        keyMapper: (e) => e.superIdentityRecordKey, valueMapper: (e) => e);
+  }
+
+  ////////////////////////////////////////////////////////////////////////////
+
   final AccountRepository _accountRepository;
   late final StreamSubscription<AccountRepositoryChange>
       _accountRepositorySubscription;

lib/account_manager/repository/account_repository.dart

@@ -3,9 +3,9 @@ import 'dart:async';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 import 'package:veilid_support/veilid_support.dart';
 
-import '../../../../proto/proto.dart' as proto;
-import '../../../tools/tools.dart';
-import '../../models/models.dart';
+import '../../../proto/proto.dart' as proto;
+import '../../tools/tools.dart';
+import '../models/models.dart';
 
 const String veilidChatAccountKey = 'com.veilid.veilidchat';
 

lib/account_manager/repository/repository.dart

@@ -1 +1 @@
-export 'account_repository/account_repository.dart';
+export 'account_repository.dart';

lib/account_manager/views/switch_account_widget.dart

@@ -1,35 +0,0 @@
-import 'package:awesome_extensions/awesome_extensions.dart';
-import 'package:flutter/material.dart';
-
-import '../../proto/proto.dart' as proto;
-import '../../theme/theme.dart';
-import '../account_manager.dart';
-
-class SwitchAccountWidget extends StatelessWidget {
-  const SwitchAccountWidget({
-    super.key,
-  });
-  //
-
-  @override
-  // ignore: prefer_expression_function_bodies
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final scale = theme.extension<ScaleScheme>()!;
-    final textTheme = theme.textTheme;
-
-    final accountRepo = AccountRepository.instance;
-    final localAccounts = accountRepo.getLocalAccounts();
-    for (final la in localAccounts) {
-      //
-    }
-
-    return DecoratedBox(
-      decoration: ShapeDecoration(
-          color: scale.primaryScale.border,
-          shape:
-              RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
-      child: Column(children: []),
-    );
-  }
-}