From 340f27cf87ef1bb9b27ee9db0194fde69505b2f5 Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Wed, 4 Jan 2023 19:41:31 +0800 Subject: [PATCH] fix: the settings view of path configuration is not displayed completely (#1647) --- .../settings/settings_location_cubit.dart | 18 +++++++++++++++--- .../settings_file_customize_location_view.dart | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dart b/frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dart index f46850cd01..08a21f22e0 100644 --- a/frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dart +++ b/frontend/app_flowy/lib/workspace/application/settings/settings_location_cubit.dart @@ -12,10 +12,22 @@ const String kSettingsLocationDefaultLocation = class SettingsLocation { SettingsLocation({ - this.path, - }); + String? path, + }) : _path = path; - String? path; + String? _path; + + set path(String? path) { + _path = path; + } + + String? get path { + if (Platform.isMacOS) { + // remove the prefix `/Volumes/Macintosh HD/Users/` + return _path?.replaceFirst('/Volumes/Macintosh HD/Users', ''); + } + return _path; + } SettingsLocation copyWith({String? path}) { return SettingsLocation( diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart index 99323f0f43..5df13b9ac5 100644 --- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart +++ b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_file_customize_location_view.dart @@ -40,6 +40,7 @@ class SettingsFileLocationCustomzierState title: FlowyText.regular( LocaleKeys.settings_files_defaultLocation.tr(), fontSize: 15.0, + overflow: TextOverflow.ellipsis, ), subtitle: Tooltip( message: LocaleKeys.settings_files_doubleTapToCopy.tr(), @@ -52,6 +53,7 @@ class SettingsFileLocationCustomzierState child: FlowyText.regular( state.path ?? '', fontSize: 10.0, + overflow: TextOverflow.ellipsis, ), ), ),