fixup! TW-902: new design group informations

linagora · Dec 8, 2023 · 5144aa7 · 5144aa7
1 parent 0146b03
commit 5144aa7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 38 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -2956,7 +2956,7 @@
   "failToSend": "Failed to send, please try again",
   "showLess": "Show Less",
   "showMore": "Show More",
-  "groupInformations": "Group informations",
+  "groupInformations": "Group information",
   "linkInvite": "Link invite",
   "noDescription": "No description",
   "description": "Description",

diff --git a/lib/domain/app_state/room/update_group_chat_success.dart b/lib/domain/app_state/room/update_group_chat_success.dart
@@ -7,19 +7,19 @@ class UpdateGroupChatInitial extends Success {
 }
 
 class UpdateGroupChatSuccess extends Success {
-  final MatrixFile? roomAvatar;
+  final MatrixFile? roomAvatarFile;
   final String? displayName;
   final String? description;
   final bool isDeleteAvatar;
 
   const UpdateGroupChatSuccess({
-    this.roomAvatar,
+    this.roomAvatarFile,
     this.displayName,
     this.description,
     this.isDeleteAvatar = false,
   });
 
   @override
   List<Object?> get props =>
-      [roomAvatar, displayName, description, isDeleteAvatar];
+      [roomAvatarFile, displayName, description, isDeleteAvatar];
 }
diff --git a/lib/domain/usecase/room/update_group_chat_interactor.dart b/lib/domain/usecase/room/update_group_chat_interactor.dart
@@ -41,7 +41,7 @@ class UpdateGroupChatInteractor {
       yield Right(
         UpdateGroupChatSuccess(
           displayName: displayName,
-          roomAvatar: avatar,
+          roomAvatarFile: avatar,
           description: description,
           isDeleteAvatar: isDeleteAvatar,
         ),

diff --git a/lib/pages/chat_details/chat_details_edit_view.dart b/lib/pages/chat_details/chat_details_edit_view.dart
@@ -301,16 +301,9 @@ class _GroupNameField extends StatelessWidget {
             borderSide: BorderSide(color: Theme.of(context).colorScheme.shadow),
           ),
           labelText: L10n.of(context)!.widgetName,
-          labelStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
-                fontSize: 16,
-                letterSpacing: 0.4,
-                color: Theme.of(context).colorScheme.onSurface,
-              ),
+          labelStyle: ChatDetailEditViewStyle.textFieldLabelStyle(context),
           hintText: L10n.of(context)!.enterGroupName,
-          hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                letterSpacing: -0.15,
-                color: Theme.of(context).colorScheme.onSurface,
-              ),
+          hintStyle: ChatDetailEditViewStyle.textFieldHintStyle(context),
           contentPadding: ChatDetailEditViewStyle.contentPadding,
         ),
       ),
@@ -341,16 +334,9 @@ class _DescriptionField extends StatelessWidget {
                     BorderSide(color: Theme.of(context).colorScheme.shadow),
               ),
               labelText: L10n.of(context)!.description,
-              labelStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    fontSize: 16,
-                    letterSpacing: 0.4,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              labelStyle: ChatDetailEditViewStyle.textFieldLabelStyle(context),
               hintText: L10n.of(context)!.description,
-              hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                    letterSpacing: -0.15,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              hintStyle: ChatDetailEditViewStyle.textFieldHintStyle(context),
               contentPadding: ChatDetailEditViewStyle.contentPadding,
             ),
           ),

diff --git a/lib/pages/chat_details/chat_details_edit_view_style.dart b/lib/pages/chat_details/chat_details_edit_view_style.dart
@@ -34,6 +34,17 @@ class ChatDetailEditViewStyle {
   static const double textFieldsGap = 16.0;
   static const EdgeInsets textFieldPadding =
       EdgeInsets.symmetric(horizontal: 8.0);
+  static TextStyle? textFieldLabelStyle(BuildContext context) =>
+      Theme.of(context).textTheme.bodySmall?.copyWith(
+            fontSize: 16,
+            letterSpacing: 0.4,
+            color: Theme.of(context).colorScheme.onSurface,
+          );
+  static TextStyle? textFieldHintStyle(BuildContext context) =>
+      Theme.of(context).textTheme.bodyLarge?.copyWith(
+            letterSpacing: -0.15,
+            color: Theme.of(context).colorScheme.onSurface,
+          );
 
   static const EdgeInsetsDirectional contentPadding =
       EdgeInsetsDirectional.all(16.0);

diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
@@ -110,11 +110,10 @@ class ChatDetailsView extends StatelessWidget {
                                     title: L10n.of(context)!.groupDescription,
                                   ),
                                   subtitle: _TileSubtitleText(
-                                    subtitle:
-                                        controller.room?.topic == null ||
-                                                controller.room!.topic.isEmpty
-                                            ? L10n.of(context)!.noDescription
-                                            : controller.room!.topic,
+                                    subtitle: controller.room?.topic == null ||
+                                            controller.room!.topic.isEmpty
+                                        ? L10n.of(context)!.noDescription
+                                        : controller.room!.topic,
                                   ),
                                 ),
                                 ValueListenableBuilder(
@@ -125,8 +124,7 @@ class ChatDetailsView extends StatelessWidget {
                                         Icons.notifications_outlined,
                                       ),
                                       title: _TileTitleText(
-                                        title:
-                                            L10n.of(context)!.notifications,
+                                        title: L10n.of(context)!.notifications,
                                       ),
                                       trailing: SizedBox(
                                         width: ChatDetailViewStyle
@@ -136,15 +134,13 @@ class ChatDetailsView extends StatelessWidget {
                                         child: FittedBox(
                                           fit: BoxFit.fill,
                                           child: Switch(
-                                            activeTrackColor:
-                                                Theme.of(context)
-                                                    .colorScheme
-                                                    .primary,
+                                            activeTrackColor: Theme.of(context)
+                                                .colorScheme
+                                                .primary,
                                             value: pushRuleState ==
                                                 PushRuleState.notify,
                                             onChanged: (value) {
-                                              controller
-                                                  .onToggleNotification();
+                                              controller.onToggleNotification();
                                             },
                                           ),
                                         ),
@@ -350,7 +346,7 @@ class _GroupInformation extends StatelessWidget {
                   ),
                 ),
                 width: constraints.maxWidth,
-                height: ChatDetailViewStyle.avatarHeight(context),
+                height: ChatDetailViewStyle.avatarHeight,
                 child: Center(
                   child: Text(
                     text,
@@ -369,7 +365,7 @@ class _GroupInformation extends StatelessWidget {
               return MxcImage(
                 uri: avatarUri,
                 width: constraints.maxWidth,
-                height: ChatDetailViewStyle.avatarHeight(context),
+                height: ChatDetailViewStyle.avatarHeight,
                 fit: BoxFit.cover,
                 placeholder: (_) => placeholder,
                 cacheKey: avatarUri.toString(),