feat: main framework complete.

pull/1/head
DebuggerX 4 years ago
parent 02640c6f08
commit d5c104c9a0

@ -1,3 +1,4 @@
class SPKeys {
static final String brightnessMode = 'BRIGHTNESS_MODE';
static final String userLanguage = 'USER_LANGUAGE';
}

@ -0,0 +1,22 @@
import 'package:flutter/material.dart';
enum SupportedLocale {
zh_CN,
en,
}
const zh_CN = Locale('zh', 'CN');
const en = Locale('en');
const supportedLocales = [
zh_CN,
en,
];
const supportedLocaleNames = {
SupportedLocale.zh_CN: '简体中文',
SupportedLocale.en: 'English',
};
Locale getSupportedLocale(SupportedLocale supportedLocale) => supportedLocales[supportedLocale.index];

@ -3,6 +3,8 @@ library extensions;
export 'package:dde_gesture_manager/extensions/sout_extension.dart';
export 'package:dde_gesture_manager/extensions/string_extension.dart';
export 'package:dde_gesture_manager/extensions/context_extension.dart';
export 'package:dde_gesture_manager/extensions/shared_preferences_extension.dart';
export 'package:dde_gesture_manager/generated/locale_keys.g.dart';
export 'package:easy_localization/easy_localization.dart';

@ -0,0 +1,13 @@
import 'package:shared_preferences/shared_preferences.dart';
extension SharedPreferencesExtenstion on SharedPreferences {
Future<bool> updateInt(String key, int value) {
if (this.getInt(key) == value) return Future.value(false);
return this.setInt(key, value);
}
Future<bool> updateString(String key, String value) {
if (this.getString(key) == value) return Future.value(false);
return this.setString(key, value);
}
}

@ -1,14 +1,18 @@
import 'package:dde_gesture_manager/constants/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/generated/codegen_loader.g.dart';
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/models/configs.dart';
import 'package:dde_gesture_manager/models/configs.provider.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
import 'package:dde_gesture_manager/themes/dark.dart';
import 'package:dde_gesture_manager/themes/light.dart';
import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:dde_gesture_manager/utils/init.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
import 'pages/home.dart';
@ -18,11 +22,8 @@ Future<void> main() async {
await EasyLocalization.ensureInitialized();
await initConfigs();
runApp(EasyLocalization(
supportedLocales: [
Locale('zh', 'CN'),
Locale('en'),
],
fallbackLocale: Locale('zh', 'CN'),
supportedLocales: supportedLocales,
fallbackLocale: zh_CN,
path: 'resources/langs',
assetLoader: CodegenLoader(),
child: MyApp(),
@ -40,6 +41,7 @@ class MyApp extends StatelessWidget {
builder: (context, child) {
var isDarkMode = context.watch<SettingsProvider>().isDarkMode;
var brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
H().sp.updateInt(SPKeys.brightnessMode, brightnessMode?.index ?? 0);
late bool showDarkMode;
if (brightnessMode == BrightnessMode.system) {
showDarkMode = isDarkMode ?? false;
@ -47,7 +49,7 @@ class MyApp extends StatelessWidget {
showDarkMode = brightnessMode == BrightnessMode.dark;
}
return MaterialApp(
title: 'Flutter Demo',
title: CodegenLoader.mapLocales[context.locale.toString()]?[LocaleKeys.app_name],
theme: showDarkMode ? darkTheme : lightTheme,
localizationsDelegates: context.localizationDelegates,
supportedLocales: context.supportedLocales,

@ -14,6 +14,7 @@ class Configs {
BrightnessMode? brightnessMode;
Configs() {
this.brightnessMode = BrightnessMode.values[H().sp.getInt(SPKeys.brightnessMode)?.clamp(0, 2) ?? 0];
this.brightnessMode =
BrightnessMode.values[H().sp.getInt(SPKeys.brightnessMode)?.clamp(0, BrightnessMode.values.length - 1) ?? 0];
}
}

@ -19,7 +19,7 @@ class _HomePageState extends State<HomePage> {
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text('asd'),
Text('WIP'),
],
),
SizedBox(

@ -1,9 +1,14 @@
import 'package:dde_gesture_manager/constants/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/generated/codegen_loader.g.dart';
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:flutter/material.dart';
import 'package:gsettings/gsettings.dart';
import 'package:provider/provider.dart';
import 'package:window_manager/window_manager.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
Future<void> initEvents(BuildContext context) async {
var isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
@ -32,7 +37,10 @@ Future<void> initEvents(BuildContext context) async {
Future<void> initConfigs() async {
await H().initSharedPreference();
var windowManager = WindowManager.instance;
windowManager.setTitle('Gesture Manager For DDE');
var userLanguageIndex = H().sp.getInt(SPKeys.userLanguage) ?? 0;
var locale = supportedLocales[userLanguageIndex];
windowManager.setTitle(CodegenLoader.mapLocales[locale.toString()]?[LocaleKeys.app_name]);
windowManager.setMinimumSize(const Size(800, 600));
}
var windowManager = WindowManager.instance;

@ -1,8 +1,9 @@
import 'package:dde_gesture_manager/models/configs.dart';
import 'package:dde_gesture_manager/models/configs.provider.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/widgets/language_switcher.dart';
import 'package:dde_gesture_manager/widgets/theme_switcher.dart';
import 'package:dde_gesture_manager/widgets/version_checker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart';
class Footer extends StatefulWidget {
const Footer({Key? key}) : super(key: key);
@ -14,7 +15,6 @@ class Footer extends StatefulWidget {
class _FooterState extends State<Footer> {
@override
Widget build(BuildContext context) {
var _brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
return Container(
color: context.t.backgroundColor,
child: Padding(
@ -23,42 +23,14 @@ class _FooterState extends State<Footer> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(),
PopupMenuButton(
initialValue: _brightnessMode,
icon: Icon(Icons.brightness_4_outlined),
tooltip: LocaleKeys.theme_label.tr(),
itemBuilder: (BuildContext context) => [
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.system,
),
title: Text(LocaleKeys.theme_system).tr(),
),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.system),
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.light,
),
title: Text(LocaleKeys.theme_light).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.light),
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.dark,
),
title: Text(LocaleKeys.theme_dark).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.dark),
),
VersionChecker(),
Row(
children: [
LanguageSwitcher(),
Container(width: 6),
ThemeSwitcher(),
],
),
)
],
),
),

@ -0,0 +1,52 @@
import 'package:dde_gesture_manager/constants/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:window_manager/window_manager.dart';
class LanguageSwitcher extends StatelessWidget {
const LanguageSwitcher({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
var _locale = EasyLocalization.of(context)?.currentLocale;
var _supportedLocale = supportedLocales.firstWhereOrNull((element) => element == _locale);
return PopupMenuButton<SupportedLocale>(
child: Row(
children: [
Icon(Icons.language_outlined, size: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 3),
child: Text(LocaleKeys.language_label).tr(),
),
],
),
itemBuilder: (BuildContext context) => supportedLocales
.map(
(locale) => PopupMenuItem(
value: SupportedLocale.zh_CN,
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _supportedLocale == locale,
),
title: Text(supportedLocaleNames[SupportedLocale.values[supportedLocales.indexOf(locale)]] ?? ''),
),
onTap: () {
EasyLocalization.of(context)?.setLocale(locale).then((_) {
if (!kIsWeb) WindowManager.instance.setTitle(LocaleKeys.app_name.tr());
});
H().sp.setInt(SPKeys.userLanguage, supportedLocales.indexOf(locale));
},
),
)
.toList(),
);
}
}

@ -0,0 +1,59 @@
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/models/configs.dart';
import 'package:dde_gesture_manager/models/configs.provider.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart';
class ThemeSwitcher extends StatelessWidget {
const ThemeSwitcher({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
var _brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
return PopupMenuButton(
initialValue: _brightnessMode,
child: Row(
children: [
Icon(Icons.palette_outlined, size: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 3),
child: Text(LocaleKeys.theme_label).tr(),
),
],
),
padding: EdgeInsets.zero,
tooltip: LocaleKeys.theme_label.tr(),
itemBuilder: (BuildContext context) => [
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.system,
),
title: Text(LocaleKeys.theme_system).tr(),
),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.system),
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.light,
),
title: Text(LocaleKeys.theme_light).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.light),
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.dark,
),
title: Text(LocaleKeys.theme_dark).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.dark),
),
],
);
}
}

