Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: 0.3.9 launch review (#4076)

Lucas.Xu1491fbfb0d90
diff --git a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 545f2d1d33..b00c03fd17 100644
Binary files a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 0cd1474456..e76d95c5be 100644
Binary files a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 48d76394b2..c5188d2de4 100644
Binary files a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 1ae7096376..3cc1a254c9 100644
Binary files a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c0f7d5cf56..c8f21cf1b3 100644
Binary files a/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/frontend/appflowy_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/frontend/appflowy_flutter/integration_test/open_ai_smart_menu_test.dart b/frontend/appflowy_flutter/integration_test/open_ai_smart_menu_test.dart
index 98c0378f59..c8352d660f 100644
--- a/frontend/appflowy_flutter/integration_test/open_ai_smart_menu_test.dart
+++ b/frontend/appflowy_flutter/integration_test/open_ai_smart_menu_test.dart
@@ -1,13 +1,14 @@
import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/service/openai_client.dart';
+import 'package:appflowy/startup/startup.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:appflowy_editor/src/render/toolbar/toolbar_widget.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
+
import 'util/mock/mock_openai_repository.dart';
import 'util/util.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
-import 'package:appflowy_editor/src/render/toolbar/toolbar_widget.dart';
-import 'package:appflowy/startup/startup.dart';
void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
index b971827728..c0d64e75c7 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
index 56cc7f977a..66079a6096 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
index b0ec002caf..9160b7369e 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
index be69acbdce..b3d9a02ac0 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
index d3db885ad5..a5977e7d0b 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
index b2917d6076..3a3dde7bdb 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
index eee40a5a91..cc6efb047a 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
index e457e11052..8778ee1d57 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
index 67da0edd83..76632e80db 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
index bdd8288f7c..4f01c3b723 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
index 123578d00f..eff5059f4c 100644
Binary files a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png and b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index 73d3b7f6d1..af727e0ca3 100644
--- a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1 +1,80 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
\ No newline at end of file
+{
+ "images" : [
+ {
+ "filename" : "40.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "60.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
+ },
+ {
+ "filename" : "29.png",
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "58.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "87.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "29x29"
+ },
+ {
+ "filename" : "80.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "120.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "40x40"
+ },
+ {
+ "filename" : "57.png",
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "size" : "57x57"
+ },
+ {
+ "filename" : "114.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "57x57"
+ },
+ {
+ "filename" : "120.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "180.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/Contents.json b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/Contents.json
new file mode 100644
index 0000000000..73c00596a7
--- /dev/null
+++ b/frontend/appflowy_flutter/ios/Runner/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
index ec945eea8b..31295eedff 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
@@ -150,7 +150,6 @@ class _MobileViewPageState extends State<MobileViewPage> {
onTap: (context) {
showMobileBottomSheet(
context,
- showDragHandle: true,
builder: (_) => _buildViewPageBottomSheet(context),
);
},
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_rename_widget.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_rename_widget.dart
index 3ecd0dfe11..1d40bd6e5d 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_rename_widget.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_rename_widget.dart
@@ -50,6 +50,8 @@ class _MobileBottomSheetRenameWidgetState
height: 42.0,
child: FlowyTextField(
controller: controller,
+ textInputAction: TextInputAction.done,
+ onSubmitted: (text) => widget.onRename(text),
),
),
),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/default_mobile_action_pane.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/default_mobile_action_pane.dart
index f41119075b..e29618eb84 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/default_mobile_action_pane.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/default_mobile_action_pane.dart
@@ -52,7 +52,6 @@ enum MobilePaneActionType {
final favoriteBloc = context.read<FavoriteBloc>();
showMobileBottomSheet(
context,
- showDragHandle: true,
builder: (context) {
return MultiBlocProvider(
providers: [
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart
index 4ebc1bd477..eedfcf1322 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_content/mobile_card_content.dart
@@ -6,7 +6,7 @@ import 'package:appflowy/plugins/database_view/widgets/card/card_cell_builder.da
import 'package:appflowy/plugins/database_view/widgets/card/cells/card_cell.dart';
import 'package:appflowy/plugins/database_view/widgets/row/cells/text_cell/text_cell_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra_ui/widget/spacing.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -79,13 +79,9 @@ class MobileCardContent<CustomCardData> extends StatelessWidget {
final text = cardDataIsEmpty
? LocaleKeys.grid_row_titlePlaceholder.tr()
: cellData;
-
- final textStyle = Theme.of(context).textTheme.bodyMedium?.copyWith(
- color: cardDataIsEmpty
- ? Theme.of(context).hintColor
- : Theme.of(context).colorScheme.onBackground,
- fontSize: 20,
- );
+ final color = cardDataIsEmpty
+ ? Theme.of(context).hintColor
+ : Theme.of(context).colorScheme.onBackground;
return Row(
children: [
@@ -94,9 +90,9 @@ class MobileCardContent<CustomCardData> extends StatelessWidget {
const HSpace(4),
],
Expanded(
- child: Text(
+ child: FlowyText.regular(
text,
- style: textStyle,
+ color: color,
overflow: TextOverflow.ellipsis,
),
),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart
index 075c473266..b02fa24ab4 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart
@@ -16,7 +16,7 @@ const _supportedFieldTypes = [
FieldType.MultiSelect,
FieldType.DateTime,
FieldType.Checkbox,
- FieldType.Checklist,
+ // FieldType.Checklist,
];
class FieldOptions extends StatelessWidget {
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart
index 23305f0dd8..af4798e460 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options_eidtor.dart
@@ -531,7 +531,7 @@ class _TimeOptionState extends State<_TimeOption> {
return FlowyOptionTile.checkbox(
text: format.title(),
isSelected: selectedFormat == format,
- showTopBorder: false,
+ showTopBorder: index == 0,
onTap: () {
widget.onSelected(format);
setState(() {
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart
index 782ff0cd32..813d751362 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/widgets/widgets.dart';
import 'package:appflowy/plugins/base/drag_handler.dart';
import 'package:appflowy/plugins/database_view/application/cell/cell_controller_builder.dart';
@@ -12,6 +13,7 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:dartz/dartz.dart' hide State;
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
@@ -73,15 +75,17 @@ class _MobileDateCellEditScreenState extends State<MobileDateCellEditScreen> {
initialChildSize: 0.6,
minChildSize: 0.6,
builder: (_, controller) => Material(
- child: SingleChildScrollView(
- controller: controller,
- child: Column(
- children: [
- const DragHandler(),
- _buildHeader(),
- const Divider(),
- _buildBody(),
- ],
+ child: ColoredBox(
+ color: Theme.of(context).colorScheme.surface,
+ child: SingleChildScrollView(
+ controller: controller,
+ child: Column(
+ children: [
+ const DragHandler(),
+ _buildHeader(),
+ _buildBody(),
+ ],
+ ),
),
),
),
@@ -171,16 +175,16 @@ class _DateCellEditBody extends StatelessWidget {
children: [
FlowyOptionDecorateBox(
showTopBorder: false,
+ child: _IncludeTimePicker(),
+ ),
+ _ColoredDivider(),
+ FlowyOptionDecorateBox(
child: MobileDatePicker(),
),
_ColoredDivider(),
_EndDateSwitch(),
_IncludeTimeSwitch(),
- _StartDayTime(),
- _EndDayTime(),
_ColoredDivider(),
- _DateFormatOption(),
- _TimeFormatOption(),
_ClearDateButton(),
_ColoredDivider(),
],
@@ -201,6 +205,157 @@ class _ColoredDivider extends StatelessWidget {
}
}
+class _IncludeTimePicker extends StatefulWidget {
+ const _IncludeTimePicker();
+
+ @override
+ State<_IncludeTimePicker> createState() => _IncludeTimePickerState();
+}
+
+class _IncludeTimePickerState extends State<_IncludeTimePicker> {
+ String? _selectedTime;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<DateCellCalendarBloc, DateCellCalendarState>(
+ builder: (context, state) {
+ final startDay = state.dateStr;
+ final endDay = state.endDateStr;
+ final includeTime = state.includeTime;
+ final use24hFormat =
+ state.dateTypeOptionPB.timeFormat == TimeFormatPB.TwentyFourHour;
+ if (startDay == null || startDay.isEmpty) {
+ return const Divider(
+ height: 1,
+ );
+ }
+ return Container(
+ margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ _buildTime(
+ context,
+ includeTime,
+ use24hFormat,
+ true,
+ startDay,
+ state.timeStr,
+ ),
+ VSpace(
+ 8.0,
+ color: Theme.of(context).colorScheme.surface,
+ ),
+ _buildTime(
+ context,
+ includeTime,
+ use24hFormat,
+ false,
+ endDay,
+ state.endTimeStr,
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ Widget _buildTime(
+ BuildContext context,
+ bool isIncludeTime,
+ bool use24hFormat,
+ bool isStartDay,
+ String? dateStr,
+ String? timeStr,
+ ) {
+ if (dateStr == null) {
+ return const SizedBox.shrink();
+ }
+
+ final List<Widget> children = [];
+
+ if (!isIncludeTime) {
+ children.addAll([
+ const HSpace(12.0),
+ FlowyText(
+ dateStr,
+ ),
+ ]);
+ } else {
+ children.addAll([
+ Expanded(
+ child: FlowyText(
+ dateStr,
+ textAlign: TextAlign.center,
+ ),
+ ),
+ Container(
+ width: 1,
+ height: 16,
+ color: Colors.grey,
+ ),
+ Expanded(
+ child: FlowyText(
+ timeStr ?? '',
+ textAlign: TextAlign.center,
+ ),
+ ),
+ ]);
+ }
+
+ return GestureDetector(
+ onTap: () async {
+ final bloc = context.read<DateCellCalendarBloc>();
+ await showMobileBottomSheet(
+ context,
+ builder: (context) {
+ return ConstrainedBox(
+ constraints: const BoxConstraints(
+ maxHeight: 300,
+ ),
+ child: CupertinoDatePicker(
+ showDayOfWeek: false,
+ mode: CupertinoDatePickerMode.time,
+ use24hFormat: use24hFormat,
+ onDateTimeChanged: (dateTime) {
+ _selectedTime = use24hFormat
+ ? DateFormat('HH:mm').format(dateTime)
+ : DateFormat('hh:mm a').format(dateTime);
+ },
+ ),
+ );
+ },
+ );
+
+ if (_selectedTime != null) {
+ bloc.add(
+ isStartDay
+ ? DateCellCalendarEvent.setTime(_selectedTime!)
+ : DateCellCalendarEvent.setEndTime(_selectedTime!),
+ );
+ }
+ },
+ child: Container(
+ constraints: const BoxConstraints(
+ minHeight: 36,
+ ),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(6),
+ color: Theme.of(context).colorScheme.secondaryContainer,
+ border: Border.all(
+ color: Theme.of(context).colorScheme.outline,
+ width: 1,
+ ),
+ ),
+ child: Row(
+ children: children,
+ ),
+ ),
+ );
+ }
+}
+
class _EndDateSwitch extends StatelessWidget {
const _EndDateSwitch();
@@ -211,7 +366,6 @@ class _EndDateSwitch extends StatelessWidget {
builder: (context, isRange) {
return FlowyOptionTile.switcher(
text: LocaleKeys.grid_field_isRange.tr(),
- leftIcon: const FlowySvg(FlowySvgs.date_s),
isSelected: isRange,
onValueChanged: (value) {
context
@@ -235,7 +389,6 @@ class _IncludeTimeSwitch extends StatelessWidget {
return FlowyOptionTile.switcher(
showTopBorder: false,
text: LocaleKeys.grid_field_includeTime.tr(),
- leftIcon: const FlowySvg(FlowySvgs.clock_alarm_s),
isSelected: includeTime,
onValueChanged: (value) {
context
@@ -248,76 +401,6 @@ class _IncludeTimeSwitch extends StatelessWidget {
}
}
-class _StartDayTime extends StatelessWidget {
- const _StartDayTime();
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<DateCellCalendarBloc, DateCellCalendarState>(
- builder: (context, state) {
- return AnimatedSwitcher(
- duration: const Duration(milliseconds: 300),
- child: state.includeTime
- ? Row(
- children: [
- Text(
- state.isRange
- ? LocaleKeys.grid_field_startDateTime.tr()
- : LocaleKeys.grid_field_dateTime.tr(),
- style: Theme.of(context).textTheme.titleMedium,
- ),
- const Spacer(),
- // TODO(yijing): improve width
- SizedBox(
- width: 180,
- child: _TimeTextField(
- timeStr: state.timeStr,
- isEndTime: false,
- ),
- ),
- ],
- )
- : const SizedBox.shrink(),
- );
- },
- );
- }
-}
-
-class _EndDayTime extends StatelessWidget {
- const _EndDayTime();
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<DateCellCalendarBloc, DateCellCalendarState>(
- builder: (context, state) {
- return AnimatedSwitcher(
- duration: const Duration(milliseconds: 300),
- child: state.includeTime && state.endTimeStr != null
- ? Row(
- children: [
- Text(
- LocaleKeys.grid_field_endDateTime.tr(),
- style: Theme.of(context).textTheme.titleMedium,
- ),
- const Spacer(),
- // TODO(yijing): improve width
- SizedBox(
- width: 180,
- child: _TimeTextField(
- timeStr: state.timeStr,
- isEndTime: true,
- ),
- ),
- ],
- )
- : const SizedBox.shrink(),
- );
- },
- );
- }
-}
-
class _TimeTextField extends StatefulWidget {
const _TimeTextField({
required this.timeStr,
@@ -378,7 +461,6 @@ class _ClearDateButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return FlowyOptionTile.text(
- showTopBorder: false,
text: LocaleKeys.grid_field_clearDate.tr(),
onTap: () => context
.read<DateCellCalendarBloc>()
@@ -386,68 +468,3 @@ class _ClearDateButton extends StatelessWidget {
);
}
}
-
-class _TimeFormatOption extends StatelessWidget {
- const _TimeFormatOption();
-
- @override
- Widget build(BuildContext context) {
- return BlocSelector<DateCellCalendarBloc, DateCellCalendarState,
- TimeFormatPB>(
- selector: (state) => state.dateTypeOptionPB.timeFormat,
- builder: (context, state) {
- return FlowyOptionTile.text(
- showTopBorder: false,
- text: LocaleKeys.settings_appearance_timeFormat_label.tr(),
- leftIcon: const FlowySvg(FlowySvgs.time_s),
- );
- // TimeFormatListTile(
- // currentFormatStr: state.title(),
- // groupValue: context
- // .watch<DateCellCalendarBloc>()
- // .state
- // .dateTypeOptionPB
- // .timeFormat,
- // onChanged: (newFormat) {
- // if (newFormat == null) return;
- // context
- // .read<DateCellCalendarBloc>()
- // .add(DateCellCalendarEvent.setTimeFormat(newFormat));
- // },
- // );
- },
- );
- }
-}
-
-class _DateFormatOption extends StatelessWidget {
- const _DateFormatOption();
-
- @override
- Widget build(BuildContext context) {
- return BlocSelector<DateCellCalendarBloc, DateCellCalendarState,
- DateFormatPB>(
- selector: (state) => state.dateTypeOptionPB.dateFormat,
- builder: (context, state) {
- return FlowyOptionTile.text(
- text: LocaleKeys.settings_appearance_dateFormat_label.tr(),
- leftIcon: const FlowySvg(FlowySvgs.clock_alarm_s),
- );
- // DateFormatListTile(
- // currentFormatStr: state.title(),
- // groupValue: context
- // .watch<DateCellCalendarBloc>()
- // .state
- // .dateTypeOptionPB
- // .dateFormat,
- // onChanged: (newFormat) {
- // if (newFormat == null) return;
- // context
- // .read<DateCellCalendarBloc>()
- // .add(DateCellCalendarEvent.setDateFormat(newFormat));
- // },
- // );
- },
- );
- }
-}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
index c72a1ebeac..db4b473cca 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
@@ -143,7 +143,9 @@ class _MobileRecentViewState extends State<MobileRecentView> {
builder: ((context, snapshot) {
final node = snapshot.data;
final placeholder = Container(
- color: Theme.of(context).colorScheme.onSecondaryContainer,
+ // random color, update it once we have a better placeholder
+ color:
+ Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.2),
);
if (node == null) {
return placeholder;
diff --git a/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker.dart b/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker.dart
index 1580517d63..9cccd3ab51 100644
--- a/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker.dart
+++ b/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker.dart
@@ -141,7 +141,7 @@ class _RemoveIconButton extends StatelessWidget {
child: FlowyButton(
onTap: onTap,
useIntrinsicWidth: true,
- text: FlowyText(
+ text: FlowyText.small(
LocaleKeys.document_plugins_cover_removeIcon.tr(),
),
leftIcon: const FlowySvg(FlowySvgs.delete_s),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
index 5d50cf5e6c..1690e59652 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart
@@ -80,6 +80,7 @@ class DateCellCalendarBloc
await _updateDateData(isRange: isRange);
},
setTime: (timeStr) async {
+ emit(state.copyWith(timeStr: timeStr));
await _updateDateData(timeStr: timeStr);
},
selectDateRange: (DateTime? start, DateTime? end) async {
@@ -158,6 +159,7 @@ class DateCellCalendarBloc
}
},
setEndTime: (String endTime) async {
+ emit(state.copyWith(endTimeStr: endTime));
await _updateDateData(endTimeStr: endTime);
},
setDateFormat: (dateFormat) async {
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart
index 56a9a018a8..48e5aaff3f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart
@@ -91,11 +91,14 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
final List<ToolbarItem> toolbarItems = [
smartEditItem..isActive = onlyShowInSingleTextTypeSelectionAndExcludeTable,
paragraphItem..isActive = onlyShowInSingleTextTypeSelectionAndExcludeTable,
- ...(headingItems
+ ...headingItems
..forEach(
(e) => e.isActive = onlyShowInSingleSelectionAndTextType,
- )),
- ...markdownFormatItems,
+ ),
+ ...markdownFormatItems
+ ..forEach(
+ (e) => e.isActive = showInAnyTextType,
+ ),
quoteItem..isActive = onlyShowInSingleTextTypeSelectionAndExcludeTable,
bulletedListItem
..isActive = onlyShowInSingleTextTypeSelectionAndExcludeTable,
@@ -497,3 +500,14 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
await editorState.apply(transaction);
}
}
+
+bool showInAnyTextType(EditorState editorState) {
+ final selection = editorState.selection;
+ if (selection == null) {
+ return false;
+ }
+ final nodes = editorState.getNodesInSelection(selection);
+ return nodes.any(
+ (node) => toolbarItemWhiteList.contains(node.type),
+ );
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/mobile_block_action_buttons.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/mobile_block_action_buttons.dart
index 0bc8d6f6c9..705356481e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/mobile_block_action_buttons.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/mobile_block_action_buttons.dart
@@ -70,7 +70,6 @@ class MobileBlockActionButtons extends StatelessWidget {
showMobileBottomSheet(
context,
showHeader: true,
- showDragHandle: true,
showCloseButton: true,
title: LocaleKeys.document_plugins_action.tr(),
builder: (context) {
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
index b2ac8d189b..7e4cdbb39b 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
@@ -34,16 +34,24 @@ final alignToolbarItem = ToolbarItem(
data = FlowySvgs.toolbar_align_right_s;
}
- final child = MouseRegion(
- cursor: SystemMouseCursors.click,
- child: FlowyTooltip(
- message: LocaleKeys.document_plugins_optionAction_align.tr(),
- child: FlowySvg(
- data,
- size: const Size.square(16),
- color: isHighlight ? highlightColor : Colors.white,
- ),
- ),
+ // final child = MouseRegion(
+ // cursor: SystemMouseCursors.click,
+ // child: FlowyTooltip(
+ // message: LocaleKeys.document_plugins_optionAction_align.tr(),
+ // child: FlowySvg(
+ // data,
+ // size: const Size.square(16),
+ // color: isHighlight ? highlightColor : Colors.white,
+ // ),
+ // ),
+ // );
+
+ // the above code will cause an error in Flutter 3.13:
+ // Cannot hit test a render box that has never been laid out.
+ final child = FlowySvg(
+ data,
+ size: const Size.square(16),
+ color: isHighlight ? highlightColor : Colors.white,
);
return Padding(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart
index 2d8c53b31d..2085baa682 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart
@@ -230,9 +230,11 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
alignment: Alignment.bottomLeft,
width: double.infinity,
padding: PlatformExtension.isDesktopOrWeb
- ? EditorStyleCustomizer.documentPadding
+ ? EdgeInsets.symmetric(
+ horizontal: EditorStyleCustomizer.documentPadding.right,
+ )
: EdgeInsets.symmetric(
- horizontal: EditorStyleCustomizer.documentPadding.left - 6.0,
+ horizontal: EditorStyleCustomizer.documentPadding.left,
),
child: SizedBox(
height: 28,
@@ -276,7 +278,7 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
),
useIntrinsicWidth: true,
leftIcon: const FlowySvg(FlowySvgs.image_s),
- text: FlowyText.regular(
+ text: FlowyText.small(
LocaleKeys.document_plugins_cover_addCover.tr(),
),
),
@@ -293,7 +295,7 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
Icons.emoji_emotions_outlined,
size: 18,
),
- text: FlowyText.regular(
+ text: FlowyText.small(
LocaleKeys.document_plugins_cover_removeIcon.tr(),
),
),
@@ -306,7 +308,7 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
Icons.emoji_emotions_outlined,
size: 18,
),
- text: FlowyText.regular(
+ text: FlowyText.small(
LocaleKeys.document_plugins_cover_addIcon.tr(),
),
onTap: PlatformExtension.isDesktop
@@ -468,7 +470,10 @@ class DocumentCoverState extends State<DocumentCover> {
},
);
},
- fillColor: Theme.of(context).colorScheme.onSurfaceVariant,
+ fillColor: Theme.of(context)
+ .colorScheme
+ .onSurfaceVariant
+ .withOpacity(0.5),
height: 32,
title: LocaleKeys.document_plugins_cover_changeCover.tr(),
),
@@ -587,7 +592,7 @@ class DeleteCoverButton extends StatelessWidget {
Widget build(BuildContext context) {
final fillColor = PlatformExtension.isDesktopOrWeb
? Theme.of(context).colorScheme.surface.withOpacity(0.5)
- : Theme.of(context).colorScheme.onSurfaceVariant;
+ : Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5);
final svgColor = PlatformExtension.isDesktopOrWeb
? Theme.of(context).colorScheme.tertiary
: Theme.of(context).colorScheme.onPrimary;
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_block.dart
index c8ef4f8ca2..e23f5d929b 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_block.dart
@@ -42,11 +42,13 @@ class MentionBlock extends StatelessWidget {
required this.mention,
required this.node,
required this.index,
+ required this.textStyle,
});
final Map<String, dynamic> mention;
final Node node;
final int index;
+ final TextStyle? textStyle;
@override
Widget build(BuildContext context) {
@@ -58,6 +60,7 @@ class MentionBlock extends StatelessWidget {
return MentionPageBlock(
key: ValueKey(pageId),
pageId: pageId,
+ textStyle: textStyle,
);
case MentionType.reminder:
case MentionType.date:
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
index 80c9d224ad..629e025491 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
@@ -1,5 +1,4 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
-import 'package:appflowy/plugins/document/presentation/more/cubit/document_appearance_cubit.dart';
import 'package:appflowy/plugins/trash/application/trash_service.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';
@@ -22,9 +21,11 @@ class MentionPageBlock extends StatefulWidget {
const MentionPageBlock({
super.key,
required this.pageId,
+ required this.textStyle,
});
final String pageId;
+ final TextStyle? textStyle;
@override
State<MentionPageBlock> createState() => _MentionPageBlockState();
@@ -59,7 +60,6 @@ class _MentionPageBlockState extends State<MentionPageBlock> {
@override
Widget build(BuildContext context) {
- final fontSize = context.read<DocumentAppearanceCubit>().state.fontSize;
return FutureBuilder<ViewPB?>(
initialData: pageMemorizer[widget.pageId],
future: viewPBFuture,
@@ -71,6 +71,7 @@ class _MentionPageBlockState extends State<MentionPageBlock> {
return const SizedBox.shrink();
}
updateSelection();
+ final iconSize = widget.textStyle?.fontSize ?? 16.0;
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 2),
child: FlowyHover(
@@ -84,13 +85,14 @@ class _MentionPageBlockState extends State<MentionPageBlock> {
const HSpace(4),
FlowySvg(
view.layout.icon,
- size: const Size.square(18.0),
+ size: Size.square(iconSize + 2.0),
),
const HSpace(2),
FlowyText(
view.name,
decoration: TextDecoration.underline,
- fontSize: fontSize,
+ fontSize: widget.textStyle?.fontSize,
+ fontWeight: widget.textStyle?.fontWeight,
),
const HSpace(2),
],
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_item/mobile_block_settings_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_item/mobile_block_settings_toolbar_item.dart
index e32d79ad49..7ab072533f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_item/mobile_block_settings_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mobile_toolbar_item/mobile_block_settings_toolbar_item.dart
@@ -52,7 +52,6 @@ Future<void> _showBlockActionSheet(
builder: (context) {
return BlockActionBottomSheet(
extendActionWidgets: [
- const VSpace(8),
Row(
children: [
Expanded(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart
index 2cff5cf8d6..55d3feac2f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart
@@ -140,9 +140,10 @@ class EditorStyleCustomizer {
fontSize + 2,
fontSize,
];
- return TextStyle(
+ final fontFamily = context.read<DocumentAppearanceCubit>().state.fontFamily;
+ return baseTextStyle(fontFamily, fontWeight: FontWeight.bold).copyWith(
+ fontWeight: FontWeight.w600,
fontSize: fontSizes.elementAtOrNull(level - 1) ?? fontSize,
- fontWeight: FontWeight.bold,
);
}
@@ -217,11 +218,12 @@ class EditorStyleCustomizer {
Node node,
int index,
TextInsert text,
- TextSpan textSpan,
+ TextSpan before,
+ TextSpan after,
) {
final attributes = text.attributes;
if (attributes == null) {
- return textSpan;
+ return before;
}
// try to refresh font here.
@@ -240,6 +242,7 @@ class EditorStyleCustomizer {
final type = mention[MentionBlockKeys.type];
return WidgetSpan(
alignment: PlaceholderAlignment.middle,
+ style: after.style,
child: MentionBlock(
key: ValueKey(
switch (type) {
@@ -253,6 +256,7 @@ class EditorStyleCustomizer {
node: node,
index: index,
mention: mention,
+ textStyle: after.style,
),
);
}
@@ -275,7 +279,7 @@ class EditorStyleCustomizer {
final href = attributes[AppFlowyRichTextKeys.href] as String?;
if (PlatformExtension.isMobile && href != null) {
return TextSpan(
- style: textSpan.style,
+ style: before.style,
text: text.text,
recognizer: TapGestureRecognizer()
..onTap = () {
@@ -305,7 +309,8 @@ class EditorStyleCustomizer {
node,
index,
text,
- textSpan,
+ before,
+ after,
);
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart
index a4bcf37631..86c1edb1db 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart
@@ -60,13 +60,14 @@ void showSnackBarMessage(
? null
: SnackBarAction(
label: LocaleKeys.button_cancel.tr(),
- textColor: Theme.of(context).colorScheme.onSurface,
+ textColor: Colors.white,
onPressed: () {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
},
),
content: FlowyText(
message,
+ color: Colors.white,
),
),
);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
index cece42a182..7951719a58 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
@@ -152,6 +152,7 @@ class _ViewTitleState extends State<_ViewTitle> {
String name = '';
String icon = '';
+ String inputtingName = '';
@override
void initState() {
@@ -266,6 +267,18 @@ class _ViewTitleState extends State<_ViewTitle> {
}
popoverController.close();
},
+ onChanged: (text) async {
+ inputtingName = text;
+ },
+ onCanceled: () async {
+ if (inputtingName.isNotEmpty && inputtingName != name) {
+ await ViewBackendService.updateView(
+ viewId: widget.view.id,
+ name: inputtingName,
+ );
+ popoverController.close();
+ }
+ },
),
),
const HSpace(4.0),
@@ -280,6 +293,7 @@ class _ViewTitleState extends State<_ViewTitle> {
}
void _resetTextEditingController() {
+ inputtingName = name;
textEditingController
..text = name
..selection = TextSelection(
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 16856a9fd9..bb9a63d720 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
@@ -1,3 +1,5 @@
+import 'dart:io';
+
import 'package:flutter/material.dart';
class FlowyText extends StatelessWidget {
@@ -28,6 +30,21 @@ class FlowyText extends StatelessWidget {
Key? key,
}) : super(key: key);
+ FlowyText.small(
+ this.text, {
+ this.overflow,
+ this.color,
+ this.textAlign,
+ this.maxLines = 1,
+ this.decoration,
+ this.selectable = false,
+ this.fontFamily,
+ this.fallbackFontFamily,
+ Key? key,
+ }) : fontWeight = FontWeight.w400,
+ fontSize = (Platform.isIOS || Platform.isAndroid) ? 14 : 12,
+ super(key: key);
+
const FlowyText.regular(
this.text, {
this.fontSize,
diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock
index f106573656..bd9691d54c 100644
--- a/frontend/appflowy_flutter/pubspec.lock
+++ b/frontend/appflowy_flutter/pubspec.lock
@@ -54,8 +54,8 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "9c7a4e"
- resolved-ref: "9c7a4ee671768524b0dd6f3ebb12dd845932ee74"
+ ref: "4995d21"
+ resolved-ref: "4995d21ff49907c71286e668f938f830bf94ca0d"
url: "https://github.com/AppFlowy-IO/appflowy-editor.git"
source: git
version: "2.0.0"
@@ -580,8 +580,8 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "140b530"
- resolved-ref: "140b53091ce7ad971e97c1d5a53fe0875596326d"
+ ref: "4a5cac"
+ resolved-ref: "4a5cac57e31c0ffd49cd6257a9e078f084ae342c"
url: "https://github.com/LucasXu0/emoji_mart.git"
source: git
version: "1.0.2"
diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml
index 41da4be6f7..b21f4840bd 100644
--- a/frontend/appflowy_flutter/pubspec.yaml
+++ b/frontend/appflowy_flutter/pubspec.yaml
@@ -46,7 +46,7 @@ dependencies:
appflowy_editor:
git:
url: https://github.com/AppFlowy-IO/appflowy-editor.git
- ref: "9c7a4e"
+ ref: "4995d21"
appflowy_popover:
path: packages/appflowy_popover
@@ -115,7 +115,7 @@ dependencies:
flutter_emoji_mart:
git:
url: https://github.com/LucasXu0/emoji_mart.git
- ref: "140b530"
+ ref: "4a5cac"
# Notifications
# TODO: Consider implementing custom package