Set default account from account selection

liftoff-app · Sep 19, 2023 · 6d91fc7 · 6d91fc7
1 parent c564cd8
commit 6d91fc7
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 44 deletions.
diff --git a/lib/pages/home_tab.dart b/lib/pages/home_tab.dart
@@ -3,6 +3,7 @@ import 'dart:math' show max;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_initicon/flutter_initicon.dart';
 import 'package:lemmy_api_client/v3.dart';
 
 import '../hooks/infinite_scroll.dart';
@@ -14,7 +15,6 @@ import '../stores/accounts_store.dart';
 import '../stores/config_store.dart';
 import '../util/extensions/api.dart';
 import '../util/goto.dart';
-import '../widgets/avatar.dart';
 import '../widgets/bottom_modal.dart';
 import '../widgets/cached_network_image.dart';
 import '../widgets/infinite_scroll.dart';
@@ -90,29 +90,21 @@ class HomeTab extends HookWidget {
     ]);
 
     // specific account selection
-    final selectedUsername = useState<String?>(null);
     final defaultUserData =
         accStore.defaultUserDataFor(selectedList.value.instanceHost!);
-    final selectedUserData = selectedList.value.instanceHost != null
-        ? (selectedUsername.value != null
-            ? (accStore.userDataFor(selectedList.value.instanceHost!,
-                    selectedUsername.value!) ??
-                defaultUserData)
-            : defaultUserData)
-        : null;
     final personDetails = useMemoFuture(() async {
-      if (selectedUserData != null) {
-        return await LemmyApiV3(selectedUserData.instanceHost)
+      if (defaultUserData != null) {
+        return await LemmyApiV3(defaultUserData.instanceHost)
             .run(GetPersonDetails(
-          personId: selectedUserData.userId,
+          personId: defaultUserData.userId,
           savedOnly: false,
           sort: SortType.active,
-          auth: selectedUserData.jwt.raw,
+          auth: defaultUserData.jwt.raw,
         ));
       }
 
       return null;
-    }, [selectedUserData]);
+    }, [defaultUserData]);
 
     handleListChange() async {
       final val = await showBottomModal<SelectedList>(
@@ -335,13 +327,20 @@ class HomeTab extends HookWidget {
                               .length >
                           1)
                     IconButton(
-                        icon: Avatar(
-                          originPreferredName: selectedUserData!.username,
-                          url: personDetails.data?.personView.person.avatar,
-                          radius: 16,
-                        ),
+                        icon: personDetails.hasData &&
+                                personDetails.data != null &&
+                                personDetails.data!.personView.person.avatar !=
+                                    null
+                            ? CircleAvatar(
+                                backgroundImage: NetworkImage(personDetails
+                                    .data!.personView.person.avatar!))
+                            : Initicon(
+                                text: defaultUserData!.username,
+                                size: 32,
+                              ),
                         onPressed: () => ViewOnMenu.open(context, (userData) {
-                              selectedUsername.value = userData.username;
+                              accStore.setDefaultAccountFor(
+                                  userData.instanceHost, userData.username);
                               Navigator.of(context).pop();
                             }, title: Text(L10n.of(context).switch_account))),
                   PopupMenuButton(itemBuilder: (context) {
@@ -389,7 +388,7 @@ class HomeTab extends HookWidget {
           body: InfiniteHomeList(
             controller: isc,
             selectedList: selectedList.value,
-            selectedUserData: selectedUserData,
+            selectedUserData: defaultUserData,
           ),
         ),
       ),

diff --git a/lib/pages/manage_account.dart b/lib/pages/manage_account.dart
@@ -223,8 +223,7 @@ class _ManageAccount extends HookWidget {
         removeDelayedLoading.start();
 
         try {
-          await accountsStore.removeAccount(
-              user.instanceHost, user.person.name);
+          accountsStore.removeAccount(user.instanceHost, user.person.name);
           Navigator.of(context).pop();
         } on Exception catch (err) {
           ScaffoldMessenger.of(context).showSnackBar(SnackBar(
@@ -285,8 +284,7 @@ class _ManageAccount extends HookWidget {
           //   auth: token.raw,
           // ));
 
-          await accountsStore.removeAccount(
-              user.instanceHost, user.person.name);
+          accountsStore.removeAccount(user.instanceHost, user.person.name);
           Navigator.of(context).pop();
         } on Exception catch (err) {
           ScaffoldMessenger.of(context).showSnackBar(SnackBar(

diff --git a/lib/pages/settings/add_account_page.dart b/lib/pages/settings/add_account_page.dart
@@ -59,7 +59,7 @@ class AddAccountPage extends HookWidget {
         // succeeded. This means that a users' very first account creation will
         // run properly.
         if (isFirstAccount) {
-          await accountsStore.setDefaultAccount(
+          accountsStore.setDefaultAccount(
               selectedInstance.value, usernameController.text);
         }
 
@@ -73,7 +73,7 @@ class AddAccountPage extends HookWidget {
 
         // addAccount() run failed, so clear the account.
         if (isFirstAccount && accountsStore.hasNoAccount) {
-          await accountsStore.clearDefaultAccount();
+          accountsStore.clearDefaultAccount();
         }
 
         // if first account try to import settings

diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
@@ -808,7 +808,7 @@ class _AccountOptions extends HookWidget {
             ),
           ) ??
           false) {
-        await accountsStore.removeAccount(instanceHost, username);
+        accountsStore.removeAccount(instanceHost, username);
         if (context.mounted) {
           Navigator.of(context).pop();
         }
@@ -892,7 +892,7 @@ class AccountsConfigPage extends HookWidget {
             ),
           ) ??
           false) {
-        await accountsStore.removeInstance(instanceHost);
+        accountsStore.removeInstance(instanceHost);
         if (context.mounted) {
           Navigator.of(context).pop();
         }

diff --git a/lib/stores/accounts_store.dart b/lib/stores/accounts_store.dart
@@ -1,4 +1,5 @@
 import 'dart:collection';
+import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -32,8 +33,10 @@ class AccountsStore extends ChangeNotifier {
   @JsonKey(defaultValue: {})
   late Map<String, int> notificationCount = {};
 
+  AccountsStore? parent;
+
   /// automatically sets default accounts
-  Future<void> _assignDefaultAccounts() async {
+  void _assignDefaultAccounts() {
     // remove dangling defaults
     defaultAccounts.entries
         .map((dft) {
@@ -63,8 +66,7 @@ class AccountsStore extends ChangeNotifier {
       if (!defaultAccounts.containsKey(instanceHost)) {
         // select first account in this instance, if any
         if (!isAnonymousFor(instanceHost)) {
-          await setDefaultAccountFor(
-              instanceHost, usernamesFor(instanceHost).first);
+          setDefaultAccountFor(instanceHost, usernamesFor(instanceHost).first);
         }
       }
     }
@@ -75,8 +77,7 @@ class AccountsStore extends ChangeNotifier {
       for (final instanceHost in instances) {
         // select first account in this instance, if any
         if (!isAnonymousFor(instanceHost)) {
-          await setDefaultAccount(
-              instanceHost, usernamesFor(instanceHost).first);
+          setDefaultAccount(instanceHost, usernamesFor(instanceHost).first);
         }
       }
     }
@@ -182,22 +183,21 @@ class AccountsStore extends ChangeNotifier {
       accounts[instanceHost]?.keys ?? const Iterable.empty();
 
   /// sets globally default account
-  Future<void> setDefaultAccount(String instanceHost, String username) async {
+  void setDefaultAccount(String instanceHost, String username) {
     defaultAccount = '$username@$instanceHost';
 
     notifyListeners();
   }
 
   /// clear the globally default account
-  Future<void> clearDefaultAccount() async {
+  void clearDefaultAccount() {
     defaultAccount = null;
 
     notifyListeners();
   }
 
   /// sets default account for given instance
-  Future<void> setDefaultAccountFor(
-      String instanceHost, String username) async {
+  void setDefaultAccountFor(String instanceHost, String username) {
     defaultAccounts[instanceHost] = username;
 
     notifyListeners();
@@ -244,7 +244,7 @@ class AccountsStore extends ChangeNotifier {
       username: userData.name,
     );
 
-    await _assignDefaultAccounts();
+    _assignDefaultAccounts();
     notifyListeners();
   }
 
@@ -269,26 +269,26 @@ class AccountsStore extends ChangeNotifier {
 
     accounts[instanceHost] = HashMap();
 
-    await _assignDefaultAccounts();
+    _assignDefaultAccounts();
     notifyListeners();
   }
 
   /// This also removes all accounts assigned to this instance
-  Future<void> removeInstance(String instanceHost) async {
+  void removeInstance(String instanceHost) {
     accounts.remove(instanceHost);
 
-    await _assignDefaultAccounts();
+    _assignDefaultAccounts();
     notifyListeners();
   }
 
-  Future<void> removeAccount(String instanceHost, String username) async {
+  void removeAccount(String instanceHost, String username) {
     if (!accounts.containsKey(instanceHost)) {
       throw Exception("instance doesn't exist");
     }
 
     accounts[instanceHost]!.remove(username);
 
-    await _assignDefaultAccounts();
+    _assignDefaultAccounts();
     notifyListeners();
   }
 
@@ -299,6 +299,14 @@ class AccountsStore extends ChangeNotifier {
   Map<String, dynamic> toJson() {
     return _$AccountsStoreToJson(this);
   }
+
+  /// Returns a new account store with another account selected as the default instead.
+  AccountsStore selectAccount(String instanceHost, String username) {
+    return AccountsStore.fromJson(jsonDecode(jsonEncode(toJson())))
+      ..setDefaultAccountFor(instanceHost, username)
+      ..setDefaultAccount(instanceHost, username)
+      ..parent = this;
+  }
 }
 
 /// Stores data associated with a logged in user