@ -0,0 +1,32 @@
import 'package:dde_gesture_manager/extensions.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
class VersionChecker extends StatelessWidget {
const VersionChecker({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return FutureBuilder<PackageInfo>(
future: PackageInfo.fromPlatform(),
initialData: null,
builder: (context, snapshot) => Row(
mainAxisSize: MainAxisSize.min,
children: [
if (snapshot.hasData && snapshot.data != null)
Text(
'${LocaleKeys.version_current.tr()} : ${snapshot.data?.version ?? ''}',
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 3),
child: TextButton(
child: Text(LocaleKeys.version_check_update).tr(),
onPressed: () {},
),
),
],
),
);
}
}

@ -40,12 +40,12 @@ static void my_application_activate(GApplication* application) {
if (use_header_bar) {
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_widget_show(GTK_WIDGET(header_bar));
gtk_header_bar_set_title(header_bar, "DDE Gesture Manager");
gtk_header_bar_set_title(header_bar, "");
gtk_header_bar_set_show_close_button(header_bar, TRUE);
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
}
else {
gtk_window_set_title(window, "DDE Gesture Manager");
gtk_window_set_title(window, "");
}
gtk_window_set_default_size(window, 800, 600);

@ -30,6 +30,7 @@ dependencies:
xdg_directories: 0.2.0
gsettings: 0.2.0
provider: ^6.0.0
package_info_plus: ^1.0.6
window_size:
path: 3rd_party/window_size
xdg_directories_web:
@ -54,8 +55,8 @@ flutter:
uses-material-design: true
# To add assets to your application, add an assets section, like this:
assets:
- resources/langs/
# assets:
# - resources/langs/
# - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg

@ -4,5 +4,13 @@
"dark": "Dark",
"light": "Light",
"system": "System"
},
"version": {
"current": "current version",
"check_update": "Check for updates"
},
"app_name": "Gesture Manager for DDE",
"language": {
"label": "Language"
}
}

@ -4,5 +4,13 @@
"dark": "深色",
"light": "浅色",
"system": "跟随系统"
},
"version": {
"current": "当前版本",
"check_update": "检查更新"
},
"app_name": "DDE手势管理器",
"language": {
"label": "语言"
}
}
Loading…
Cancel
Save