ars/iiEsaywebUIapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): Improve text overflow and spacing in chat drawer

Browse Source
This commit is contained in:
cogwheel0
2025-11-28 14:59:38 +05:30
parent e15ce5b7b6
commit 98ae65d08f
3 changed files with 220 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

318
lib/features/chat/views/chat_page.dart
View File

@@ -709,12 +709,13 @@ class _ChatPageState extends ConsumerState<ChatPage> {
?.cast<String, dynamic>(); ?.cast<String, dynamic>();
final name = final name =
meta?['name']?.toString() ?? parsed.host; meta?['name']?.toString() ?? parsed.host;
final collectionName = final collectionName = result?['collection_name']
result?['collection_name']?.toString(); ?.toString();
// Add as appropriate type // Add as appropriate type
final notifier = final notifier = ref.read(
ref.read(contextAttachmentsProvider.notifier); contextAttachmentsProvider.notifier,
);
if (isYoutube) { if (isYoutube) {
notifier.addYoutube( notifier.addYoutube(
displayName: name, displayName: name,
@@ -1680,28 +1681,29 @@ class _ChatPageState extends ConsumerState<ChatPage> {
constraints: BoxConstraints( constraints: BoxConstraints(
maxWidth: constraints.maxWidth, maxWidth: constraints.maxWidth,
), ),
child: FittedBox( child: Column(
fit: BoxFit.scaleDown, mainAxisSize: MainAxisSize.min,
alignment: Alignment.center, crossAxisAlignment: CrossAxisAlignment.center,
child: Column( children: [
mainAxisSize: MainAxisSize.min, AnimatedSwitcher(
crossAxisAlignment: duration: const Duration(
CrossAxisAlignment.center, milliseconds: 250,
children: [ ),
AnimatedSwitcher( switchInCurve: Curves.easeOutCubic,
duration: const Duration( switchOutCurve: Curves.easeInCubic,
milliseconds: 250, child: displayConversationTitle != null
), ? Column(
switchInCurve: Curves.easeOutCubic, key: ValueKey<String>(
switchOutCurve: Curves.easeInCubic, displayConversationTitle,
child: displayConversationTitle != null ),
? Column( mainAxisSize: MainAxisSize.min,
key: ValueKey<String>( children: [
displayConversationTitle, ConstrainedBox(
), constraints: BoxConstraints(
mainAxisSize: MainAxisSize.min, maxWidth:
children: [ constraints.maxWidth,
StreamingTitleText( ),
child: StreamingTitleText(
title: title:
displayConversationTitle, displayConversationTitle,
style: AppTypography style: AppTypography
@@ -1720,96 +1722,45 @@ class _ChatPageState extends ConsumerState<ChatPage> {
.textPrimary .textPrimary
.withValues(alpha: 0.8), .withValues(alpha: 0.8),
), ),
const SizedBox(
height: Spacing.xs,
),
],
)
: const SizedBox.shrink(
key: ValueKey<String>(
'empty-title',
), ),
const SizedBox(
height: Spacing.xs,
),
],
)
: const SizedBox.shrink(
key: ValueKey<String>(
'empty-title',
), ),
), ),
Transform.translate( ),
offset: const Offset(0, 0), Transform.translate(
child: () { offset: const Offset(0, 0),
const double iconPaddingX = child: () {
Spacing.xs; const double iconPaddingX = Spacing.xs;
const double iconPaddingY = const double iconPaddingY = Spacing.xxs;
Spacing.xxs; const double iconWidth = IconSize.small;
const double iconWidth = const double iconBoxWidth =
IconSize.small; (iconPaddingX * 2) +
const double iconBoxWidth = (BorderWidth.thin * 2) +
(iconPaddingX * 2) + iconWidth;
(BorderWidth.thin * 2) + final double maxLabelWidth =
iconWidth; (constraints.maxWidth -
final double maxLabelWidth = (iconBoxWidth * 2) -
(constraints.maxWidth - (Spacing.xs * 2))
(iconBoxWidth * 2) - .clamp(
(Spacing.xs * 2)) 48.0,
.clamp( constraints.maxWidth,
48.0, );
constraints.maxWidth,
);
final row = Row( final row = Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Opacity( Opacity(
opacity: 0.0, opacity: 0.0,
child: Container( child: Container(
padding:
const EdgeInsets.symmetric(
horizontal:
iconPaddingX,
vertical: iconPaddingY,
),
decoration: BoxDecoration(
color: context
.conduitTheme
.surfaceBackground
.withValues(alpha: 0.3),
borderRadius:
BorderRadius.circular(
AppBorderRadius.badge,
),
border: Border.all(
color: context
.conduitTheme
.dividerColor,
width: BorderWidth.thin,
),
),
child: Icon(
Platform.isIOS
? CupertinoIcons
.chevron_down
: Icons
.keyboard_arrow_down,
color: context
.conduitTheme
.iconSecondary,
size: iconWidth,
),
),
),
const SizedBox(width: Spacing.xs),
ConstrainedBox(
constraints: BoxConstraints(
maxWidth: maxLabelWidth,
),
child: MiddleEllipsisText(
modelLabel,
style: modelTextStyle,
textAlign: TextAlign.center,
semanticsLabel: modelLabel,
),
),
const SizedBox(width: Spacing.xs),
Container(
padding: padding:
const EdgeInsets.symmetric( const EdgeInsets.symmetric(
horizontal: iconPaddingX, horizontal: iconPaddingX,
@@ -1843,64 +1794,107 @@ class _ChatPageState extends ConsumerState<ChatPage> {
size: iconWidth, size: iconWidth,
), ),
), ),
],
);
final constrainedRow = ConstrainedBox(
constraints: BoxConstraints(
maxWidth: constraints.maxWidth,
), ),
child: row, const SizedBox(width: Spacing.xs),
); ConstrainedBox(
return hasConversationTitle constraints: BoxConstraints(
? SizedBox( maxWidth: maxLabelWidth,
height: 24, ),
child: constrainedRow, child: MiddleEllipsisText(
) modelLabel,
: constrainedRow; style: modelTextStyle,
}(), textAlign: TextAlign.center,
), semanticsLabel: modelLabel,
if (isReviewerMode) ),
Padding( ),
padding: const EdgeInsets.only( const SizedBox(width: Spacing.xs),
top: 2.0, Container(
padding:
const EdgeInsets.symmetric(
horizontal: iconPaddingX,
vertical: iconPaddingY,
),
decoration: BoxDecoration(
color: context
.conduitTheme
.surfaceBackground
.withValues(alpha: 0.3),
borderRadius:
BorderRadius.circular(
AppBorderRadius.badge,
),
border: Border.all(
color: context
.conduitTheme
.dividerColor,
width: BorderWidth.thin,
),
),
child: Icon(
Platform.isIOS
? CupertinoIcons
.chevron_down
: Icons.keyboard_arrow_down,
color: context
.conduitTheme
.iconSecondary,
size: iconWidth,
),
),
],
);
final constrainedRow = ConstrainedBox(
constraints: BoxConstraints(
maxWidth: constraints.maxWidth,
), ),
child: Container( child: row,
padding: const EdgeInsets.symmetric( );
horizontal: Spacing.sm, return hasConversationTitle
vertical: 1.0, ? SizedBox(
height: 24,
child: constrainedRow,
)
: constrainedRow;
}(),
),
if (isReviewerMode)
Padding(
padding: const EdgeInsets.only(
top: 2.0,
),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: Spacing.sm,
vertical: 1.0,
),
decoration: BoxDecoration(
color: context.conduitTheme.success
.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(
AppBorderRadius.badge,
), ),
decoration: BoxDecoration( border: Border.all(
color: context color: context
.conduitTheme .conduitTheme
.success .success
.withValues(alpha: 0.1), .withValues(alpha: 0.3),
borderRadius: width: BorderWidth.thin,
BorderRadius.circular(
AppBorderRadius.badge,
),
border: Border.all(
color: context
.conduitTheme
.success
.withValues(alpha: 0.3),
width: BorderWidth.thin,
),
),
child: Text(
'REVIEWER MODE',
style: AppTypography.captionStyle
.copyWith(
color: context
.conduitTheme
.success,
fontWeight: FontWeight.w600,
fontSize: 9,
),
), ),
), ),
child: Text(
'REVIEWER MODE',
style: AppTypography.captionStyle
.copyWith(
color: context
.conduitTheme
.success,
fontWeight: FontWeight.w600,
fontSize: 9,
),
),
), ),
], ),
), ],
), ),
), ),
); );

