Ability to re-order accounts

lib/account/models/account.dart

@@ -12,6 +12,7 @@ class Account {
   final String? jwt;
   final String? instance;
   final int? userId;
+  final int index;
 
   const Account({
     required this.id,
@@ -20,27 +21,42 @@ class Account {
     this.jwt,
     this.instance,
     this.userId,
+    required this.index,
   });
 
-  Account copyWith({String? id}) => Account(
+  Account copyWith({String? id, int? index}) => Account(
         id: id ?? this.id,
         username: username,
         jwt: jwt,
         instance: instance,
         userId: userId,
+        index: index ?? this.index,
       );
 
   String get actorId => 'https://$instance/u/$username';
 
   static Future<Account?> insertAccount(Account account) async {
     // If we are given a brand new account to insert with an existing id, something is wrong.
-    assert(account.id.isEmpty);
+    assert(account.id.isEmpty && account.index == -1);
 
     try {
-      int id = await database
-          .into(database.accounts)
-          .insert(AccountsCompanion.insert(username: Value(account.username), jwt: Value(account.jwt), instance: Value(account.instance), userId: Value(account.userId)));
-      return account.copyWith(id: id.toString());
+      // Find the highest index in the current accounts
+      final int maxIndex = await (database.selectOnly(database.accounts)..addColumns([database.accounts.listIndex.max()])).getSingle().then((row) => row.read(database.accounts.listIndex.max()) ?? 0);
+
+      // Assign the next index
+      final int newIndex = maxIndex + 1;
+
+      int id = await database.into(database.accounts).insert(
+            AccountsCompanion.insert(
+              username: Value(account.username),
+              jwt: Value(account.jwt),
+              instance: Value(account.instance),
+              userId: Value(account.userId),
+              listIndex: Value(newIndex),
+            ),
+          );
+
+      return account.copyWith(id: id.toString(), index: newIndex);
     } catch (e) {
       debugPrint(e.toString());
       return null;
@@ -51,7 +67,14 @@ class Account {
   static Future<List<Account>> accounts() async {
     try {
       return (await database.accounts.all().get())
-          .map((account) => Account(id: account.id.toString(), username: account.username, jwt: account.jwt, instance: account.instance, userId: account.userId))
+          .map((account) => Account(
+                id: account.id.toString(),
+                username: account.username,
+                jwt: account.jwt,
+                instance: account.instance,
+                userId: account.userId,
+                index: account.listIndex,
+              ))
           .toList();
     } catch (e) {
       debugPrint(e.toString());
@@ -65,7 +88,14 @@ class Account {
     try {
       return await (database.select(database.accounts)..where((t) => t.id.equals(int.parse(accountId)))).getSingleOrNull().then((account) {
         if (account == null) return null;
-        return Account(id: account.id.toString(), username: account.username, jwt: account.jwt, instance: account.instance, userId: account.userId);
+        return Account(
+          id: account.id.toString(),
+          username: account.username,
+          jwt: account.jwt,
+          instance: account.instance,
+          userId: account.userId,
+          index: account.listIndex,
+        );
       });
     } catch (e) {
       debugPrint(e.toString());
@@ -75,9 +105,14 @@ class Account {
 
   static Future<void> updateAccount(Account account) async {
     try {
-      await database
-          .update(database.accounts)
-          .replace(AccountsCompanion(id: Value(int.parse(account.id)), username: Value(account.username), jwt: Value(account.jwt), instance: Value(account.instance), userId: Value(account.userId)));
+      await database.update(database.accounts).replace(AccountsCompanion(
+            id: Value(int.parse(account.id)),
+            username: Value(account.username),
+            jwt: Value(account.jwt),
+            instance: Value(account.instance),
+            userId: Value(account.userId),
+            listIndex: Value(account.index),
+          ));
     } catch (e) {
       debugPrint(e.toString());
     }

lib/account/models/anonymous_instance.dart

@@ -0,0 +1,83 @@
+import 'package:flutter/foundation.dart';
+import 'package:drift/drift.dart';
+import 'package:thunder/core/database/database.dart';
+import 'package:thunder/main.dart';
+
+class AnonymousInstance {
+  final String id;
+  final String instance;
+  final int index;
+
+  const AnonymousInstance({
+    required this.id,
+    required this.instance,
+    required this.index,
+  });
+
+  AnonymousInstance copyWith({String? id, int? index}) => AnonymousInstance(
+        id: id ?? this.id,
+        instance: instance,
+        index: index ?? this.index,
+      );
+
+  static Future<AnonymousInstance?> insertInstance(AnonymousInstance anonymousInstance) async {
+    assert(anonymousInstance.id.isEmpty && anonymousInstance.index == -1);
+
+    try {
+      // Find the highest index in the current instances
+      final int maxIndex = await (database.selectOnly(database.anonymousInstances)..addColumns([database.anonymousInstances.listIndex.max()]))
+          .getSingle()
+          .then((row) => row.read(database.anonymousInstances.listIndex.max()) ?? 0);
+
+      // Assign the next index
+      final newIndex = maxIndex + 1;
+
+      int id = await database.into(database.anonymousInstances).insert(
+            AnonymousInstancesCompanion.insert(
+              instance: anonymousInstance.instance,
+              listIndex: newIndex,
+            ),
+          );
+
+      return anonymousInstance.copyWith(id: id.toString(), index: newIndex);
+    } catch (e) {
+      debugPrint(e.toString());
+      return null;
+    }
+  }
+
+  static Future<List<AnonymousInstance>> fetchAllInstances() async {
+    try {
+      return (await database.select(database.anonymousInstances).get())
+          .map((instance) => AnonymousInstance(
+                id: instance.id.toString(),
+                instance: instance.instance,
+                index: instance.listIndex,
+              ))
+          .toList();
+    } catch (e) {
+      debugPrint(e.toString());
+      return [];
+    }
+  }
+
+  static Future<void> updateInstance(AnonymousInstance instance) async {
+    try {
+      await database.update(database.anonymousInstances).replace(AnonymousInstancesCompanion(
+            id: Value(int.parse(instance.id)),
+            instance: Value(instance.instance),
+            listIndex: Value(instance.index),
+          ));
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  static Future<void> removeByInstanceName(String instanceName) async {
+    try {
+      await (database.delete(database.anonymousInstances)..where((t) => t.instance.equals(instanceName))).go();
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+}

lib/account/pages/login_page.dart

@@ -7,11 +7,9 @@ import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:go_router/go_router.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:thunder/account/models/anonymous_instance.dart';
 
 import 'package:thunder/core/auth/bloc/auth_bloc.dart';
-import 'package:thunder/core/enums/local_settings.dart';
-import 'package:thunder/core/singletons/preferences.dart';
 import 'package:thunder/instances.dart';
 import 'package:thunder/shared/snackbar.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
@@ -35,6 +33,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
   late TextEditingController _passwordTextEditingController;
   late TextEditingController _totpTextEditingController;
   late TextEditingController _instanceTextEditingController;
+  final FocusNode _usernameFieldFocusNode = FocusNode();
 
   bool showPassword = false;
   bool fieldsFilledIn = false;
@@ -297,7 +296,11 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                         errorMaxLines: 2,
                       ),
                       enableSuggestions: false,
-                      onSubmitted: (controller.text.isNotEmpty && widget.anonymous) ? (_) => _addAnonymousInstance() : null,
+                      onSubmitted: !widget.anonymous
+                          ? (_) => _usernameFieldFocusNode.requestFocus()
+                          : controller.text.isNotEmpty
+                              ? (_) => _addAnonymousInstance()
+                              : null,
                     ),
                     suggestionsCallback: (String pattern) {
                       if (pattern.isNotEmpty != true) {
@@ -328,6 +331,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                             keyboardType: TextInputType.url,
                             autocorrect: false,
                             controller: _usernameTextEditingController,
+                            focusNode: _usernameFieldFocusNode,
                             autofillHints: const [AutofillHints.username],
                             decoration: InputDecoration(
                               isDense: true,
@@ -437,16 +441,15 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
 
   void _addAnonymousInstance() async {
     if (await isLemmyInstance(_instanceTextEditingController.text)) {
-      final SharedPreferences prefs = (await UserPreferences.instance).sharedPreferences;
-      List<String> anonymousInstances = prefs.getStringList(LocalSettings.anonymousInstances.name) ?? ['lemmy.ml'];
-      if (anonymousInstances.contains(_instanceTextEditingController.text)) {
+      final List<AnonymousInstance> anonymousInstances = await AnonymousInstance.fetchAllInstances();
+      if (anonymousInstances.any((anonymousInstance) => anonymousInstance.instance == _instanceTextEditingController.text)) {
         setState(() {
           instanceValidated = false;
           instanceError = AppLocalizations.of(context)!.instanceHasAlreadyBenAdded(currentInstance ?? '');
         });
       } else {
         context.read<AuthBloc>().add(const LogOutOfAllAccounts());
-        context.read<ThunderBloc>().add(OnAddAnonymousInstance(_instanceTextEditingController.text));
+        await AnonymousInstance.insertInstance(AnonymousInstance(id: '', instance: _instanceTextEditingController.text, index: -1));
         context.read<ThunderBloc>().add(OnSetCurrentAnonymousInstance(_instanceTextEditingController.text));
         widget.popRegister();
       }

lib/account/widgets/account_placeholder.dart

@@ -10,7 +10,7 @@ class AccountPlaceholder extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
-    String anonymousInstance = context.watch<ThunderBloc>().state.currentAnonymousInstance;
+    String? anonymousInstance = context.watch<ThunderBloc>().state.currentAnonymousInstance ?? '';
 
     return Center(
       child: Padding(