better signout/login

Author: Vito0912

lib/app.dart

@@ -61,6 +61,7 @@ class _AbsAppState extends ConsumerState<AbsApp> with WidgetsBindingObserver {
     final settings = ref.watch(specificKeysSettingsProvider(
         [Constants.DARK_MODE, Constants.LANGUAGE, Constants.AMOLED_MODE]));
     final userIndex = ref.watch(selectedUserProvider);
+    print('User Index: $userIndex');
     //TODO: Two calls. Unify me api calls
     if (userIndex >= 0) {
       final progressProv = ref.read(progressProvider);

lib/features/auth/server_selection.dart

@@ -179,6 +179,12 @@ class _LoginForm extends StatelessWidget {
               padding: EdgeInsets.only(top: 16),
               child: CircularProgressIndicator(),
             ),
+          const Padding(
+            padding: EdgeInsets.only(top: 8),
+            child: Text(
+              'After login, please restart the app once',
+            ),
+          ),
           if (state.errorMessage != null)
             Padding(
               padding: const EdgeInsets.only(top: 8),

lib/features/settings/platform_settings.dart

@@ -270,8 +270,17 @@ class PlatformSettings extends ConsumerWidget {
               ),
               ..._getOtherUsers(ref, context),
               NavigationTile(
-                (BuildContext context) =>
-                    ref.watch(currentUserProvider.notifier).removeUser(context),
+                (BuildContext context) {
+                  ref.watch(currentUserProvider.notifier).removeUser(context);
+                  final allUsers = ref.read(usersProvider);
+                  if (allUsers.isNotEmpty) {
+                    if (context.mounted) context.go("/");
+                    ref.read(selectedUserProvider.notifier).state = 0;
+                  } else {
+                    if (context.mounted) context.go("/init");
+                    ref.read(selectedUserProvider.notifier).state = -1;
+                  }
+                },
                 leading: Icon(PlatformIcons(context).exitToApp),
                 title: S.of(context).signOut,
               ),

lib/provider/bookmark_provider.dart

@@ -36,6 +36,8 @@ class BookmarkProvider extends ChangeNotifier {
     List<Bookmark> newBookmarks = [];
 
     try {
+      api = ref.read(apiProviderNew);
+      if (api == null) return;
       final response = await api!.getMeApi().getUser();
       User user = response.data!;
 

lib/provider/progress_provider.dart

@@ -24,6 +24,8 @@ class ProgressProvider extends ChangeNotifier {
   }
 
   Future<void> getAllProgress() async {
+    api = ref.read(apiProvider);
+    print('api: $api');
     if (api == null) return;
     if (lastUpdated != null &&
         DateTime.now().difference(lastUpdated!).inSeconds < 1) {
@@ -68,6 +70,8 @@ class ProgressProvider extends ChangeNotifier {
 
   Future<void> getProgressWithLibraryItem(String id,
       {String? episodeId}) async {
+    api = ref.read(apiProvider);
+    print('api: $api');
     if (api == null) return;
 
     final Completer<void> progressChanged = Completer<void>();

lib/provider/user_provider.dart

@@ -17,7 +17,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 // StateNotifier to manage the users list and selected user
 class UserNotifier extends StateNotifier<List<User>> {
@@ -165,7 +164,6 @@ class CurrentUserNotifier extends StateNotifier<User?> {
     if (allUsers == null || allUsers.mounted == false) return;
 
     allUsers.removeUser(state!);
-    context.go("/");
   }
 }
 
@@ -179,7 +177,7 @@ final basePathOverrideProvider = StateProvider<String?>((ref) => null);
 
 // Provider to manage the API client
 final apiProvider = Provider<abs_api.AbsApi?>((ref) {
-  final users = ref.read(usersProvider);
+  final users = ref.watch(usersProvider);
   final index = ref.watch(selectedUserProvider);
   final basePathOverride = ref.watch(basePathOverrideProvider);
 
@@ -225,7 +223,7 @@ final apiProvider = Provider<abs_api.AbsApi?>((ref) {
 });
 
 final apiProviderNew = Provider<ABSApi?>((ref) {
-  final users = ref.read(usersProvider);
+  final users = ref.watch(usersProvider);
   final index = ref.watch(selectedUserProvider);
   final basePathOverride = ref.watch(basePathOverrideProvider);