fix: start page loading side headerbar

ubuntu-flutter-community · Jan 12, 2025 · 660b407 · 660b407
1 parent 69e17a6
commit 660b407
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/lib/chat/view/chat_room/chat_room_default_background.dart b/lib/chat/view/chat_room/chat_room_default_background.dart
@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mesh/mesh.dart';
-import 'package:yaru/yaru.dart';
 
-import '../../../app_config.dart';
 import '../../../common/view/build_context_x.dart';
-import '../../../common/view/theme.dart';
 
 class ChatRoomDefaultBackground extends StatelessWidget {
   const ChatRoomDefaultBackground({super.key});
@@ -14,12 +11,6 @@ class ChatRoomDefaultBackground extends StatelessWidget {
     final colorScheme = context.colorScheme;
     final bg = colorScheme.surface;
     final accent = colorScheme.primary;
-    final remix = yaru
-        ? remixColor(
-            accent,
-            palette: YaruVariant.accents.map((e) => e.color).toList(),
-          )
-        : colorScheme.primaryContainer;
     return Opacity(
       opacity: 0.3,
       child: OMeshGradient(
@@ -33,8 +24,8 @@ class ChatRoomDefaultBackground extends StatelessWidget {
             accent.withValues(alpha: 0.11),
             accent.withValues(alpha: 0.31),
             accent.withValues(alpha: 0.11),
-            remix.withValues(alpha: 0.02),
-            remix.withValues(alpha: 0.41),
+            accent.withValues(alpha: 0.02),
+            accent.withValues(alpha: 0.41),
             bg.withValues(alpha: 0.71),
             bg.withValues(alpha: 0.91),
             bg.withValues(alpha: 0.80),

diff --git a/lib/chat/view/chat_start_page.dart b/lib/chat/view/chat_start_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
+import 'package:yaru/yaru.dart';
 
 import '../../common/view/common_widgets.dart';
 import '../authentication/chat_login_page.dart';
@@ -29,8 +30,12 @@ class _ChatStartPageState extends State<ChatStartPage> {
             ? (!di<ChatModel>().isLogged)
                 ? const ChatLoginPage()
                 : const ChatMasterDetailPage()
-            : const Material(
-                child: Center(
+            : const Scaffold(
+                appBar: YaruWindowTitleBar(
+                  border: BorderSide.none,
+                  backgroundColor: Colors.transparent,
+                ),
+                body: Center(
                   child: Progress(),
                 ),
               ),