From 57bbb6cc41bedd9d5ae8ba7c6b62a7ab71d8d54b Mon Sep 17 00:00:00 2001 From: Annie Date: Fri, 9 Aug 2024 21:08:13 +0800 Subject: [PATCH] chore: replace property icons in database (#5910) --- .../lib/util/field_type_extension.dart | 4 +-- .../flowy_infra_ui/lib/style_widget/text.dart | 7 ++--- .../resources/flowy_icons/16x/ai_summary.svg | 26 ++++++++++++++++++- .../flowy_icons/16x/ai_translate.svg | 10 ++++++- .../resources/flowy_icons/16x/checkbox.svg | 14 ++++++++-- .../resources/flowy_icons/16x/checklist.svg | 8 ++++-- .../resources/flowy_icons/16x/created_at.svg | 7 ----- .../flowy_icons/16x/created_time.svg | 5 ++++ frontend/resources/flowy_icons/16x/date.svg | 18 ++++++++++--- .../flowy_icons/16x/last_edited_time.svg | 4 +++ .../flowy_icons/16x/last_modified.svg | 3 --- .../resources/flowy_icons/16x/multiselect.svg | 13 +++++----- frontend/resources/flowy_icons/16x/number.svg | 5 +++- .../resources/flowy_icons/16x/relation.svg | 16 +++++++----- .../flowy_icons/16x/single_select.svg | 6 +++-- frontend/resources/flowy_icons/16x/text.svg | 9 +++++-- frontend/resources/flowy_icons/16x/url.svg | 5 +++- 17 files changed, 117 insertions(+), 43 deletions(-) delete mode 100644 frontend/resources/flowy_icons/16x/created_at.svg create mode 100644 frontend/resources/flowy_icons/16x/created_time.svg create mode 100644 frontend/resources/flowy_icons/16x/last_edited_time.svg delete mode 100644 frontend/resources/flowy_icons/16x/last_modified.svg diff --git a/frontend/appflowy_flutter/lib/util/field_type_extension.dart b/frontend/appflowy_flutter/lib/util/field_type_extension.dart index f36c2fe264..4ca63aa4ae 100644 --- a/frontend/appflowy_flutter/lib/util/field_type_extension.dart +++ b/frontend/appflowy_flutter/lib/util/field_type_extension.dart @@ -36,8 +36,8 @@ extension FieldTypeExtension on FieldType { FieldType.Checkbox => FlowySvgs.checkbox_s, FieldType.URL => FlowySvgs.url_s, FieldType.Checklist => FlowySvgs.checklist_s, - FieldType.LastEditedTime => FlowySvgs.last_modified_s, - FieldType.CreatedTime => FlowySvgs.created_at_s, + FieldType.LastEditedTime => FlowySvgs.last_edited_time_s, + FieldType.CreatedTime => FlowySvgs.created_time_s, FieldType.Relation => FlowySvgs.relation_s, FieldType.Summary => FlowySvgs.ai_summary_s, FieldType.Time => FlowySvgs.timer_start_s, diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart index 3f8de359f3..61a65e0c4b 100644 --- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart +++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart @@ -41,7 +41,8 @@ class FlowyText extends StatelessWidget { this.selectable = false, this.fontFamily, this.fallbackFontFamily, - this.lineHeight, + // https://api.flutter.dev/flutter/painting/TextStyle/height.html + this.lineHeight = 1, this.figmaLineHeight, this.withTooltip = false, this.isEmoji = false, @@ -101,7 +102,7 @@ class FlowyText extends StatelessWidget { this.selectable = false, this.fontFamily, this.fallbackFontFamily, - this.lineHeight, + this.lineHeight = 1, this.withTooltip = false, this.isEmoji = false, this.strutStyle, @@ -121,7 +122,7 @@ class FlowyText extends StatelessWidget { this.selectable = false, this.fontFamily, this.fallbackFontFamily, - this.lineHeight, + this.lineHeight = 1, this.withTooltip = false, this.isEmoji = false, this.strutStyle, diff --git a/frontend/resources/flowy_icons/16x/ai_summary.svg b/frontend/resources/flowy_icons/16x/ai_summary.svg index 2455874bc5..4d44e4892c 100644 --- a/frontend/resources/flowy_icons/16x/ai_summary.svg +++ b/frontend/resources/flowy_icons/16x/ai_summary.svg @@ -1,3 +1,27 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/ai_translate.svg b/frontend/resources/flowy_icons/16x/ai_translate.svg index 7e9706c4af..37ea7f29ba 100644 --- a/frontend/resources/flowy_icons/16x/ai_translate.svg +++ b/frontend/resources/flowy_icons/16x/ai_translate.svg @@ -1,3 +1,11 @@ - + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/checkbox.svg b/frontend/resources/flowy_icons/16x/checkbox.svg index 37f52c47ed..b613ae5c58 100644 --- a/frontend/resources/flowy_icons/16x/checkbox.svg +++ b/frontend/resources/flowy_icons/16x/checkbox.svg @@ -1,4 +1,14 @@ - - + + + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/checklist.svg b/frontend/resources/flowy_icons/16x/checklist.svg index 3a88d236a1..71d89c098c 100644 --- a/frontend/resources/flowy_icons/16x/checklist.svg +++ b/frontend/resources/flowy_icons/16x/checklist.svg @@ -1,4 +1,8 @@ - - + + + + + + diff --git a/frontend/resources/flowy_icons/16x/created_at.svg b/frontend/resources/flowy_icons/16x/created_at.svg deleted file mode 100644 index df94328071..0000000000 --- a/frontend/resources/flowy_icons/16x/created_at.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/frontend/resources/flowy_icons/16x/created_time.svg b/frontend/resources/flowy_icons/16x/created_time.svg new file mode 100644 index 0000000000..1db4ba8850 --- /dev/null +++ b/frontend/resources/flowy_icons/16x/created_time.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/frontend/resources/flowy_icons/16x/date.svg b/frontend/resources/flowy_icons/16x/date.svg index 78243f1e75..0bb757aa38 100644 --- a/frontend/resources/flowy_icons/16x/date.svg +++ b/frontend/resources/flowy_icons/16x/date.svg @@ -1,6 +1,16 @@ - - - - + + + + + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/last_edited_time.svg b/frontend/resources/flowy_icons/16x/last_edited_time.svg new file mode 100644 index 0000000000..27e74e1c33 --- /dev/null +++ b/frontend/resources/flowy_icons/16x/last_edited_time.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/resources/flowy_icons/16x/last_modified.svg b/frontend/resources/flowy_icons/16x/last_modified.svg deleted file mode 100644 index 5ba3d7494e..0000000000 --- a/frontend/resources/flowy_icons/16x/last_modified.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/resources/flowy_icons/16x/multiselect.svg b/frontend/resources/flowy_icons/16x/multiselect.svg index 97a2e9c434..45ccc0db18 100644 --- a/frontend/resources/flowy_icons/16x/multiselect.svg +++ b/frontend/resources/flowy_icons/16x/multiselect.svg @@ -1,8 +1,9 @@ - - - - - - + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/number.svg b/frontend/resources/flowy_icons/16x/number.svg index 9d8b98d10d..cb42a930ea 100644 --- a/frontend/resources/flowy_icons/16x/number.svg +++ b/frontend/resources/flowy_icons/16x/number.svg @@ -1,3 +1,6 @@ - + + + + diff --git a/frontend/resources/flowy_icons/16x/relation.svg b/frontend/resources/flowy_icons/16x/relation.svg index f82a41d226..37a841d740 100644 --- a/frontend/resources/flowy_icons/16x/relation.svg +++ b/frontend/resources/flowy_icons/16x/relation.svg @@ -1,8 +1,12 @@ - - - - - - + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/single_select.svg b/frontend/resources/flowy_icons/16x/single_select.svg index 8ccbc9a2e3..997244a265 100644 --- a/frontend/resources/flowy_icons/16x/single_select.svg +++ b/frontend/resources/flowy_icons/16x/single_select.svg @@ -1,4 +1,6 @@ - - + + + + diff --git a/frontend/resources/flowy_icons/16x/text.svg b/frontend/resources/flowy_icons/16x/text.svg index 7befa5080f..2a9b3fac61 100644 --- a/frontend/resources/flowy_icons/16x/text.svg +++ b/frontend/resources/flowy_icons/16x/text.svg @@ -1,4 +1,9 @@ - - + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/url.svg b/frontend/resources/flowy_icons/16x/url.svg index f00f5c7aa2..5624e62db4 100644 --- a/frontend/resources/flowy_icons/16x/url.svg +++ b/frontend/resources/flowy_icons/16x/url.svg @@ -1,3 +1,6 @@ - + + + +