TW-1202: Update background color for wrong screen

linagora · Jan 15, 2024 · ecf7632 · ecf7632
1 parent 0b85ed6
commit ecf7632
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 39 deletions.
diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart b/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart
@@ -7,6 +7,7 @@ import 'package:fluffychat/widgets/twake_components/twake_icon_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
 class PinnedMessagesScreen extends StatelessWidget {
@@ -19,7 +20,9 @@ class PinnedMessagesScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: AppBar(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
         title: ValueListenableBuilder(
           valueListenable: controller.eventsNotifier,
           builder: (context, events, child) {

diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
@@ -20,7 +20,9 @@ class ChatDetailsView extends StatelessWidget {
   Widget build(BuildContext context) {
     if (controller.room == null) {
       return Scaffold(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
         appBar: AppBar(
+          backgroundColor: LinagoraSysColors.material().onPrimary,
           title: Text(L10n.of(context)!.oopsSomethingWentWrong),
         ),
         body: Center(
@@ -93,6 +95,7 @@ class ChatDetailsView extends StatelessWidget {
                   handle:
                       NestedScrollView.sliverOverlapAbsorberHandleFor(context),
                   sliver: SliverAppBar(
+                    backgroundColor: LinagoraSysColors.material().onPrimary,
                     toolbarHeight:
                         ChatDetailViewStyle.toolbarHeightSliverAppBar,
                     title: Column(
@@ -222,9 +225,6 @@ class ChatDetailsView extends StatelessWidget {
               child: Container(
                 width: ChatDetailViewStyle.chatDetailsPageViewWebWidth,
                 padding: ChatDetailViewStyle.paddingTabBarView,
-                decoration: BoxDecoration(
-                  color: LinagoraRefColors.material().primary[100],
-                ),
                 child: TabBarView(
                   physics: const NeverScrollableScrollPhysics(),
                   controller: controller.tabController,

diff --git a/lib/pages/device_settings/device_settings_view.dart b/lib/pages/device_settings/device_settings_view.dart
@@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'package:fluffychat/pages/device_settings/device_settings.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'user_device_list_item.dart';
 
 class DevicesSettingsView extends StatelessWidget {
@@ -15,6 +16,7 @@ class DevicesSettingsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         context: context,
         title: Text(

diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/pages/new_group/contacts_selection_view_style.dart';
 import 'package:fluffychat/pages/new_private_chat/new_private_chat.dart';
 import 'package:fluffychat/pages/new_private_chat/widget/expansion_list.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -14,37 +15,41 @@ class NewPrivateChatView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: LinagoraSysColors.material().onPrimary,
-      appBar: PreferredSize(
-        preferredSize: SearchableAppBarStyle.preferredSize(context),
-        child: SearchableAppBar(
-          title: L10n.of(context)!.newChat,
-          searchModeNotifier: controller.isSearchModeNotifier,
-          textEditingController: controller.textEditingController,
-          openSearchBar: controller.openSearchBar,
-          closeSearchBar: controller.closeSearchBar,
-          focusNode: controller.searchFocusNode,
+    return Padding(
+      padding: ContactsSelectionViewStyle.parentPadding,
+      child: Scaffold(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
+        appBar: PreferredSize(
+          preferredSize: SearchableAppBarStyle.preferredSize(context),
+          child: SearchableAppBar(
+            title: L10n.of(context)!.newChat,
+            searchModeNotifier: controller.isSearchModeNotifier,
+            textEditingController: controller.textEditingController,
+            openSearchBar: controller.openSearchBar,
+            closeSearchBar: controller.closeSearchBar,
+            focusNode: controller.searchFocusNode,
+          ),
         ),
-      ),
-      body: SingleChildScrollView(
-        keyboardDismissBehavior: PlatformInfos.isMobile
-            ? ScrollViewKeyboardDismissBehavior.manual
-            : ScrollViewKeyboardDismissBehavior.onDrag,
-        padding: const EdgeInsets.only(left: 8.0, right: 10.0),
-        controller: controller.scrollController,
-        child: ExpansionList(
-          presentationContactsNotifier: controller.presentationContactNotifier,
-          goToNewGroupChat: () => controller.goToNewGroupChat(context),
-          isShowContactsNotifier: controller.isShowContactsNotifier,
-          onContactTap: controller.onContactAction,
-          onExternalContactTap: controller.onExternalContactAction,
-          toggleContactsList: controller.toggleContactsList,
-          textEditingController: controller.textEditingController,
-          warningBannerNotifier: controller.warningBannerNotifier,
-          closeContactsWarningBanner: controller.closeContactsWarningBanner,
-          goToSettingsForPermissionActions:
-              controller.goToSettingsForPermissionActions,
+        body: SingleChildScrollView(
+          keyboardDismissBehavior: PlatformInfos.isMobile
+              ? ScrollViewKeyboardDismissBehavior.manual
+              : ScrollViewKeyboardDismissBehavior.onDrag,
+          padding: const EdgeInsets.only(left: 8.0, right: 10.0),
+          controller: controller.scrollController,
+          child: ExpansionList(
+            presentationContactsNotifier:
+                controller.presentationContactNotifier,
+            goToNewGroupChat: () => controller.goToNewGroupChat(context),
+            isShowContactsNotifier: controller.isShowContactsNotifier,
+            onContactTap: controller.onContactAction,
+            onExternalContactTap: controller.onExternalContactAction,
+            toggleContactsList: controller.toggleContactsList,
+            textEditingController: controller.textEditingController,
+            warningBannerNotifier: controller.warningBannerNotifier,
+            closeContactsWarningBanner: controller.closeContactsWarningBanner,
+            goToSettingsForPermissionActions:
+                controller.goToSettingsForPermissionActions,
+          ),
         ),
       ),
     );

diff --git a/lib/pages/settings_dashboard/settings/settings_app_bar.dart b/lib/pages/settings_dashboard/settings/settings_app_bar.dart
@@ -2,6 +2,7 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/di/global/get_it_initializer.dart';
 import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:flutter/material.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class SettingsAppBar extends StatelessWidget implements PreferredSizeWidget {
   final Widget? title;
@@ -21,6 +22,7 @@ class SettingsAppBar extends StatelessWidget implements PreferredSizeWidget {
   Widget build(BuildContext context) {
     final responsiveUtils = getIt.get<ResponsiveUtils>();
     return AppBar(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       title: title,
       leading: responsiveUtils.isMobile(context)
           ? const BackButton()

diff --git a/lib/pages/settings_dashboard/settings/settings_item_builder.dart b/lib/pages/settings_dashboard/settings/settings_item_builder.dart
@@ -1,7 +1,7 @@
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings/settings_view_style.dart';
 import 'package:flutter/material.dart';
-import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class SettingsItemBuilder extends StatelessWidget {
   final String title;
@@ -26,8 +26,9 @@ class SettingsItemBuilder extends StatelessWidget {
     return Material(
       borderRadius: BorderRadius.circular(AppConfig.borderRadius),
       clipBehavior: Clip.hardEdge,
-      color:
-          isSelected ? Theme.of(context).colorScheme.secondaryContainer : null,
+      color: isSelected
+          ? Theme.of(context).colorScheme.secondaryContainer
+          : LinagoraSysColors.material().onPrimary,
       child: InkWell(
         onTap: onTap,
         child: Padding(

diff --git a/lib/pages/settings_dashboard/settings/settings_view.dart b/lib/pages/settings_dashboard/settings/settings_view.dart
@@ -7,7 +7,7 @@ import 'package:fluffychat/widgets/avatar/avatar.dart';
 import 'package:fluffychat/widgets/avatar/avatar_style.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 import 'settings.dart';
 
@@ -24,7 +24,9 @@ class SettingsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: AppBar(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
         toolbarHeight: AppConfig.toolbarHeight(context),
         title: Text(
           L10n.of(context)!.settings,
@@ -48,7 +50,7 @@ class SettingsView extends StatelessWidget {
                 color: controller.optionsSelectNotifier.value ==
                         SettingEnum.profile
                     ? Theme.of(context).colorScheme.secondaryContainer
-                    : null,
+                    : LinagoraSysColors.material().onPrimary,
                 child: InkWell(
                   onTap: () => controller.goToSettingsProfile(),
                   child: Padding(

diff --git a/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_dashboard/settings_3pid/settings_3pid_view.dart
@@ -3,6 +3,7 @@ import 'package:fluffychat/pages/settings_dashboard/settings_3pid/settings_3pid.
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
@@ -17,6 +18,7 @@ class Settings3PidView extends StatelessWidget {
   Widget build(BuildContext context) {
     controller.request ??= Matrix.of(context).client.getAccount3PIDs();
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.passwordRecovery),
         actions: [

diff --git a/lib/pages/settings_dashboard/settings_app_language/settings_app_language_view.dart b/lib/pages/settings_dashboard/settings_app_language/settings_app_language_view.dart
@@ -17,6 +17,7 @@ class SettingsAppLanguageView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(
           L10n.of(context)!.appLanguage,

diff --git a/lib/pages/settings_dashboard/settings_chat/settings_chat_view.dart b/lib/pages/settings_dashboard/settings_chat/settings_chat_view.dart
@@ -10,6 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 import 'settings_chat.dart';
 
@@ -20,6 +21,7 @@ class SettingsChatView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.chat),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_dashboard/settings_emotes/settings_emotes_view.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -21,6 +22,7 @@ class EmotesSettingsView extends StatelessWidget {
     final client = Matrix.of(context).client;
     final imageKeys = controller.pack!.images.keys.toList();
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.emoteSettings),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_ignore_list/settings_ignore_list_view.dart b/lib/pages/settings_dashboard/settings_ignore_list/settings_ignore_list_view.dart
@@ -4,6 +4,7 @@ import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 import 'package:matrix/matrix.dart';
 
@@ -20,6 +21,7 @@ class SettingsIgnoreListView extends StatelessWidget {
   Widget build(BuildContext context) {
     final client = Matrix.of(context).client;
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.ignoredUsers),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_multiple_emotes/settings_multiple_emotes_view.dart b/lib/pages/settings_dashboard/settings_multiple_emotes/settings_multiple_emotes_view.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/pages/settings_dashboard/settings_multiple_emotes/settings_multiple_emotes.dart';
@@ -18,6 +19,7 @@ class MultipleEmotesSettingsView extends StatelessWidget {
   Widget build(BuildContext context) {
     final room = Matrix.of(context).client.getRoomById(controller.roomId!)!;
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.emotePacks),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart b/lib/pages/settings_dashboard/settings_notifications/settings_notifications_view.dart
@@ -5,6 +5,7 @@ import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 import 'package:matrix/matrix.dart';
 
@@ -20,6 +21,7 @@ class SettingsNotificationsView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.notifications),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_security/settings_security_view.dart b/lib/pages/settings_dashboard/settings_security/settings_security_view.dart
@@ -5,6 +5,7 @@ import 'package:fluffychat/utils/beautify_string_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'settings_security.dart';
 
 class SettingsSecurityView extends StatelessWidget {
@@ -14,6 +15,7 @@ class SettingsSecurityView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: SettingsAppBar(
         title: Text(L10n.of(context)!.security),
         context: context,

diff --git a/lib/pages/settings_dashboard/settings_stories/settings_stories_view.dart b/lib/pages/settings_dashboard/settings_stories/settings_stories_view.dart
@@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings_stories/settings_stories.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/widgets/avatar/avatar.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class SettingsStoriesView extends StatelessWidget {
   final SettingsStoriesController controller;
@@ -13,7 +14,9 @@ class SettingsStoriesView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: AppBar(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
         title: Text(L10n.of(context)!.whoCanSeeMyStories),
         elevation: 0,
       ),

diff --git a/lib/pages/settings_dashboard/settings_style/settings_style_view.dart b/lib/pages/settings_dashboard/settings_style/settings_style_view.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'settings_style.dart';
 
 class SettingsStyleView extends StatelessWidget {
@@ -17,11 +18,12 @@ class SettingsStyleView extends StatelessWidget {
     const colorPickerSize = 32.0;
     final wallpaper = Matrix.of(context).wallpaper;
     return Scaffold(
+      backgroundColor: LinagoraSysColors.material().onPrimary,
       appBar: AppBar(
+        backgroundColor: LinagoraSysColors.material().onPrimary,
         leading: const BackButton(),
         title: Text(L10n.of(context)!.changeTheme),
       ),
-      backgroundColor: Theme.of(context).colorScheme.surface,
       body: MaxWidthBody(
         withScrolling: true,
         child: Column(