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.

feat: Initial implementation of updated language selector ui based on figma

sunny7dusk59b511c52ce6
diff --git a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart
index 5617750a77..e95e6e83ab 100644
--- a/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/settings/widgets/settings_language_view.dart
@@ -1,18 +1,37 @@
+import 'package:app_flowy/generated/locale_keys.g.dart';
import 'package:app_flowy/workspace/application/appearance.dart';
import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra/theme.dart';
import 'package:flutter/material.dart';
import 'package:flowy_infra/language.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:provider/provider.dart';
class SettingsLanguageView extends StatelessWidget {
const SettingsLanguageView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
- return SingleChildScrollView(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: const [LanguageSelectorDropdown()],
+ context.watch<AppTheme>();
+ return ChangeNotifierProvider.value(
+ value: Provider.of<AppearanceSettingModel>(context, listen: true),
+ child: SingleChildScrollView(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ children: [
+ Text(
+ LocaleKeys.settings_menu_language.tr(),
+ style: const TextStyle(
+ fontSize: 14,
+ fontWeight: FontWeight.w500,
+ ),
+ ),
+ const LanguageSelectorDropdown(),
+ ],
+ ),
+ ],
+ ),
),
);
}
@@ -28,22 +47,66 @@ class LanguageSelectorDropdown extends StatefulWidget {
}
class _LanguageSelectorDropdownState extends State<LanguageSelectorDropdown> {
+ Color currHoverColor = Colors.white.withOpacity(0.0);
+ late Color themedHoverColor;
+ void hoverExitLanguage() {
+ setState(() {
+ currHoverColor = Colors.white.withOpacity(0.0);
+ });
+ }
+
+ void hoverEnterLanguage() {
+ setState(() {
+ currHoverColor = themedHoverColor;
+ });
+ }
+
@override
Widget build(BuildContext context) {
- return DropdownButton<Locale>(
- value: context.read<AppearanceSettingModel>().locale,
- onChanged: (val) {
- setState(() {
- context.read<AppearanceSettingModel>().setLocale(context, val!);
- });
- },
- autofocus: true,
- items: EasyLocalization.of(context)!.supportedLocales.map((locale) {
- return DropdownMenuItem<Locale>(
- value: locale,
- child: Text(languageFromLocale(locale)),
- );
- }).toList(),
+ final theme = context.watch<AppTheme>();
+ themedHoverColor = theme.main2;
+
+ return MouseRegion(
+ onEnter: (event) => {hoverEnterLanguage()},
+ onExit: (event) => {hoverExitLanguage()},
+ child: Container(
+ margin: const EdgeInsets.only(left: 8, right: 8),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(8),
+ color: currHoverColor,
+ ),
+ child: DropdownButtonHideUnderline(
+ child: DropdownButton<Locale>(
+ value: context.read<AppearanceSettingModel>().locale,
+ onChanged: (val) {
+ setState(() {
+ context.read<AppearanceSettingModel>().setLocale(context, val!);
+ });
+ },
+ icon: const Visibility(
+ child: (Icon(Icons.arrow_downward)),
+ visible: false,
+ ),
+ borderRadius: BorderRadius.circular(8),
+ items: EasyLocalization.of(context)!.supportedLocales.map((locale) {
+ return DropdownMenuItem<Locale>(
+ value: locale,
+ child: Padding(
+ padding: const EdgeInsets.all(12.0),
+ child: Text(
+ languageFromLocale(locale),
+ style: TextStyle(
+ fontSize: 14,
+ fontWeight: FontWeight.w500,
+ color: theme.textColor,
+ ),
+ ),
+ ),
+ );
+ }).toList(),
+ ),
+ ),
+ ),
);
}
}