bug fix

banghuazhao · Nov 27, 2024 · edff9b8 · edff9b8
1 parent b9ff4c0
commit edff9b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/presentation/settings/viewModels/login_view_model.dart b/lib/presentation/settings/viewModels/login_view_model.dart
@@ -101,7 +101,6 @@ class LoginViewModel extends ChangeNotifier {
         if (!isValid) {
           throw Exception('Google token validation failed.');
         }
-
         // Sync the user data
         await syncUser(user.displayName, user.email, user.photoUrl);
       }

diff --git a/lib/presentation/settings/views/settings_page.dart b/lib/presentation/settings/views/settings_page.dart
@@ -69,7 +69,12 @@ class _SettingsPageState extends State<SettingsPage> {
                   if (viewModel.isLoggedIn)
                     ListTile(
                       key: ValueKey(viewModel.user?.name ?? ""),
-                      leading: Icon(
+                      leading: viewModel.user?.avatarUrl != null
+                          ? CircleAvatar(
+                        backgroundImage: NetworkImage(viewModel.user!.avatarUrl!),
+                        radius: 22.5, // Adjust the radius to match the icon size
+                      )
+                          : Icon(
                         Icons.account_circle,
                         size: 45,
                         color: Colors.blueGrey,

diff --git a/lib/presentation/settings/views/user_profile_page.dart b/lib/presentation/settings/views/user_profile_page.dart
@@ -40,7 +40,12 @@ class UserProfilePage extends StatelessWidget {
                           child: Row(
                             crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
-                              Icon(
+                              viewModel.user?.avatarUrl != null
+                                  ? CircleAvatar(
+                                backgroundImage: NetworkImage(viewModel.user!.avatarUrl!),
+                                radius: 27.5, // Matches size of 55
+                              )
+                                  : Icon(
                                 Icons.account_circle,
                                 size: 55,
                                 color: Colors.blueGrey,