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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: row property align issue (#5950)
Lucas.Xue2359cf047f3
diff --git a/frontend/appflowy_flutter/ios/Podfile.lock b/frontend/appflowy_flutter/ios/Podfile.lockindex c54ae23ed6..d7647a9d4a 100644--- a/frontend/appflowy_flutter/ios/Podfile.lock+++ b/frontend/appflowy_flutter/ios/Podfile.lock@@ -48,8 +48,6 @@ PODS:- fluttertoast (0.0.2):- Flutter- Toast- - image_gallery_saver (2.0.2):- - Flutter- image_picker_ios (0.0.1):- Flutter- integration_test (0.0.1):@@ -95,7 +93,6 @@ DEPENDENCIES:- flowy_infra_ui (from `.symlinks/plugins/flowy_infra_ui/ios`)- Flutter (from `Flutter`)- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)- - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)- integration_test (from `.symlinks/plugins/integration_test/ios`)- irondash_engine_context (from `.symlinks/plugins/irondash_engine_context/ios`)@@ -136,8 +133,6 @@ EXTERNAL SOURCES::path: Flutterfluttertoast::path: ".symlinks/plugins/fluttertoast/ios"- image_gallery_saver:- :path: ".symlinks/plugins/image_gallery_saver/ios"image_picker_ios::path: ".symlinks/plugins/image_picker_ios/ios"integration_test:@@ -176,7 +171,6 @@ SPEC CHECKSUMS:flowy_infra_ui: 0455e1fa8c51885aa1437848e361e99419f34ebcFlutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c- image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cbimage_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4irondash_engine_context: 3458bf979b90d616ffb8ae03a150bafe2e860cc9diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dartindex 0498427547..7c26879a4f 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/mobile_row_property_list.dart@@ -87,6 +87,7 @@ class _PropertyCellState extends State<_PropertyCell> {fieldInfo.name,overflow: TextOverflow.ellipsis,fontSize: 14,+ figmaLineHeight: 16.0,color: Theme.of(context).hintColor,),),diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input.dartindex 60de3fd528..54c70d61cc 100644--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input.dart+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_input.dart@@ -12,6 +12,7 @@ import 'package:extended_text_field/extended_text_field.dart';import 'package:flowy_infra/file_picker/file_picker_service.dart';import 'package:flowy_infra/platform_extension.dart';import 'package:flowy_infra/theme_extension.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -21,8 +22,8 @@ import 'package:flutter_chat_ui/flutter_chat_ui.dart';import 'chat_at_button.dart';import 'chat_input_attachment.dart';-import 'chat_send_button.dart';import 'chat_input_span.dart';+import 'chat_send_button.dart';import 'layout_define.dart';class ChatInput extends StatefulWidget {@@ -114,7 +115,7 @@ class _ChatInputState extends State<ChatInput> {child: Container(decoration: BoxDecoration(border: Border.all(- color: _inputFocusNode.hasFocus && !isMobile+ color: _inputFocusNode.hasFocus? Theme.of(context).colorScheme.primary.withOpacity(0.6): Theme.of(context).colorScheme.secondary,),@@ -161,9 +162,9 @@ class _ChatInputState extends State<ChatInput> {Expanded(child: _inputTextField(context, textPadding)),// mention button- // TODO(lucas): support mobile- if (PlatformExtension.isDesktop)- _mentionButton(buttonPadding),+ _mentionButton(buttonPadding),++ if (PlatformExtension.isMobile) const HSpace(6.0),// send button_sendButton(buttonPadding),@@ -245,6 +246,7 @@ class _ChatInputState extends State<ChatInput> {InputDecoration _buildInputDecoration(BuildContext context) {return InputDecoration(border: InputBorder.none,+ enabledBorder: InputBorder.none,hintText: widget.hintText,focusedBorder: InputBorder.none,hintStyle: TextStyle(diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dartindex 127f365bf6..7e10166fe4 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart@@ -31,6 +31,7 @@ import 'package:appflowy/workspace/presentation/settings/widgets/feature_flags/mimport 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/time/duration.dart';+import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:go_router/go_router.dart';import 'package:sheet/route.dart';@@ -558,10 +559,25 @@ GoRoute _mobileCardDetailScreenRoute() {parentNavigatorKey: AppGlobals.rootNavKey,path: MobileRowDetailPage.routeName,pageBuilder: (context, state) {- final args = state.extra as Map<String, dynamic>;+ var extra = state.extra as Map<String, dynamic>?;++ if (kDebugMode && extra == null) {+ extra = _dynamicValues;+ }++ if (extra == null) {+ return const MaterialExtendedPage(+ child: SizedBox.shrink(),+ );+ }+final databaseController =- args[MobileRowDetailPage.argDatabaseController];- final rowId = args[MobileRowDetailPage.argRowId]!;+ extra[MobileRowDetailPage.argDatabaseController];+ final rowId = extra[MobileRowDetailPage.argRowId]!;++ if (kDebugMode) {+ _dynamicValues = extra;+ }return MaterialExtendedPage(child: MobileRowDetailPage(@@ -629,3 +645,8 @@ Widget _buildFadeTransition(Duration _slowDuration = Duration(milliseconds: RouteDurations.slow.inMilliseconds.round(),);++// ONLY USE IN DEBUG MODE+// this is a workaround for the issue of GoRouter not supporting extra with complex types+// https://github.com/flutter/flutter/issues/137248+Map<String, dynamic> _dynamicValues = {};diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 183b341472..5d16830e41 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -890,10 +890,10 @@ packages:dependency: "direct main"description:name: go_router- sha256: "170c46e237d6eb0e6e9f0e8b3f56101e14fb64f787016e42edd74c39cf8b176a"+ sha256: ddc16d34b0d74cb313986918c0f0885a7ba2fc24d8fb8419de75f0015144ccfeurl: "https://pub.dev"source: hosted- version: "13.2.0"+ version: "14.2.3"google_fonts:dependency: "direct main"description:diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlindex 185ee51a4f..b8caf2c183 100644--- a/frontend/appflowy_flutter/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -99,7 +99,7 @@ dependencies:url_protocol:hive_flutter: ^1.1.0super_clipboard: ^0.8.4- go_router: ^13.1.0+ go_router: ^14.2.0string_validator: ^1.0.0unsplash_client: ^2.1.1flutter_emoji_mart:diff --git a/frontend/scripts/code_generation/freezed/generate_freezed.sh b/frontend/scripts/code_generation/freezed/generate_freezed.shindex 4b7ded87c8..391aea08b2 100755--- a/frontend/scripts/code_generation/freezed/generate_freezed.sh+++ b/frontend/scripts/code_generation/freezed/generate_freezed.sh@@ -71,10 +71,11 @@ if [ "$exclude_packages" = false ]; then# Navigate back to the packages directorycd ..done++ cd ..fi# Navigate to the appflowy_flutter directory and generate files-cd ..echo "🧊 Start generating freezed files (AppFlowy)."if [ "$skip_pub_packages_get" = false ]; then