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.

chore: code cleanup (#7940)

Richard Shiue2e4e71f45963
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
index 96a7ce1c50..b159b2ccd8 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
@@ -27,130 +27,123 @@ class SettingsMenu extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = AppFlowyTheme.of(context);
- // Column > Expanded for full size no matter the content
- return Column(
- children: [
- Expanded(
- child: DecoratedBox(
- decoration: BoxDecoration(
- color: theme.surfaceContainerColorScheme.layer01,
- borderRadius: const BorderRadiusDirectional.only(
- topStart: Radius.circular(8),
- bottomStart: Radius.circular(8),
- ),
+
+ return Container(
+ decoration: BoxDecoration(
+ color: theme.surfaceContainerColorScheme.layer01,
+ borderRadius: BorderRadiusDirectional.horizontal(
+ start: Radius.circular(theme.spacing.m),
+ ),
+ ),
+ height: double.infinity,
+ child: SingleChildScrollView(
+ padding: EdgeInsets.symmetric(
+ vertical: 24,
+ horizontal: theme.spacing.l,
+ ),
+ physics: const ClampingScrollPhysics(),
+ child: Column(
+ spacing: theme.spacing.xs,
+ children: [
+ SettingsMenuElement(
+ page: SettingsPage.account,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_accountPage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_user_m),
+ changeSelectedPage: changeSelectedPage,
),
- child: SingleChildScrollView(
- padding: EdgeInsets.symmetric(
- vertical: 24,
- horizontal: theme.spacing.l,
+ SettingsMenuElement(
+ page: SettingsPage.workspace,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_workspacePage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_workspace_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ if (FeatureFlag.membersSettings.isOn &&
+ userProfile.workspaceType == WorkspaceTypePB.ServerW)
+ SettingsMenuElement(
+ page: SettingsPage.member,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_appearance_members_label.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_users_m),
+ changeSelectedPage: changeSelectedPage,
),
- physics: const ClampingScrollPhysics(),
- child: SeparatedColumn(
- separatorBuilder: () => VSpace(theme.spacing.xs),
- children: [
- SettingsMenuElement(
- page: SettingsPage.account,
- selectedPage: currentPage,
- label: LocaleKeys.settings_accountPage_menuLabel.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_user_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.workspace,
- selectedPage: currentPage,
- label: LocaleKeys.settings_workspacePage_menuLabel.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_workspace_m),
- changeSelectedPage: changeSelectedPage,
- ),
- if (FeatureFlag.membersSettings.isOn &&
- userProfile.workspaceType == WorkspaceTypePB.ServerW)
- SettingsMenuElement(
- page: SettingsPage.member,
- selectedPage: currentPage,
- label: LocaleKeys.settings_appearance_members_label.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_users_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.manageData,
- selectedPage: currentPage,
- label: LocaleKeys.settings_manageDataPage_menuLabel.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_database_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.notifications,
- selectedPage: currentPage,
- label: LocaleKeys.settings_menu_notifications.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_bell_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.cloud,
- selectedPage: currentPage,
- label: LocaleKeys.settings_menu_cloudSettings.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_cloud_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.shortcuts,
- selectedPage: currentPage,
- label: LocaleKeys.settings_shortcutsPage_menuLabel.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_keyboard_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.ai,
- selectedPage: currentPage,
- label: LocaleKeys.settings_aiPage_menuLabel.tr(),
- icon: const FlowySvg(
- FlowySvgs.settings_page_ai_m,
- ),
- changeSelectedPage: changeSelectedPage,
- ),
- if (userProfile.workspaceType == WorkspaceTypePB.ServerW)
- SettingsMenuElement(
- page: SettingsPage.sites,
- selectedPage: currentPage,
- label: LocaleKeys.settings_sites_title.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_earth_m),
- changeSelectedPage: changeSelectedPage,
- ),
- if (FeatureFlag.planBilling.isOn && isBillingEnabled) ...[
- SettingsMenuElement(
- page: SettingsPage.plan,
- selectedPage: currentPage,
- label: LocaleKeys.settings_planPage_menuLabel.tr(),
- icon: const FlowySvg(FlowySvgs.settings_page_plan_m),
- changeSelectedPage: changeSelectedPage,
- ),
- SettingsMenuElement(
- page: SettingsPage.billing,
- selectedPage: currentPage,
- label: LocaleKeys.settings_billingPage_menuLabel.tr(),
- icon:
- const FlowySvg(FlowySvgs.settings_page_credit_card_m),
- changeSelectedPage: changeSelectedPage,
- ),
- ],
- if (kDebugMode)
- SettingsMenuElement(
- // no need to translate this page
- page: SettingsPage.featureFlags,
- selectedPage: currentPage,
- label: 'Feature Flags',
- icon: const Icon(
- Icons.flag,
- size: 20,
- ),
- changeSelectedPage: changeSelectedPage,
- ),
- ],
+ SettingsMenuElement(
+ page: SettingsPage.manageData,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_manageDataPage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_database_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ SettingsMenuElement(
+ page: SettingsPage.notifications,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_menu_notifications.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_bell_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ SettingsMenuElement(
+ page: SettingsPage.cloud,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_menu_cloudSettings.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_cloud_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ SettingsMenuElement(
+ page: SettingsPage.shortcuts,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_shortcutsPage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_keyboard_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ SettingsMenuElement(
+ page: SettingsPage.ai,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_aiPage_menuLabel.tr(),
+ icon: const FlowySvg(
+ FlowySvgs.settings_page_ai_m,
),
+ changeSelectedPage: changeSelectedPage,
),
- ),
+ if (userProfile.workspaceType == WorkspaceTypePB.ServerW)
+ SettingsMenuElement(
+ page: SettingsPage.sites,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_sites_title.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_earth_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ if (FeatureFlag.planBilling.isOn && isBillingEnabled) ...[
+ SettingsMenuElement(
+ page: SettingsPage.plan,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_planPage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_plan_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ SettingsMenuElement(
+ page: SettingsPage.billing,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_billingPage_menuLabel.tr(),
+ icon: const FlowySvg(FlowySvgs.settings_page_credit_card_m),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ ],
+ if (kDebugMode)
+ SettingsMenuElement(
+ // no need to translate this page
+ page: SettingsPage.featureFlags,
+ selectedPage: currentPage,
+ label: 'Feature Flags',
+ icon: const Icon(
+ Icons.flag,
+ size: 20,
+ ),
+ changeSelectedPage: changeSelectedPage,
+ ),
+ ],
),
- ],
+ ),
);
}
}