From d62493ce012feca7a26ec8903387703b0a0f88d3 Mon Sep 17 00:00:00 2001
From: Mathias Mogensen <42929161+Xazin@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:48:07 +0200
Subject: [PATCH] fix: dropdown state unchanging after file reset (#2109)

---
 .../lib/workspace/application/appearance.dart      |  4 ++--
 .../settings/widgets/settings_language_view.dart   | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/appflowy_flutter/lib/workspace/application/appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
index b5c3ecb9bf..9cadf7f5ce 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/appearance.dart
@@ -55,9 +55,9 @@ class AppearanceSettingsCubit extends Cubit<AppearanceSettingsState> {
       newLocale = const Locale('en');
     }
 
-    context.setLocale(newLocale);
-
     if (state.locale != newLocale) {
+      context.setLocale(newLocale);
+
       _setting.locale.languageCode = newLocale.languageCode;
       _setting.locale.countryCode = newLocale.countryCode ?? "";
       _saveAppearanceSettings();
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dart
index 20cb1eaafa..7b76aa6157 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_language_view.dart
@@ -54,8 +54,8 @@ class _LanguageSelectorDropdownState extends State<LanguageSelectorDropdown> {
   @override
   Widget build(BuildContext context) {
     return MouseRegion(
-      onEnter: (event) => {hoverEnterLanguage()},
-      onExit: (event) => {hoverExitLanguage()},
+      onEnter: (_) => hoverEnterLanguage(),
+      onExit: (_) => hoverExitLanguage(),
       child: Container(
         margin: const EdgeInsets.symmetric(horizontal: 8),
         decoration: BoxDecoration(
@@ -67,12 +67,10 @@ class _LanguageSelectorDropdownState extends State<LanguageSelectorDropdown> {
             padding: const EdgeInsets.symmetric(horizontal: 6),
             child: DropdownButton<Locale>(
               value: context.locale,
-              onChanged: (val) {
-                setState(() {
-                  context
-                      .read<AppearanceSettingsCubit>()
-                      .setLocale(context, val!);
-                });
+              onChanged: (locale) {
+                context
+                    .read<AppearanceSettingsCubit>()
+                    .setLocale(context, locale!);
               },
               autofocus: true,
               borderRadius: BorderRadius.circular(8),