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: mobile ui issues (#4074)
Lucas.Xu4ae679128fd7
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dartindex 5d9b37b06b..c0652d23bf 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart@@ -216,78 +216,74 @@ class RowDetailFab extends StatelessWidget {final previousDisabled = rowIndex == 0;final nextDisabled = rowIndex == rowCount - 1;- return Positioned(- bottom: 0,- right: 0,- child: IntrinsicWidth(- child: Container(- height: 48,- decoration: BoxDecoration(- color: Theme.of(context).colorScheme.surface,- borderRadius: BorderRadius.circular(26),- boxShadow: const [- BoxShadow(- offset: Offset(0, 8),- blurRadius: 20,- spreadRadius: 0,- color: Color(0x191F2329),- ),- ],- ),- child: Row(- mainAxisSize: MainAxisSize.min,- mainAxisAlignment: MainAxisAlignment.center,- children: [- SizedBox.square(- dimension: 48,- child: Material(- color: Theme.of(context).colorScheme.surface,+ return IntrinsicWidth(+ child: Container(+ height: 48,+ decoration: BoxDecoration(+ color: Theme.of(context).colorScheme.surface,+ borderRadius: BorderRadius.circular(26),+ boxShadow: const [+ BoxShadow(+ offset: Offset(0, 8),+ blurRadius: 20,+ spreadRadius: 0,+ color: Color(0x191F2329),+ ),+ ],+ ),+ child: Row(+ mainAxisSize: MainAxisSize.min,+ mainAxisAlignment: MainAxisAlignment.center,+ children: [+ SizedBox.square(+ dimension: 48,+ child: Material(+ color: Theme.of(context).colorScheme.surface,+ borderRadius: BorderRadius.circular(26),+ borderOnForeground: false,+ child: InkWell(borderRadius: BorderRadius.circular(26),- borderOnForeground: false,- child: InkWell(- borderRadius: BorderRadius.circular(26),- onTap: () {- if (!previousDisabled) {- onTapPrevious();- }- },- child: Icon(- Icons.chevron_left_outlined,- color: previousDisabled- ? Theme.of(context).disabledColor- : null,- ),+ onTap: () {+ if (!previousDisabled) {+ onTapPrevious();+ }+ },+ child: Icon(+ Icons.chevron_left_outlined,+ color: previousDisabled+ ? Theme.of(context).disabledColor+ : null,),),),- FlowyText.medium(- "${rowIndex + 1} / $rowCount",- fontSize: 14,- ),- SizedBox.square(- dimension: 48,- child: Material(- color: Theme.of(context).colorScheme.surface,+ ),+ FlowyText.medium(+ "${rowIndex + 1} / $rowCount",+ fontSize: 14,+ ),+ SizedBox.square(+ dimension: 48,+ child: Material(+ color: Theme.of(context).colorScheme.surface,+ borderRadius: BorderRadius.circular(26),+ borderOnForeground: false,+ child: InkWell(borderRadius: BorderRadius.circular(26),- borderOnForeground: false,- child: InkWell(- borderRadius: BorderRadius.circular(26),- onTap: () {- if (!nextDisabled) {- onTapNext();- }- },- child: Icon(- Icons.chevron_right_outlined,- color: nextDisabled- ? Theme.of(context).disabledColor- : null,- ),+ onTap: () {+ if (!nextDisabled) {+ onTapNext();+ }+ },+ child: Icon(+ Icons.chevron_right_outlined,+ color: nextDisabled+ ? Theme.of(context).disabledColor+ : null,),),),- ],- ),+ ),+ ],),),);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.dartindex f4be9a20ff..075c473266 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@@ -36,19 +36,21 @@ class FieldOptions extends StatelessWidget {const _FieldHeader(),const VSpace(12.0),Expanded(- child: GridView.count(+ child: SingleChildScrollView(controller: scrollController,- crossAxisCount: 3,- childAspectRatio: 0.9,- mainAxisSpacing: 12.0,- children: _supportedFieldTypes- .map(- (e) => _Field(- type: e,- onTap: () => onAddField(e),- ),- )- .toList(),+ child: _GridView(+ crossAxisCount: 3,+ mainAxisSpacing: 28,+ itemWidth: 82,+ children: _supportedFieldTypes+ .map(+ (e) => _Field(+ type: e,+ onTap: () => onAddField(e),+ ),+ )+ .toList(),+ ),),),],@@ -95,22 +97,56 @@ class _Field extends StatelessWidget {@overrideWidget build(BuildContext context) {- final width = MediaQuery.of(context).size.width;return GestureDetector(onTap: onTap,child: Column(+ mainAxisSize: MainAxisSize.min,children: [FlowySvg(type.svgData,blendMode: null,- size: Size.square(width / 4.0),+ size: const Size.square(82),),const VSpace(6.0),FlowyText(type.i18n,+ fontSize: 15.0,),],),);}}++class _GridView extends StatelessWidget {+ const _GridView({+ required this.children,+ required this.crossAxisCount,+ required this.mainAxisSpacing,+ required this.itemWidth,+ });++ final List<Widget> children;+ final int crossAxisCount;+ final double mainAxisSpacing;+ final double itemWidth;++ @override+ Widget build(BuildContext context) {+ return Column(+ children: [+ for (var i = 0; i < children.length; i += crossAxisCount)+ Padding(+ padding: EdgeInsets.only(bottom: mainAxisSpacing),+ child: Row(+ mainAxisAlignment: MainAxisAlignment.spaceAround,+ children: [+ for (var j = 0; j < crossAxisCount; j++)+ i + j < children.length ? children[i + j] : HSpace(itemWidth),+ ],+ ),+ ),+ ],+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_home_recent_views.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_home_recent_views.dartindex 08dee5ef34..6b29cc8790 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_home_recent_views.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_home_recent_views.dart@@ -24,12 +24,11 @@ class _MobileRecentFolderState extends State<MobileRecentFolder> {),child: BlocBuilder<RecentViewsBloc, RecentViewsState>(builder: (context, state) {- final recentViews = state- .views- // only keep the first 10 items.- .reversed- .take(10)- .toList();+ final ids = <String>{};+ List<ViewPB> recentViews = state.views.reversed.toList();+ recentViews.retainWhere((element) => ids.add(element.id));+ // only keep the first 10 items.+ recentViews = recentViews.take(10).toList();if (recentViews.isEmpty) {return const SizedBox.shrink();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.dartindex a58aaa8c50..c72a1ebeac 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@@ -101,7 +101,7 @@ class _MobileRecentViewState extends State<MobileRecentView> {// https://github.com/flutter/flutter/issues/31134child: Stack(children: [- FlowyText(+ FlowyText.medium(view.name,maxLines: 2,overflow: TextOverflow.ellipsis,diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/base_appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/base_appearance.dartindex 6c75211247..e54289112c 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/base_appearance.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/base_appearance.dart@@ -1,3 +1,4 @@+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme.dart';import 'package:flutter/material.dart';@@ -23,7 +24,8 @@ abstract class BaseAppearance {double? lineHeight,}) {fontSize = fontSize ?? FontSizes.s12;- fontWeight = fontWeight ?? FontWeight.w400;+ fontWeight = fontWeight ??+ (PlatformExtension.isDesktopOrWeb ? FontWeight.w500 : FontWeight.w400);letterSpacing = fontSize * (letterSpacing ?? 0.005);final textStyle = TextStyle(