75
lib/features/chat/widgets/streaming_title_text.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../shared/widgets/middle_ellipsis_text.dart';
/// Displays a chat title that reveals characters with a streaming animation /// Displays a chat title that reveals characters with a streaming animation
/// whenever the title changes. /// whenever the title changes.
class StreamingTitleText extends StatefulWidget { class StreamingTitleText extends StatefulWidget {
@@ -141,36 +143,53 @@ class _StreamingTitleTextState extends State<StreamingTitleText>
? widget.style.fontSize! * (widget.style.height ?? 1.1) ? widget.style.fontSize! * (widget.style.height ?? 1.1)
: 18.0); : 18.0);
return Row( // When animation is complete, use middle ellipsis for overflow.
mainAxisSize: MainAxisSize.min, // During animation, show partial text with standard Text widget.
mainAxisAlignment: MainAxisAlignment.center, final bool animationComplete = revealedGlyphs >= totalGlyphs;
crossAxisAlignment: CrossAxisAlignment.center,
children: [ // Use middle ellipsis when animation is complete
Flexible( if (animationComplete) {
child: Text( return MiddleEllipsisText(
// When the animation completes we fall back to the full string. _activeTitle,
revealedGlyphs >= totalGlyphs ? _activeTitle : visibleText, style: widget.style,
maxLines: 1, textAlign: TextAlign.center,
overflow: TextOverflow.fade, semanticsLabel: _activeTitle,
softWrap: false, );
textAlign: TextAlign.center, }
style: widget.style,
), // During animation, use IntrinsicWidth to size the row to the text,
), // then clip any overflow from the cursor
if (isAnimating) return ClipRect(
FadeTransition( child: Row(
opacity: _cursorOpacity, mainAxisSize: MainAxisSize.min,
child: Container( mainAxisAlignment: MainAxisAlignment.center,
width: widget.cursorWidth, crossAxisAlignment: CrossAxisAlignment.center,
height: cursorHeight, children: [
margin: const EdgeInsets.only(left: 2), Flexible(
decoration: BoxDecoration( child: Text(
color: cursorColor, visibleText,
borderRadius: BorderRadius.circular(widget.cursorWidth), maxLines: 1,
), overflow: TextOverflow.clip,
softWrap: false,
textAlign: TextAlign.center,
style: widget.style,
), ),
), ),
], if (isAnimating)
FadeTransition(
opacity: _cursorOpacity,
child: Container(
width: widget.cursorWidth,
height: cursorHeight,
margin: const EdgeInsets.only(left: 2),
decoration: BoxDecoration(
color: cursorColor,
borderRadius: BorderRadius.circular(widget.cursorWidth),
),
),
),
],
),
); );
} }

