fix: settings changes

2024-08-30 18:12:39 +00:00 · 2024-06-28 12:16:28 +02:00 · 2024-06-28 12:16:28 +02:00 · bae67b04a8
commit bae67b04a8
parent b09ff040f1
10 changed files with 66 additions and 53 deletions
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat.dart
@ -71,7 +71,6 @@ class AIChatPagePlugin extends Plugin {
  void dispose() {
    _viewInfoBloc.close();
    notifier.dispose();
-    super.dispose();
  }
 }

--- a/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart
@ -70,7 +70,6 @@ class UserWorkspaceBloc extends Bloc<UserWorkspaceEvent, UserWorkspaceState> {
            final workspaceMemberResult =
                await _userService.getWorkspaceMember();
            final workspaceMember = workspaceMemberResult.toNullable();
-
            emit(state.copyWith(currentWorkspaceMember: workspaceMember));
          },
          fetchWorkspaces: () async {
@ -510,6 +509,7 @@ class UserWorkspaceState with _$UserWorkspaceState {
    if (identical(this, other)) return true;

    return other is UserWorkspaceState &&
+        other.currentWorkspaceMember == currentWorkspaceMember &&
        other.currentWorkspace == currentWorkspace &&
        _deepCollectionEquality.equals(other.workspaces, workspaces) &&
        identical(other.actionResult, actionResult);
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
@ -1,5 +1,7 @@
 import 'dart:async';

+import 'package:flutter/material.dart';
+
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/plugins/blank/blank.dart';
@ -34,7 +36,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

 /// Home Sidebar is the left side bar of the home page.
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_ai_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_ai_view.dart
@ -10,7 +10,6 @@ import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

 class AIFeatureOnlySupportedWhenUsingAppFlowyCloud extends StatelessWidget {
@ -31,30 +30,25 @@ class AIFeatureOnlySupportedWhenUsingAppFlowyCloud extends StatelessWidget {
 }

 class SettingsAIView extends StatelessWidget {
-  const SettingsAIView({
-    super.key,
-    required this.userProfile,
-  });
+  const SettingsAIView({super.key, required this.userProfile});

  final UserProfilePB userProfile;

  @override
  Widget build(BuildContext context) {
    return BlocProvider<SettingsAIBloc>(
-      create: (context) =>
+      create: (_) =>
          SettingsAIBloc(userProfile)..add(const SettingsAIEvent.started()),
      child: BlocBuilder<SettingsAIBloc, SettingsAIState>(
-        builder: (context, state) {
-          return SettingsBody(
-            title: LocaleKeys.settings_aiPage_title.tr(),
-            description:
-                LocaleKeys.settings_aiPage_keys_aiSettingsDescription.tr(),
-            children: const [
-              AIModelSeclection(),
-              _AISearchToggle(value: false),
-            ],
-          );
-        },
+        builder: (_, __) => SettingsBody(
+          title: LocaleKeys.settings_aiPage_title.tr(),
+          description:
+              LocaleKeys.settings_aiPage_keys_aiSettingsDescription.tr(),
+          children: const [
+            AIModelSeclection(),
+            _AISearchToggle(value: false),
+          ],
+        ),
      ),
    );
  }
@ -66,23 +60,22 @@ class AIModelSeclection extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
      children: [
-        FlowyText(
-          LocaleKeys.settings_aiPage_keys_llmModel.tr(),
-          fontSize: 14,
+        Flexible(
+          child: FlowyText.medium(
+            LocaleKeys.settings_aiPage_keys_llmModel.tr(),
+          ),
        ),
        const Spacer(),
-        BlocBuilder<SettingsAIBloc, SettingsAIState>(
-          builder: (context, state) {
-            return Expanded(
-              child: SettingsDropdown<AIModelPB>(
+        Flexible(
+          child: BlocBuilder<SettingsAIBloc, SettingsAIState>(
+            builder: (context, state) {
+              return SettingsDropdown<AIModelPB>(
                key: const Key('AIModelDropdown'),
-                expandWidth: false,
-                onChanged: (format) {
-                  context.read<SettingsAIBloc>().add(
-                        SettingsAIEvent.selectModel(format),
-                      );
-                },
+                onChanged: (model) => context
+                    .read<SettingsAIBloc>()
+                    .add(SettingsAIEvent.selectModel(model)),
                selectedOption: state.userProfile.aiModel,
                options: _availableModels
                    .map(
@ -93,9 +86,9 @@ class AIModelSeclection extends StatelessWidget {
                      ),
                    )
                    .toList(),
-              ),
-            );
-          },
+              );
+            },
+          ),
        ),
      ],
    );
@ -139,17 +132,21 @@ class _AISearchToggle extends StatelessWidget {
  Widget build(BuildContext context) {
    return Row(
      children: [
-        Expanded(
-          child: FlowyText.regular(
-            LocaleKeys.settings_aiPage_keys_enableAISearchTitle.tr(),
-            fontSize: 16,
-          ),
+        FlowyText.medium(
+          LocaleKeys.settings_aiPage_keys_enableAISearchTitle.tr(),
        ),
-        const HSpace(16),
+        const Spacer(),
        BlocBuilder<SettingsAIBloc, SettingsAIState>(
          builder: (context, state) {
            if (state.aiSettings == null) {
-              return const CircularProgressIndicator.adaptive();
+              return const Padding(
+                padding: EdgeInsets.only(top: 6),
+                child: SizedBox(
+                  height: 26,
+                  width: 26,
+                  child: CircularProgressIndicator.adaptive(strokeWidth: 4),
+                ),
+              );
            } else {
              return Toggle(
                value: state.enableSearchIndexing,
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart
@ -494,6 +494,7 @@ class _ActionButton extends StatelessWidget {
                    ? SystemMouseCursors.click
                    : MouseCursor.defer,
                child: _drawBorder(
+                  context,
                  isLM: isLM,
                  isUpgrade: isUpgrade,
                  child: Container(
@ -544,7 +545,8 @@ class _ActionButton extends StatelessWidget {
    );
  }

-  Widget _drawBorder({
+  Widget _drawBorder(
+    BuildContext context, {
    required bool isLM,
    required bool isUpgrade,
    required Widget child,
@ -562,7 +564,7 @@ class _ActionButton extends StatelessWidget {
                ],
              )
            : null,
-        border: isUpgrade ? null : Border.all(),
+        border: isUpgrade ? null : Border.all(color: const Color(0xFF333333)),
        borderRadius: BorderRadius.circular(16),
      ),
      child: child,
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart
@ -70,6 +70,7 @@ class SettingsPlanView extends StatelessWidget {
                  usage: state.workspaceUsage,
                  subscription: state.subscription,
                ),
+                const VSpace(16),
                _CurrentPlanBox(subscription: state.subscription),
              ],
            ),
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart
@ -490,14 +490,11 @@ class KeyBadge extends StatelessWidget {
      ),
      child: Center(
        child: iconData != null
-            ? FlowySvg(
-                iconData!,
-                color: AFThemeExtension.of(context).strongText,
-              )
+            ? FlowySvg(iconData!, color: Colors.black)
            : FlowyText.medium(
                keyLabel.toLowerCase(),
                fontSize: 12,
-                color: AFThemeExtension.of(context).strongText,
+                color: Colors.black,
              ),
      ),
    );
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart
@ -24,6 +24,7 @@ import 'package:appflowy/workspace/presentation/settings/shared/setting_list_til
 import 'package:appflowy/workspace/presentation/settings/shared/settings_alert_dialog.dart';
 import 'package:appflowy/workspace/presentation/settings/shared/settings_body.dart';
 import 'package:appflowy/workspace/presentation/settings/shared/settings_category.dart';
+import 'package:appflowy/workspace/presentation/settings/shared/settings_category_spacer.dart';
 import 'package:appflowy/workspace/presentation/settings/shared/settings_dashed_divider.dart';
 import 'package:appflowy/workspace/presentation/settings/shared/settings_dropdown.dart';
 import 'package:appflowy/workspace/presentation/settings/shared/settings_input_field.dart';
@ -85,6 +86,7 @@ class SettingsWorkspaceView extends StatelessWidget {
          return SettingsBody(
            title: LocaleKeys.settings_workspacePage_title.tr(),
            description: LocaleKeys.settings_workspacePage_description.tr(),
+            autoSeparate: false,
            children: [
              // We don't allow changing workspace name/icon for local/offline
              if (userProfile.authenticator != AuthenticatorPB.Local) ...[
@ -93,6 +95,7 @@ class SettingsWorkspaceView extends StatelessWidget {
                      .tr(),
                  children: [_WorkspaceNameSetting(member: workspaceMember)],
                ),
+                const SettingsCategorySpacer(),
                SettingsCategory(
                  title: LocaleKeys.settings_workspacePage_workspaceIcon_title
                      .tr(),
@ -106,11 +109,14 @@ class SettingsWorkspaceView extends StatelessWidget {
                    ),
                  ],
                ),
+                const SettingsCategorySpacer(),
              ],
              SettingsCategory(
                title: LocaleKeys.settings_workspacePage_appearance_title.tr(),
                children: const [AppearanceSelector()],
              ),
+              const VSpace(16),
+              // const SettingsCategorySpacer(),
              SettingsCategory(
                title: LocaleKeys.settings_workspacePage_theme_title.tr(),
                description:
@ -121,6 +127,7 @@ class SettingsWorkspaceView extends StatelessWidget {
                  _DocumentSelectionColorSetting(),
                ],
              ),
+              const SettingsCategorySpacer(),
              SettingsCategory(
                title:
                    LocaleKeys.settings_workspacePage_workspaceFont_title.tr(),
@ -129,7 +136,9 @@ class SettingsWorkspaceView extends StatelessWidget {
                    currentFont:
                        context.read<AppearanceSettingsCubit>().state.font,
                  ),
-                  const SettingsDashedDivider(),
+                  SettingsDashedDivider(
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
                  SettingsCategory(
                    title: LocaleKeys.settings_workspacePage_textDirection_title
                        .tr(),
@ -140,11 +149,14 @@ class SettingsWorkspaceView extends StatelessWidget {
                  ),
                ],
              ),
+              const VSpace(16),
              SettingsCategory(
                title: LocaleKeys.settings_workspacePage_layoutDirection_title
                    .tr(),
                children: const [_LayoutDirectionSelect()],
              ),
+              const SettingsCategorySpacer(),
+
              SettingsCategory(
                title: LocaleKeys.settings_workspacePage_dateTime_title.tr(),
                children: [
@ -156,10 +168,14 @@ class SettingsWorkspaceView extends StatelessWidget {
                  const _DateFormatDropdown(),
                ],
              ),
+              const SettingsCategorySpacer(),
+
              SettingsCategory(
                title: LocaleKeys.settings_workspacePage_language_title.tr(),
                children: const [LanguageDropdown()],
              ),
+              const SettingsCategorySpacer(),
+
              if (userProfile.authenticator != AuthenticatorPB.Local) ...[
                SingleSettingAction(
                  label: LocaleKeys.settings_workspacePage_manageWorkspace_title
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
@ -1,4 +1,3 @@
-import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
 import 'package:flutter/material.dart';

 import 'package:appflowy/startup/startup.dart';
@ -15,6 +14,7 @@ import 'package:appflowy/workspace/presentation/settings/widgets/feature_flags/f
 import 'package:appflowy/workspace/presentation/settings/widgets/members/workspace_member_page.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/settings_notifications_view.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_body.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_body.dart
@ -33,7 +33,7 @@ class SettingsBody extends StatelessWidget {
              mainAxisSize: MainAxisSize.min,
              separatorBuilder: () => autoSeparate
                  ? const SettingsCategorySpacer()
-                  : const VSpace(16),
+                  : const SizedBox.shrink(),
              crossAxisAlignment: CrossAxisAlignment.start,
              children: children,
            ),