Merge branch 'master' of github.com:KRTirtho/spotube

KRTirtho · Sep 3, 2022 · 663b08f · 663b08f
2 parents e206f16 + 3b24018
commit 663b08f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/assets/user-placeholder.png b/assets/user-placeholder.png
diff --git a/lib/components/Home/Sidebar.dart b/lib/components/Home/Sidebar.dart
@@ -148,26 +148,38 @@ class Sidebar extends HookConsumerWidget {
                                 child: CircularProgressIndicator(),
                               )
                             else if (data != null)
-                              Row(
-                                children: [
-                                  CircleAvatar(
-                                    backgroundImage:
-                                        CachedNetworkImageProvider(avatarImg),
-                                    onBackgroundImageError:
-                                        (exception, stackTrace) => Container(
-                                      height: 16,
-                                      width: 16,
-                                      color: Theme.of(context).cardColor,
+                              Flexible(
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceEvenly,
+                                  children: [
+                                    CircleAvatar(
+                                      backgroundImage:
+                                          CachedNetworkImageProvider("asdasd"),
+                                      onBackgroundImageError:
+                                          (exception, stackTrace) =>
+                                              Image.asset(
+                                        "assets/user-placeholder.png",
+                                        height: 16,
+                                        width: 16,
+                                      ),
                                     ),
-                                  ),
-                                  const SizedBox(width: 10),
-                                  Text(
-                                    data.displayName ?? "Guest",
-                                    style: const TextStyle(
-                                      fontWeight: FontWeight.bold,
+                                    const SizedBox(
+                                      width: 10,
                                     ),
-                                  ),
-                                ],
+                                    Flexible(
+                                      child: Text(
+                                        data.displayName ?? "Guest",
+                                        maxLines: 1,
+                                        softWrap: false,
+                                        overflow: TextOverflow.fade,
+                                        style: const TextStyle(
+                                          fontWeight: FontWeight.bold,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
                             IconButton(
                                 icon: const Icon(Icons.settings_outlined),
@@ -183,10 +195,10 @@ class Sidebar extends HookConsumerWidget {
                           backgroundImage:
                               CachedNetworkImageProvider(avatarImg),
                           onBackgroundImageError: (exception, stackTrace) =>
-                              Container(
+                              Image.asset(
+                            "assets/user-placeholder.png",
                             height: 16,
                             width: 16,
-                            color: Theme.of(context).cardColor,
                           ),
                         ),
                       ),