25
lib/features/navigation/widgets/chats_drawer.dart
View File

@@ -29,6 +29,7 @@ import '../../../core/models/folder.dart';
import '../../../core/persistence/persistence_keys.dart'; import '../../../core/persistence/persistence_keys.dart';
import '../../../core/persistence/hive_boxes.dart'; import '../../../core/persistence/hive_boxes.dart';
import 'package:hive_ce/hive.dart'; import 'package:hive_ce/hive.dart';
import '../../../shared/widgets/middle_ellipsis_text.dart';
/// Defines the section types that can be collapsed in the chats drawer /// Defines the section types that can be collapsed in the chats drawer
enum _SectionType { pinned, recent } enum _SectionType { pinned, recent }
@@ -418,17 +419,19 @@ class _ChatsDrawerState extends ConsumerState<ChatsDrawer> {
modelsById: modelsById, modelsById: modelsById,
), ),
); );
out.add(
const SliverToBoxAdapter(
child: SizedBox(height: Spacing.sm),
),
);
} else {
// Only add spacing after collapsed folders
out.add( out.add(
const SliverToBoxAdapter( const SliverToBoxAdapter(
child: SizedBox(height: Spacing.xs), child: SizedBox(height: Spacing.xs),
), ),
); );
} }
out.add(
const SliverToBoxAdapter(
child: SizedBox(height: Spacing.xs),
),
);
} }
return out.isEmpty return out.isEmpty
? <Widget>[ ? <Widget>[
@@ -665,6 +668,13 @@ class _ChatsDrawerState extends ConsumerState<ChatsDrawer> {
child: SizedBox(height: Spacing.sm), child: SizedBox(height: Spacing.sm),
), ),
); );
} else {
// Only add spacing after collapsed folders
out.add(
const SliverToBoxAdapter(
child: SizedBox(height: Spacing.xs),
),
);
} }
} }
return out.isEmpty return out.isEmpty
@@ -1903,11 +1913,10 @@ class _ConversationTileContent extends StatelessWidget {
], ],
Flexible( Flexible(
fit: textFit, fit: textFit,
child: Text( child: MiddleEllipsisText(
title, title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: textStyle, style: textStyle,
semanticsLabel: title,
), ),
), ),
...trailing, ...trailing,