feat: toggle full model name display in header
This commit is contained in:
@@ -589,7 +589,7 @@ class ApiService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to chat.messages (list format) if history is missing or empty
|
// Fallback to chat.messages (list format) if history is missing or empty
|
||||||
if ((messagesList == null || (messagesList is List && messagesList.isEmpty)) &&
|
if (((messagesList?.isEmpty ?? true)) &&
|
||||||
chatObject['messages'] != null) {
|
chatObject['messages'] != null) {
|
||||||
messagesList = chatObject['messages'] as List;
|
messagesList = chatObject['messages'] as List;
|
||||||
debugPrint(
|
debugPrint(
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ class SettingsService {
|
|||||||
static const String _largeTextKey = 'large_text';
|
static const String _largeTextKey = 'large_text';
|
||||||
static const String _darkModeKey = 'dark_mode';
|
static const String _darkModeKey = 'dark_mode';
|
||||||
static const String _defaultModelKey = 'default_model';
|
static const String _defaultModelKey = 'default_model';
|
||||||
|
// Model name formatting
|
||||||
|
static const String _omitProviderInModelNameKey =
|
||||||
|
'omit_provider_in_model_name';
|
||||||
// Voice input settings
|
// Voice input settings
|
||||||
static const String _voiceLocaleKey = 'voice_locale_id';
|
static const String _voiceLocaleKey = 'voice_locale_id';
|
||||||
static const String _voiceHoldToTalkKey = 'voice_hold_to_talk';
|
static const String _voiceHoldToTalkKey = 'voice_hold_to_talk';
|
||||||
@@ -105,6 +108,17 @@ class SettingsService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether to omit the provider prefix when displaying model names
|
||||||
|
static Future<bool> getOmitProviderInModelName() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getBool(_omitProviderInModelNameKey) ?? true; // default: omit
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<void> setOmitProviderInModelName(bool value) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
await prefs.setBool(_omitProviderInModelNameKey, value);
|
||||||
|
}
|
||||||
|
|
||||||
/// Load all settings
|
/// Load all settings
|
||||||
static Future<AppSettings> loadSettings() async {
|
static Future<AppSettings> loadSettings() async {
|
||||||
return AppSettings(
|
return AppSettings(
|
||||||
@@ -115,6 +129,7 @@ class SettingsService {
|
|||||||
largeText: await getLargeText(),
|
largeText: await getLargeText(),
|
||||||
darkMode: await getDarkMode(),
|
darkMode: await getDarkMode(),
|
||||||
defaultModel: await getDefaultModel(),
|
defaultModel: await getDefaultModel(),
|
||||||
|
omitProviderInModelName: await getOmitProviderInModelName(),
|
||||||
voiceLocaleId: await getVoiceLocaleId(),
|
voiceLocaleId: await getVoiceLocaleId(),
|
||||||
voiceHoldToTalk: await getVoiceHoldToTalk(),
|
voiceHoldToTalk: await getVoiceHoldToTalk(),
|
||||||
voiceAutoSendFinal: await getVoiceAutoSendFinal(),
|
voiceAutoSendFinal: await getVoiceAutoSendFinal(),
|
||||||
@@ -131,6 +146,7 @@ class SettingsService {
|
|||||||
setLargeText(settings.largeText),
|
setLargeText(settings.largeText),
|
||||||
setDarkMode(settings.darkMode),
|
setDarkMode(settings.darkMode),
|
||||||
setDefaultModel(settings.defaultModel),
|
setDefaultModel(settings.defaultModel),
|
||||||
|
setOmitProviderInModelName(settings.omitProviderInModelName),
|
||||||
setVoiceLocaleId(settings.voiceLocaleId),
|
setVoiceLocaleId(settings.voiceLocaleId),
|
||||||
setVoiceHoldToTalk(settings.voiceHoldToTalk),
|
setVoiceHoldToTalk(settings.voiceHoldToTalk),
|
||||||
setVoiceAutoSendFinal(settings.voiceAutoSendFinal),
|
setVoiceAutoSendFinal(settings.voiceAutoSendFinal),
|
||||||
@@ -221,6 +237,7 @@ class AppSettings {
|
|||||||
final bool largeText;
|
final bool largeText;
|
||||||
final bool darkMode;
|
final bool darkMode;
|
||||||
final String? defaultModel;
|
final String? defaultModel;
|
||||||
|
final bool omitProviderInModelName;
|
||||||
final String? voiceLocaleId;
|
final String? voiceLocaleId;
|
||||||
final bool voiceHoldToTalk;
|
final bool voiceHoldToTalk;
|
||||||
final bool voiceAutoSendFinal;
|
final bool voiceAutoSendFinal;
|
||||||
@@ -233,6 +250,7 @@ class AppSettings {
|
|||||||
this.largeText = false,
|
this.largeText = false,
|
||||||
this.darkMode = true,
|
this.darkMode = true,
|
||||||
this.defaultModel,
|
this.defaultModel,
|
||||||
|
this.omitProviderInModelName = true,
|
||||||
this.voiceLocaleId,
|
this.voiceLocaleId,
|
||||||
this.voiceHoldToTalk = false,
|
this.voiceHoldToTalk = false,
|
||||||
this.voiceAutoSendFinal = false,
|
this.voiceAutoSendFinal = false,
|
||||||
@@ -246,6 +264,7 @@ class AppSettings {
|
|||||||
bool? largeText,
|
bool? largeText,
|
||||||
bool? darkMode,
|
bool? darkMode,
|
||||||
Object? defaultModel = const _DefaultValue(),
|
Object? defaultModel = const _DefaultValue(),
|
||||||
|
bool? omitProviderInModelName,
|
||||||
Object? voiceLocaleId = const _DefaultValue(),
|
Object? voiceLocaleId = const _DefaultValue(),
|
||||||
bool? voiceHoldToTalk,
|
bool? voiceHoldToTalk,
|
||||||
bool? voiceAutoSendFinal,
|
bool? voiceAutoSendFinal,
|
||||||
@@ -258,6 +277,7 @@ class AppSettings {
|
|||||||
largeText: largeText ?? this.largeText,
|
largeText: largeText ?? this.largeText,
|
||||||
darkMode: darkMode ?? this.darkMode,
|
darkMode: darkMode ?? this.darkMode,
|
||||||
defaultModel: defaultModel is _DefaultValue ? this.defaultModel : defaultModel as String?,
|
defaultModel: defaultModel is _DefaultValue ? this.defaultModel : defaultModel as String?,
|
||||||
|
omitProviderInModelName: omitProviderInModelName ?? this.omitProviderInModelName,
|
||||||
voiceLocaleId: voiceLocaleId is _DefaultValue ? this.voiceLocaleId : voiceLocaleId as String?,
|
voiceLocaleId: voiceLocaleId is _DefaultValue ? this.voiceLocaleId : voiceLocaleId as String?,
|
||||||
voiceHoldToTalk: voiceHoldToTalk ?? this.voiceHoldToTalk,
|
voiceHoldToTalk: voiceHoldToTalk ?? this.voiceHoldToTalk,
|
||||||
voiceAutoSendFinal: voiceAutoSendFinal ?? this.voiceAutoSendFinal,
|
voiceAutoSendFinal: voiceAutoSendFinal ?? this.voiceAutoSendFinal,
|
||||||
@@ -275,6 +295,7 @@ class AppSettings {
|
|||||||
other.largeText == largeText &&
|
other.largeText == largeText &&
|
||||||
other.darkMode == darkMode &&
|
other.darkMode == darkMode &&
|
||||||
other.defaultModel == defaultModel &&
|
other.defaultModel == defaultModel &&
|
||||||
|
other.omitProviderInModelName == omitProviderInModelName &&
|
||||||
other.voiceLocaleId == voiceLocaleId &&
|
other.voiceLocaleId == voiceLocaleId &&
|
||||||
other.voiceHoldToTalk == voiceHoldToTalk &&
|
other.voiceHoldToTalk == voiceHoldToTalk &&
|
||||||
other.voiceAutoSendFinal == voiceAutoSendFinal;
|
other.voiceAutoSendFinal == voiceAutoSendFinal;
|
||||||
@@ -290,6 +311,7 @@ class AppSettings {
|
|||||||
largeText,
|
largeText,
|
||||||
darkMode,
|
darkMode,
|
||||||
defaultModel,
|
defaultModel,
|
||||||
|
omitProviderInModelName,
|
||||||
voiceLocaleId,
|
voiceLocaleId,
|
||||||
voiceHoldToTalk,
|
voiceHoldToTalk,
|
||||||
voiceAutoSendFinal,
|
voiceAutoSendFinal,
|
||||||
@@ -348,6 +370,11 @@ class AppSettingsNotifier extends StateNotifier<AppSettings> {
|
|||||||
await SettingsService.setDefaultModel(modelId);
|
await SettingsService.setDefaultModel(modelId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> setOmitProviderInModelName(bool value) async {
|
||||||
|
state = state.copyWith(omitProviderInModelName: value);
|
||||||
|
await SettingsService.setOmitProviderInModelName(value);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> setVoiceLocaleId(String? localeId) async {
|
Future<void> setVoiceLocaleId(String? localeId) async {
|
||||||
state = state.copyWith(voiceLocaleId: localeId);
|
state = state.copyWith(voiceLocaleId: localeId);
|
||||||
await SettingsService.setVoiceLocaleId(localeId);
|
await SettingsService.setVoiceLocaleId(localeId);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import '../../onboarding/views/onboarding_sheet.dart';
|
|||||||
import '../../../shared/widgets/sheet_handle.dart';
|
import '../../../shared/widgets/sheet_handle.dart';
|
||||||
import '../../../shared/widgets/measure_size.dart';
|
import '../../../shared/widgets/measure_size.dart';
|
||||||
import '../../../shared/widgets/conduit_components.dart';
|
import '../../../shared/widgets/conduit_components.dart';
|
||||||
|
import '../../../shared/widgets/middle_ellipsis_text.dart';
|
||||||
import '../../../core/services/settings_service.dart';
|
import '../../../core/services/settings_service.dart';
|
||||||
// Removed unused PlatformUtils import
|
// Removed unused PlatformUtils import
|
||||||
import '../../../core/services/platform_service.dart' as ps;
|
import '../../../core/services/platform_service.dart' as ps;
|
||||||
@@ -56,16 +57,21 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
|||||||
bool _isDeactivated = false;
|
bool _isDeactivated = false;
|
||||||
double _inputHeight = 0; // dynamic input height to position scroll button
|
double _inputHeight = 0; // dynamic input height to position scroll button
|
||||||
|
|
||||||
String _formatModelDisplayName(String name) {
|
String _formatModelDisplayName(
|
||||||
|
String name, {
|
||||||
|
required bool omitProvider,
|
||||||
|
}) {
|
||||||
var display = name.trim();
|
var display = name.trim();
|
||||||
// Prefer the segment after the last '/'
|
if (omitProvider) {
|
||||||
if (display.contains('/')) {
|
// Prefer the segment after the last '/'
|
||||||
display = display.split('/').last.trim();
|
if (display.contains('/')) {
|
||||||
}
|
display = display.split('/').last.trim();
|
||||||
// If an org prefix like 'OpenAI: gpt-4o' exists, use the part after ':'
|
}
|
||||||
if (display.contains(':')) {
|
// If an org prefix like 'OpenAI: gpt-4o' exists, use the part after ':'
|
||||||
final parts = display.split(':');
|
if (display.contains(':')) {
|
||||||
display = parts.last.trim();
|
final parts = display.split(':');
|
||||||
|
display = parts.last.trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return display;
|
return display;
|
||||||
}
|
}
|
||||||
@@ -698,6 +704,8 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
|||||||
String? displayModelName;
|
String? displayModelName;
|
||||||
final rawModel = message.model;
|
final rawModel = message.model;
|
||||||
if (rawModel != null && rawModel.isNotEmpty) {
|
if (rawModel != null && rawModel.isNotEmpty) {
|
||||||
|
final omitProvider =
|
||||||
|
ref.watch(appSettingsProvider).omitProviderInModelName;
|
||||||
final modelsAsync = ref.watch(modelsProvider);
|
final modelsAsync = ref.watch(modelsProvider);
|
||||||
if (modelsAsync.hasValue) {
|
if (modelsAsync.hasValue) {
|
||||||
final models = modelsAsync.value!;
|
final models = modelsAsync.value!;
|
||||||
@@ -706,14 +714,23 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
|||||||
final match = models.firstWhere(
|
final match = models.firstWhere(
|
||||||
(m) => m.id == rawModel || m.name == rawModel,
|
(m) => m.id == rawModel || m.name == rawModel,
|
||||||
);
|
);
|
||||||
displayModelName = match.name;
|
displayModelName = _formatModelDisplayName(
|
||||||
|
match.name,
|
||||||
|
omitProvider: omitProvider,
|
||||||
|
);
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// As a fallback, format the raw value to be more readable
|
// As a fallback, format the raw value to be more readable
|
||||||
displayModelName = _formatModelDisplayName(rawModel);
|
displayModelName = _formatModelDisplayName(
|
||||||
|
rawModel,
|
||||||
|
omitProvider: omitProvider,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Models not loaded yet; format raw value for readability
|
// Models not loaded yet; format raw value for readability
|
||||||
displayModelName = _formatModelDisplayName(rawModel);
|
displayModelName = _formatModelDisplayName(
|
||||||
|
rawModel,
|
||||||
|
omitProvider: omitProvider,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1133,17 +1150,27 @@ class _ChatPageState extends ConsumerState<ChatPage> {
|
|||||||
),
|
),
|
||||||
const SizedBox(width: Spacing.xs),
|
const SizedBox(width: Spacing.xs),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: Text(
|
child: Builder(
|
||||||
_formatModelDisplayName(selectedModel.name),
|
builder: (context) {
|
||||||
style: AppTypography.headlineSmallStyle
|
final omitProvider = ref
|
||||||
.copyWith(
|
.watch(appSettingsProvider)
|
||||||
|
.omitProviderInModelName;
|
||||||
|
final label = _formatModelDisplayName(
|
||||||
|
selectedModel.name,
|
||||||
|
omitProvider: omitProvider,
|
||||||
|
);
|
||||||
|
return MiddleEllipsisText(
|
||||||
|
label,
|
||||||
|
style: AppTypography.headlineSmallStyle
|
||||||
|
.copyWith(
|
||||||
color:
|
color:
|
||||||
context.conduitTheme.textPrimary,
|
context.conduitTheme.textPrimary,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
),
|
),
|
||||||
maxLines: 1,
|
textAlign: TextAlign.center,
|
||||||
overflow: TextOverflow.ellipsis,
|
semanticsLabel: label,
|
||||||
textAlign: TextAlign.center,
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(width: Spacing.xs),
|
const SizedBox(width: Spacing.xs),
|
||||||
|
|||||||
110
lib/features/profile/views/app_customization_page.dart
Normal file
110
lib/features/profile/views/app_customization_page.dart
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import 'dart:io' show Platform;
|
||||||
|
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
|
||||||
|
import '../../../core/services/settings_service.dart';
|
||||||
|
import '../../../shared/theme/theme_extensions.dart';
|
||||||
|
import '../../../shared/widgets/conduit_components.dart';
|
||||||
|
import '../../../shared/utils/ui_utils.dart';
|
||||||
|
|
||||||
|
class AppCustomizationPage extends ConsumerWidget {
|
||||||
|
const AppCustomizationPage({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
final settings = ref.watch(appSettingsProvider);
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
backgroundColor: context.conduitTheme.surfaceBackground,
|
||||||
|
appBar: AppBar(
|
||||||
|
backgroundColor: context.conduitTheme.surfaceBackground,
|
||||||
|
elevation: Elevation.none,
|
||||||
|
leading: IconButton(
|
||||||
|
icon: Icon(
|
||||||
|
UiUtils.platformIcon(
|
||||||
|
ios: CupertinoIcons.back,
|
||||||
|
android: Icons.arrow_back,
|
||||||
|
),
|
||||||
|
color: context.conduitTheme.textPrimary,
|
||||||
|
),
|
||||||
|
onPressed: () => Navigator.of(context).maybePop(),
|
||||||
|
tooltip: 'Back',
|
||||||
|
),
|
||||||
|
title: Text(
|
||||||
|
'App Customization',
|
||||||
|
style: AppTypography.headlineSmallStyle.copyWith(
|
||||||
|
color: context.conduitTheme.textPrimary,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
centerTitle: true,
|
||||||
|
),
|
||||||
|
body: Padding(
|
||||||
|
padding: const EdgeInsets.all(Spacing.pagePadding),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Display',
|
||||||
|
style: context.conduitTheme.headingSmall?.copyWith(
|
||||||
|
color: context.conduitTheme.textPrimary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: Spacing.md),
|
||||||
|
ConduitCard(
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
SwitchListTile.adaptive(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: Spacing.listItemPadding,
|
||||||
|
vertical: Spacing.sm,
|
||||||
|
),
|
||||||
|
// Use platform defaults for switch colors to match theme
|
||||||
|
value: settings.omitProviderInModelName,
|
||||||
|
title: Text(
|
||||||
|
'Hide provider in model names',
|
||||||
|
style: context.conduitTheme.bodyLarge?.copyWith(
|
||||||
|
color: context.conduitTheme.textPrimary,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
subtitle: Text(
|
||||||
|
'Show names like "gpt-4o" instead of "openai/gpt-4o".',
|
||||||
|
style: context.conduitTheme.bodySmall?.copyWith(
|
||||||
|
color: context.conduitTheme.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onChanged: (v) {
|
||||||
|
ref
|
||||||
|
.read(appSettingsProvider.notifier)
|
||||||
|
.setOmitProviderInModelName(v);
|
||||||
|
},
|
||||||
|
secondary: Container(
|
||||||
|
padding: const EdgeInsets.all(Spacing.sm),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: context.conduitTheme.buttonPrimary
|
||||||
|
.withValues(alpha: Alpha.highlight),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius.circular(AppBorderRadius.small),
|
||||||
|
),
|
||||||
|
child: Icon(
|
||||||
|
Platform.isIOS
|
||||||
|
? CupertinoIcons.textformat
|
||||||
|
: Icons.text_fields,
|
||||||
|
color: context.conduitTheme.buttonPrimary,
|
||||||
|
size: IconSize.medium,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ import '../../../core/models/model.dart';
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import '../../chat/views/chat_page_helpers.dart';
|
import '../../chat/views/chat_page_helpers.dart';
|
||||||
|
import 'app_customization_page.dart';
|
||||||
|
|
||||||
/// Profile page (You tab) showing user info and main actions
|
/// Profile page (You tab) showing user info and main actions
|
||||||
/// Enhanced with production-grade design tokens for better cohesion
|
/// Enhanced with production-grade design tokens for better cohesion
|
||||||
@@ -232,6 +233,22 @@ class ProfilePage extends ConsumerWidget {
|
|||||||
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
||||||
_buildLanguageTile(context, ref),
|
_buildLanguageTile(context, ref),
|
||||||
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
||||||
|
_buildAccountOption(
|
||||||
|
icon: UiUtils.platformIcon(
|
||||||
|
ios: CupertinoIcons.slider_horizontal_3,
|
||||||
|
android: Icons.tune,
|
||||||
|
),
|
||||||
|
title: 'App Customization',
|
||||||
|
subtitle: 'Personalize how names and UI display',
|
||||||
|
onTap: () {
|
||||||
|
Navigator.of(context).push(
|
||||||
|
MaterialPageRoute(
|
||||||
|
builder: (_) => const AppCustomizationPage(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
||||||
_buildAboutTile(context),
|
_buildAboutTile(context),
|
||||||
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
Divider(color: context.conduitTheme.dividerColor, height: 1),
|
||||||
_buildAccountOption(
|
_buildAccountOption(
|
||||||
|
|||||||
@@ -231,8 +231,8 @@
|
|||||||
"pinned": "Pinned",
|
"pinned": "Pinned",
|
||||||
"folders": "Folders",
|
"folders": "Folders",
|
||||||
"archived": "Archived",
|
"archived": "Archived",
|
||||||
"appLanguage": "App language",
|
"appLanguage": "App Language",
|
||||||
"darkMode": "Dark mode",
|
"darkMode": "Dark Mode",
|
||||||
"webSearch": "Web Search",
|
"webSearch": "Web Search",
|
||||||
"webSearchDescription": "Search the web and cite sources in replies.",
|
"webSearchDescription": "Search the web and cite sources in replies.",
|
||||||
"imageGeneration": "Image Generation",
|
"imageGeneration": "Image Generation",
|
||||||
|
|||||||
@@ -596,10 +596,10 @@ class AppLocalizationsEn extends AppLocalizations {
|
|||||||
String get archived => 'Archived';
|
String get archived => 'Archived';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get appLanguage => 'App language';
|
String get appLanguage => 'App Language';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get darkMode => 'Dark mode';
|
String get darkMode => 'Dark Mode';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get webSearch => 'Web Search';
|
String get webSearch => 'Web Search';
|
||||||
|
|||||||
119
lib/shared/widgets/middle_ellipsis_text.dart
Normal file
119
lib/shared/widgets/middle_ellipsis_text.dart
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
|
||||||
|
/// A single-line text widget that truncates the middle of long strings
|
||||||
|
/// with an ellipsis (e.g., "prefix…suffix") so both ends remain visible.
|
||||||
|
class MiddleEllipsisText extends StatelessWidget {
|
||||||
|
final String text;
|
||||||
|
final TextStyle? style;
|
||||||
|
final TextAlign? textAlign;
|
||||||
|
final String ellipsis;
|
||||||
|
final String? semanticsLabel;
|
||||||
|
|
||||||
|
const MiddleEllipsisText(
|
||||||
|
this.text, {
|
||||||
|
super.key,
|
||||||
|
this.style,
|
||||||
|
this.textAlign,
|
||||||
|
this.ellipsis = '…',
|
||||||
|
this.semanticsLabel,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return LayoutBuilder(
|
||||||
|
builder: (context, constraints) {
|
||||||
|
final TextStyle effectiveStyle =
|
||||||
|
DefaultTextStyle.of(context).style.merge(style);
|
||||||
|
final TextDirection direction = Directionality.of(context);
|
||||||
|
final double maxWidth = constraints.maxWidth;
|
||||||
|
|
||||||
|
// Measure full text width first.
|
||||||
|
final fullSpan = TextSpan(text: text, style: effectiveStyle);
|
||||||
|
final fullPainter = TextPainter(
|
||||||
|
text: fullSpan,
|
||||||
|
textDirection: direction,
|
||||||
|
maxLines: 1,
|
||||||
|
)..layout(minWidth: 0, maxWidth: double.infinity);
|
||||||
|
|
||||||
|
if (fullPainter.width <= maxWidth) {
|
||||||
|
return Text(
|
||||||
|
text,
|
||||||
|
style: effectiveStyle,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.clip,
|
||||||
|
textAlign: textAlign,
|
||||||
|
semanticsLabel: semanticsLabel,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pre-measure ellipsis width (used implicitly during search).
|
||||||
|
final ellipsisSpan = TextSpan(text: ellipsis, style: effectiveStyle);
|
||||||
|
final ellipsisPainter = TextPainter(
|
||||||
|
text: ellipsisSpan,
|
||||||
|
textDirection: direction,
|
||||||
|
maxLines: 1,
|
||||||
|
)..layout(minWidth: 0, maxWidth: double.infinity);
|
||||||
|
final double _ = ellipsisPainter.width; // hint width; not used directly
|
||||||
|
|
||||||
|
// Binary search the maximum number of visible characters (k), split
|
||||||
|
// between start and end. For a given k, we use ceil(k/2) from start
|
||||||
|
// and floor(k/2) from end.
|
||||||
|
int low = 0;
|
||||||
|
int high = text.length; // exclusive upper bound in practice
|
||||||
|
int bestK = 0;
|
||||||
|
String bestStart = '';
|
||||||
|
String bestEnd = '';
|
||||||
|
|
||||||
|
while (low <= high) {
|
||||||
|
final int k = (low + high) >> 1; // candidate visible char count
|
||||||
|
final int leftCount = (k + 1) >> 1; // ceil(k/2)
|
||||||
|
final int rightCount = k - leftCount; // floor(k/2)
|
||||||
|
|
||||||
|
final String start = text.substring(0, leftCount);
|
||||||
|
final String end = rightCount == 0
|
||||||
|
? ''
|
||||||
|
: text.substring(text.length - rightCount);
|
||||||
|
|
||||||
|
final trialSpan =
|
||||||
|
TextSpan(text: '$start$ellipsis$end', style: effectiveStyle);
|
||||||
|
final trialPainter = TextPainter(
|
||||||
|
text: trialSpan,
|
||||||
|
textDirection: direction,
|
||||||
|
maxLines: 1,
|
||||||
|
)..layout(minWidth: 0, maxWidth: double.infinity);
|
||||||
|
|
||||||
|
if (trialPainter.width <= maxWidth) {
|
||||||
|
bestK = k;
|
||||||
|
bestStart = start;
|
||||||
|
bestEnd = end;
|
||||||
|
low = k + 1; // try to fit more
|
||||||
|
} else {
|
||||||
|
high = k - 1; // need fewer characters
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bestK == 0) {
|
||||||
|
return Text(
|
||||||
|
ellipsis,
|
||||||
|
style: effectiveStyle,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.clip,
|
||||||
|
textAlign: textAlign,
|
||||||
|
semanticsLabel: semanticsLabel ?? text,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final String display = '$bestStart$ellipsis$bestEnd';
|
||||||
|
return Text(
|
||||||
|
display,
|
||||||
|
style: effectiveStyle,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.clip,
|
||||||
|
textAlign: textAlign,
|
||||||
|
semanticsLabel: semanticsLabel ?? text,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user