feat(ui): Improve text overflow and spacing in chat drawer
This commit is contained in:
@@ -709,12 +709,13 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
?.cast<String, dynamic>();
|
||||
final name =
|
||||
meta?['name']?.toString() ?? parsed.host;
|
||||
final collectionName =
|
||||
result?['collection_name']?.toString();
|
||||
final collectionName = result?['collection_name']
|
||||
?.toString();
|
||||
|
||||
// Add as appropriate type
|
||||
final notifier =
|
||||
ref.read(contextAttachmentsProvider.notifier);
|
||||
final notifier = ref.read(
|
||||
contextAttachmentsProvider.notifier,
|
||||
);
|
||||
if (isYoutube) {
|
||||
notifier.addYoutube(
|
||||
displayName: name,
|
||||
@@ -1680,13 +1681,9 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
constraints: BoxConstraints(
|
||||
maxWidth: constraints.maxWidth,
|
||||
),
|
||||
child: FittedBox(
|
||||
fit: BoxFit.scaleDown,
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
AnimatedSwitcher(
|
||||
duration: const Duration(
|
||||
@@ -1701,7 +1698,12 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
),
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
StreamingTitleText(
|
||||
ConstrainedBox(
|
||||
constraints: BoxConstraints(
|
||||
maxWidth:
|
||||
constraints.maxWidth,
|
||||
),
|
||||
child: StreamingTitleText(
|
||||
title:
|
||||
displayConversationTitle,
|
||||
style: AppTypography
|
||||
@@ -1720,6 +1722,7 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
.textPrimary
|
||||
.withValues(alpha: 0.8),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: Spacing.xs,
|
||||
),
|
||||
@@ -1734,12 +1737,9 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
Transform.translate(
|
||||
offset: const Offset(0, 0),
|
||||
child: () {
|
||||
const double iconPaddingX =
|
||||
Spacing.xs;
|
||||
const double iconPaddingY =
|
||||
Spacing.xxs;
|
||||
const double iconWidth =
|
||||
IconSize.small;
|
||||
const double iconPaddingX = Spacing.xs;
|
||||
const double iconPaddingY = Spacing.xxs;
|
||||
const double iconWidth = IconSize.small;
|
||||
const double iconBoxWidth =
|
||||
(iconPaddingX * 2) +
|
||||
(BorderWidth.thin * 2) +
|
||||
@@ -1763,8 +1763,7 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
child: Container(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(
|
||||
horizontal:
|
||||
iconPaddingX,
|
||||
horizontal: iconPaddingX,
|
||||
vertical: iconPaddingY,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
@@ -1835,8 +1834,7 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
Platform.isIOS
|
||||
? CupertinoIcons
|
||||
.chevron_down
|
||||
: Icons
|
||||
.keyboard_arrow_down,
|
||||
: Icons.keyboard_arrow_down,
|
||||
color: context
|
||||
.conduitTheme
|
||||
.iconSecondary,
|
||||
@@ -1870,12 +1868,9 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
vertical: 1.0,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: context
|
||||
.conduitTheme
|
||||
.success
|
||||
color: context.conduitTheme.success
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius:
|
||||
BorderRadius.circular(
|
||||
borderRadius: BorderRadius.circular(
|
||||
AppBorderRadius.badge,
|
||||
),
|
||||
border: Border.all(
|
||||
@@ -1902,7 +1897,6 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../shared/widgets/middle_ellipsis_text.dart';
|
||||
|
||||
/// Displays a chat title that reveals characters with a streaming animation
|
||||
/// whenever the title changes.
|
||||
class StreamingTitleText extends StatefulWidget {
|
||||
@@ -141,17 +143,33 @@ class _StreamingTitleTextState extends State<StreamingTitleText>
|
||||
? widget.style.fontSize! * (widget.style.height ?? 1.1)
|
||||
: 18.0);
|
||||
|
||||
return Row(
|
||||
// When animation is complete, use middle ellipsis for overflow.
|
||||
// During animation, show partial text with standard Text widget.
|
||||
final bool animationComplete = revealedGlyphs >= totalGlyphs;
|
||||
|
||||
// Use middle ellipsis when animation is complete
|
||||
if (animationComplete) {
|
||||
return MiddleEllipsisText(
|
||||
_activeTitle,
|
||||
style: widget.style,
|
||||
textAlign: TextAlign.center,
|
||||
semanticsLabel: _activeTitle,
|
||||
);
|
||||
}
|
||||
|
||||
// During animation, use IntrinsicWidth to size the row to the text,
|
||||
// then clip any overflow from the cursor
|
||||
return ClipRect(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
// When the animation completes we fall back to the full string.
|
||||
revealedGlyphs >= totalGlyphs ? _activeTitle : visibleText,
|
||||
visibleText,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.fade,
|
||||
overflow: TextOverflow.clip,
|
||||
softWrap: false,
|
||||
textAlign: TextAlign.center,
|
||||
style: widget.style,
|
||||
@@ -171,6 +189,7 @@ class _StreamingTitleTextState extends State<StreamingTitleText>
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ import '../../../core/models/folder.dart';
|
||||
import '../../../core/persistence/persistence_keys.dart';
|
||||
import '../../../core/persistence/hive_boxes.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
|
||||
enum _SectionType { pinned, recent }
|
||||
@@ -420,16 +421,18 @@ class _ChatsDrawerState extends ConsumerState<ChatsDrawer> {
|
||||
);
|
||||
out.add(
|
||||
const SliverToBoxAdapter(
|
||||
child: SizedBox(height: Spacing.xs),
|
||||
child: SizedBox(height: Spacing.sm),
|
||||
),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Only add spacing after collapsed folders
|
||||
out.add(
|
||||
const SliverToBoxAdapter(
|
||||
child: SizedBox(height: Spacing.xs),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
return out.isEmpty
|
||||
? <Widget>[
|
||||
const SliverToBoxAdapter(
|
||||
@@ -665,6 +668,13 @@ class _ChatsDrawerState extends ConsumerState<ChatsDrawer> {
|
||||
child: SizedBox(height: Spacing.sm),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
// Only add spacing after collapsed folders
|
||||
out.add(
|
||||
const SliverToBoxAdapter(
|
||||
child: SizedBox(height: Spacing.xs),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
return out.isEmpty
|
||||
@@ -1903,11 +1913,10 @@ class _ConversationTileContent extends StatelessWidget {
|
||||
],
|
||||
Flexible(
|
||||
fit: textFit,
|
||||
child: Text(
|
||||
child: MiddleEllipsisText(
|
||||
title,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textStyle,
|
||||
semanticsLabel: title,
|
||||
),
|
||||
),
|
||||
...trailing,
|
||||
|
||||
Reference in New Issue
Block a user