From aaeb72c3988f9c9f56925c79115d28d8d03bfa8e Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 22 May 2024 14:34:27 -0400 Subject: [PATCH 1/2] Overflowing text is shortened, with ellipsis --- lib/pangea/extensions/pangea_room_extension.dart | 2 ++ lib/pangea/pages/class_settings/class_name_header.dart | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart index febd17fa8..4d08f0b62 100644 --- a/lib/pangea/extensions/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension.dart @@ -124,6 +124,8 @@ extension PangeaRoom on Room { Text nameAndRoomTypeIcon([TextStyle? textStyle]) => Text.rich( style: textStyle, + maxLines: 1, + overflow: TextOverflow.ellipsis, TextSpan( children: [ WidgetSpan( diff --git a/lib/pangea/pages/class_settings/class_name_header.dart b/lib/pangea/pages/class_settings/class_name_header.dart index 39adaa126..12a1090f2 100644 --- a/lib/pangea/pages/class_settings/class_name_header.dart +++ b/lib/pangea/pages/class_settings/class_name_header.dart @@ -1,11 +1,9 @@ +import 'package:fluffychat/pages/chat_details/chat_details.dart'; +import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:flutter/material.dart'; import 'package:flutter/src/widgets/visibility.dart' as visible; - import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat_details/chat_details.dart'; -import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; - class ClassNameHeader extends StatelessWidget { final Room room; final ChatDetailsController controller; @@ -24,14 +22,14 @@ class ClassNameHeader extends StatelessWidget { style: TextButton.styleFrom( padding: const EdgeInsets.symmetric(horizontal: 25), ), - label: visible.Visibility( + icon: visible.Visibility( visible: controller.showEditNameIcon, child: Icon( Icons.edit, color: Theme.of(context).colorScheme.onBackground, ), ), - icon: room.nameAndRoomTypeIcon( + label: room.nameAndRoomTypeIcon( TextStyle( fontSize: 20, color: Theme.of(context).textTheme.bodyLarge!.color, From a72197c80560f9e1cf9e22b26b6d3fe85b05569b Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 27 May 2024 09:45:50 -0400 Subject: [PATCH 2/2] increased max chat / space name length --- lib/pages/new_group/new_group_view.dart | 2 +- lib/pages/new_space/new_space_view.dart | 2 +- lib/pangea/utils/set_class_name.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart index 523f3002e..ced178038 100644 --- a/lib/pages/new_group/new_group_view.dart +++ b/lib/pages/new_group/new_group_view.dart @@ -58,7 +58,7 @@ class NewGroupView extends StatelessWidget { Expanded( child: TextField( // #Pangea - maxLength: 32, + maxLength: 64, // Pangea# controller: controller.nameController, autocorrect: false, diff --git a/lib/pages/new_space/new_space_view.dart b/lib/pages/new_space/new_space_view.dart index 23f81b7ab..2b6371b09 100644 --- a/lib/pages/new_space/new_space_view.dart +++ b/lib/pages/new_space/new_space_view.dart @@ -96,7 +96,7 @@ class NewSpaceView extends StatelessWidget { Expanded( child: TextField( // #Pangea - maxLength: 32, + maxLength: 64, // Pangea# controller: controller.nameController, autocorrect: false, diff --git a/lib/pangea/utils/set_class_name.dart b/lib/pangea/utils/set_class_name.dart index 1fd2ab66d..430f8ce4c 100644 --- a/lib/pangea/utils/set_class_name.dart +++ b/lib/pangea/utils/set_class_name.dart @@ -27,7 +27,7 @@ void setClassDisplayname(BuildContext context, String? roomId) async { : L10n.of(context)!.changeTheNameOfTheChat, ), content: TextField( - maxLength: 32, + maxLength: 64, controller: textFieldController, ), actions: [