diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/edit_database_view_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/edit_database_view_screen.dart
index 69ab500564..f5812541c8 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/edit_database_view_screen.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/edit_database_view_screen.dart
@@ -133,7 +133,7 @@ enum DatabaseViewSettings {
filter => FlowySvgs.filter_s,
sort => FlowySvgs.sort_ascending_s,
board => FlowySvgs.board_s,
- calendar => FlowySvgs.date_s,
+ calendar => FlowySvgs.calendar_s,
duplicate => FlowySvgs.copy_s,
delete => FlowySvgs.delete_s,
};
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
index 816f553704..9c7dd3bcd5 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
@@ -181,7 +181,7 @@ class LayoutDateField extends StatelessWidget {
onUpdated(fieldInfo.id);
popoverMutex.close();
},
- leftIcon: const FlowySvg(FlowySvgs.grid_s),
+ leftIcon: const FlowySvg(FlowySvgs.date_s),
rightIcon: fieldInfo.id == fieldId
? const FlowySvg(FlowySvgs.check_s)
: null,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/database_layout_ext.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/database_layout_ext.dart
index 4d79b2d075..f8118a7e51 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/database_layout_ext.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/database_layout_ext.dart
@@ -26,7 +26,7 @@ extension DatabaseLayoutExtension on DatabaseLayoutPB {
FlowySvgData get icon {
return switch (this) {
DatabaseLayoutPB.Board => FlowySvgs.board_s,
- DatabaseLayoutPB.Calendar => FlowySvgs.date_s,
+ DatabaseLayoutPB.Calendar => FlowySvgs.calendar_s,
DatabaseLayoutPB.Grid => FlowySvgs.grid_s,
_ => throw UnimplementedError(),
};
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
index 252b702cd6..6b9fc5f90d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
@@ -23,7 +23,7 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {
FlowySvgData iconData() {
switch (this) {
case DatabaseSettingAction.showProperties:
- return FlowySvgs.properties_s;
+ return FlowySvgs.multiselect_s;
case DatabaseSettingAction.showLayout:
return FlowySvgs.database_layout_m;
case DatabaseSettingAction.showGroup:
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
index feca33b2a7..99bb96c2fe 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
@@ -64,6 +64,9 @@ class _ShareButton extends StatelessWidget {
Radius.circular(10.0),
),
textColor: Theme.of(context).colorScheme.onPrimary,
+ onPressed: () {
+ // Do nothing, but it needs to provide an empty action in order to show cursorß
+ },
);
}
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
index f5b8ce505a..e5a9ce404f 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
+import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flowy_infra_ui/widget/ignore_parent_gesture.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
@@ -292,6 +293,7 @@ class FlowyTextButton extends StatelessWidget {
this.padding = const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
this.hoverColor,
this.fillColor,
+ this.textColor,
this.heading,
this.radius,
this.mainAxisAlignment = MainAxisAlignment.start,
@@ -346,6 +348,7 @@ class FlowyTextButton extends StatelessWidget {
final Widget? heading;
final Color? hoverColor;
final Color? fillColor;
+ final Color? textColor;
final BorderRadius? radius;
final MainAxisAlignment mainAxisAlignment;
final String? tooltip;
@@ -364,9 +367,10 @@ class FlowyTextButton extends StatelessWidget {
children.add(heading!);
children.add(const HSpace(8));
}
- children.add(Text(
+ children.add(FlowyText(
text,
overflow: overflow,
+ color: textColor,
textAlign: TextAlign.center,
));
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dart
index 0fa181a1dd..a49b70c4d0 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/rounded_button.dart
@@ -51,9 +51,11 @@ class RoundedTextButton extends StatelessWidget {
radius: borderRadius ?? Corners.s6Border,
fontColor: textColor ?? Theme.of(context).colorScheme.onPrimary,
fillColor: fillColor ?? Theme.of(context).colorScheme.primary,
+ textColor: textColor,
hoverColor:
hoverColor ?? Theme.of(context).colorScheme.primaryContainer,
padding: padding,
+
),
),
);
diff --git a/frontend/resources/flowy_icons/16x/group.svg b/frontend/resources/flowy_icons/16x/group.svg
index f0a6dff4f9..eaa2b9c862 100644
--- a/frontend/resources/flowy_icons/16x/group.svg
+++ b/frontend/resources/flowy_icons/16x/group.svg
@@ -1,7 +1,15 @@
diff --git a/frontend/resources/flowy_icons/24x/calendar_layout.svg b/frontend/resources/flowy_icons/24x/calendar_layout.svg
index 52e06e9111..eee5fca964 100644
--- a/frontend/resources/flowy_icons/24x/calendar_layout.svg
+++ b/frontend/resources/flowy_icons/24x/calendar_layout.svg
@@ -1,4 +1,19 @@
-
\ No newline at end of file
+
diff --git a/frontend/resources/flowy_icons/24x/database_layout.svg b/frontend/resources/flowy_icons/24x/database_layout.svg
index 240a5065d8..7b1fb9a846 100644
--- a/frontend/resources/flowy_icons/24x/database_layout.svg
+++ b/frontend/resources/flowy_icons/24x/database_layout.svg
@@ -1,12 +1,11 @@
-
-
\ No newline at end of file
+
+