debuggerx
/
dde_gesture_manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: add dde_button widget.

Browse Source
pull/2/head
DebuggerX 4 years ago
parent 92a2e4c365
commit bba3b5d3d1
14 changed files with 240 additions and 86 deletions
Show Stats Download Patch File Download Diff File

12
app/lib/constants/constants.dart
Unescape View File

@ -1,8 +1,10 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
const double localManagerPanelWidth = 200; /// [UOS设计指南](https://docs.uniontech.com/zh/content/t_dbG3kBK9iDf9B963ok)
const double marketPanelWidth = 200; const double localManagerPanelWidth = 260;
const double marketPanelWidth = 300;
const shortDuration = const Duration(milliseconds: 100); const shortDuration = const Duration(milliseconds: 100);
@ -12,7 +14,11 @@ const longDuration = const Duration(milliseconds: 500);
const minWindowSize = const Size(800, 600); const minWindowSize = const Size(800, 600);
const double defaultBorderRadius = 8;
const double defaultButtonHeight = 36;
enum PanelType { enum PanelType {
local_manager, local_manager,
market, market,
} }

5
app/lib/pages/footer.dart
Unescape View File

@ -1,4 +1,5 @@
import 'package:dde_gesture_manager/extensions.dart'; import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/widgets/help_button.dart';
import 'package:dde_gesture_manager/widgets/language_switcher.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/theme_switcher.dart';
import 'package:dde_gesture_manager/widgets/version_checker.dart'; import 'package:dde_gesture_manager/widgets/version_checker.dart';
@ -27,9 +28,9 @@ class _FooterState extends State<Footer> {
Row( Row(
children: [ children: [
LanguageSwitcher(), LanguageSwitcher(),
Container(width: 6),
ThemeSwitcher(), ThemeSwitcher(),
], HelpButton(),
].map((e) => Padding(padding: EdgeInsets.only(right: 6), child: e)).toList(),
) )
], ],
), ),

68
app/lib/pages/gesture_editor.dart
Unescape View File

@ -1,9 +1,10 @@
import 'package:dde_gesture_manager/constants/constants.dart'; import 'package:dde_gesture_manager/constants/constants.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/content_layout.provider.dart'; import 'package:dde_gesture_manager/models/content_layout.provider.dart';
import 'package:dde_gesture_manager/utils/helper.dart'; import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart';
class GestureEditor extends StatelessWidget { class GestureEditor extends StatelessWidget {
const GestureEditor({Key? key}) : super(key: key); const GestureEditor({Key? key}) : super(key: key);
@ -19,42 +20,47 @@ class GestureEditor extends StatelessWidget {
color: context.t.backgroundColor, color: context.t.backgroundColor,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Column( child: Padding(
mainAxisAlignment: MainAxisAlignment.spaceBetween, padding: const EdgeInsets.all(8.0),
children: [ child: Column(
Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ Row(
Visibility( mainAxisAlignment: MainAxisAlignment.spaceBetween,
visible: layoutProvider.localManagerOpened == false, children: [
child: IconButton( Visibility(
onPressed: () => H.openPanel(context, PanelType.local_manager), visible: layoutProvider.localManagerOpened == false,
icon: Icon( child: DButton(
CupertinoIcons.square_list, width: defaultButtonHeight,
onTap: () => H.openPanel(context, PanelType.local_manager),
child: Icon(
CupertinoIcons.square_list,
),
), ),
), ),
), Visibility(
Visibility( visible: layoutProvider.marketOpened == false,
visible: layoutProvider.marketOpened == false, child: DButton(
child: IconButton( width: defaultButtonHeight,
onPressed: () => H.openPanel(context, PanelType.market), onTap: () => H.openPanel(context, PanelType.market),
icon: Icon( child: Icon(
CupertinoIcons.cart, CupertinoIcons.cart,
),
), ),
), ),
),
],
),
Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("<编辑器区域"),
Text("编辑器区域>"),
], ],
), ),
), Container(
], child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("<编辑器区域"),
Text("编辑器区域>"),
],
),
),
],
),
), ),
), ),
), ),

56
app/lib/pages/local_manager.dart
Unescape View File

@ -1,9 +1,11 @@
import 'package:dde_gesture_manager/constants/constants.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/content_layout.provider.dart'; import 'package:dde_gesture_manager/models/content_layout.provider.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:flutter/animation.dart'; import 'package:flutter/animation.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart'; import 'package:flutter/painting.dart';
import 'package:dde_gesture_manager/constants/constants.dart';
class LocalManager extends StatelessWidget { class LocalManager extends StatelessWidget {
const LocalManager({ const LocalManager({
@ -24,29 +26,39 @@ class LocalManager extends StatelessWidget {
child: Material( child: Material(
color: context.t.backgroundColor, color: context.t.backgroundColor,
elevation: isOpen ? 10 : 0, elevation: isOpen ? 10 : 0,
child: Column( child: Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: const EdgeInsets.all(8.0),
children: [ child: Column(
Row( mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ Row(
Flexible( mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Center( children: [
child: Text( Container(width: defaultButtonHeight),
"本地配置", Flexible(
textAlign: TextAlign.center, child: Center(
child: Text(
"本地方案管理",
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.bold,
),
),
), ),
), ),
), DButton(
IconButton( width: defaultButtonHeight - 2,
onPressed: () => context.read<ContentLayoutProvider>().setProps(localManagerOpened: !isOpen), height: defaultButtonHeight - 2,
icon: Icon( onTap: () => context.read<ContentLayoutProvider>().setProps(localManagerOpened: !isOpen),
CupertinoIcons.chevron_left_2, child: Icon(
CupertinoIcons.chevron_left_2,
size: 20,
),
), ),
), ],
], ),
), ],
], ),
), ),
), ),
), ),

53
app/lib/pages/market.dart
Unescape View File

@ -1,8 +1,9 @@
import 'package:dde_gesture_manager/constants/constants.dart'; import 'package:dde_gesture_manager/constants/constants.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/content_layout.provider.dart'; import 'package:dde_gesture_manager/models/content_layout.provider.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart';
class Market extends StatelessWidget { class Market extends StatelessWidget {
const Market({ const Market({
@ -23,29 +24,39 @@ class Market extends StatelessWidget {
child: Material( child: Material(
color: context.t.backgroundColor, color: context.t.backgroundColor,
elevation: isOpen ? 10 : 0, elevation: isOpen ? 10 : 0,
child: Column( child: Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: const EdgeInsets.all(8.0),
children: [ child: Column(
Row( mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ Row(
IconButton( mainAxisAlignment: MainAxisAlignment.spaceBetween,
onPressed: () => context.read<ContentLayoutProvider>().setProps(marketOpened: !isOpen), children: [
icon: Icon( DButton(
CupertinoIcons.chevron_right_2, width: defaultButtonHeight - 2,
height: defaultButtonHeight - 2,
onTap: () => context.read<ContentLayoutProvider>().setProps(marketOpened: !isOpen),
child: Icon(
CupertinoIcons.chevron_right_2,
size: 20,
),
), ),
), Flexible(
Flexible( child: Center(
child: Center( child: Text(
child: Text( "方案市场",
"配置市场", textAlign: TextAlign.center,
textAlign: TextAlign.center, style: TextStyle(
fontWeight: FontWeight.bold,
),
),
), ),
), ),
), Container(width: defaultButtonHeight),
], ],
), ),
], ],
),
), ),
), ),
), ),

11
app/lib/themes/dark.dart
Unescape View File

@ -4,4 +4,15 @@ var darkTheme = ThemeData.dark().copyWith(
primaryColor: Colors.grey, primaryColor: Colors.grey,
scaffoldBackgroundColor: Color(0xff252525), scaffoldBackgroundColor: Color(0xff252525),
backgroundColor: Color(0xff282828), backgroundColor: Color(0xff282828),
iconTheme: IconThemeData(
color: Color(0xffc0c6d4),
),
textTheme: ThemeData.dark().textTheme.copyWith(
headline1: TextStyle(
color: Color(0xffc0c6d4),
),
bodyText2: TextStyle(
color: Color(0xffc0c6d4),
),
),
); );

11
app/lib/themes/light.dart
Unescape View File

@ -4,4 +4,15 @@ var lightTheme = ThemeData.light().copyWith(
primaryColor: Colors.blue, primaryColor: Colors.blue,
scaffoldBackgroundColor: Color(0xfff8f8f8), scaffoldBackgroundColor: Color(0xfff8f8f8),
backgroundColor: Color(0xffffffff), backgroundColor: Color(0xffffffff),
iconTheme: IconThemeData(
color: Color(0xff414d68),
),
textTheme: ThemeData.light().textTheme.copyWith(
headline1: TextStyle(
color: Color(0xff414d68),
),
bodyText2: TextStyle(
color: Color(0xff414d68),
),
),
); );

54
app/lib/widgets/dde_button.dart
Unescape View File

@ -0,0 +1,54 @@
import 'package:dde_gesture_manager/constants/constants.dart';
import 'package:flutter/material.dart';
import 'package:glass_kit/glass_kit.dart';
class DButton extends StatefulWidget {
final double width;
final double height;
final Widget child;
final GestureTapCallback? onTap;
const DButton({
Key? key,
required this.width,
this.height = defaultButtonHeight,
required this.child,
this.onTap,
}) : super(key: key);
@override
State<DButton> createState() => _DButtonState();
}
class _DButtonState extends State<DButton> {
bool _hovering = false;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: widget.onTap,
child: GlassContainer(
width: widget.width,
height: widget.height,
gradient: LinearGradient(
colors: [Colors.white.withOpacity(_hovering ? 0.1 : 0.15), Colors.white.withOpacity(0.1)],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
borderColor: Color(0xff565656),
borderWidth: 1,
borderRadius: BorderRadius.circular(defaultBorderRadius),
child: MouseRegion(
onEnter: (event) => setState(() {
_hovering = true;
}),
onExit: (event) => setState(() {
_hovering = false;
}),
cursor: SystemMouseCursors.click,
child: Center(child: widget.child),
),
),
);
}
}

28
app/lib/widgets/help_button.dart
Unescape View File

@ -0,0 +1,28 @@
import 'package:dde_gesture_manager/extensions.dart';
import 'package:flutter/material.dart';
class HelpButton extends StatelessWidget {
const HelpButton({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {},
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: Tooltip(
message: LocaleKeys.help_tip.tr(),
child: Row(
children: [
Icon(Icons.help_outline, size: 20),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 3),
child: Text(LocaleKeys.help_label).tr(),
),
],
),
),
),
);
}
}

3
app/lib/widgets/language_switcher.dart
Unescape View File

@ -1,3 +1,4 @@
import 'package:collection/collection.dart';
import 'package:dde_gesture_manager/constants/sp_keys.dart'; import 'package:dde_gesture_manager/constants/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart'; import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.dart'; import 'package:dde_gesture_manager/extensions.dart';
@ -6,7 +7,6 @@ import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
class LanguageSwitcher extends StatelessWidget { class LanguageSwitcher extends StatelessWidget {
@ -18,6 +18,7 @@ class LanguageSwitcher extends StatelessWidget {
var _supportedLocale = supportedLocales.firstWhereOrNull((element) => element == _locale); var _supportedLocale = supportedLocales.firstWhereOrNull((element) => element == _locale);
return PopupMenuButton<SupportedLocale>( return PopupMenuButton<SupportedLocale>(
tooltip: LocaleKeys.language_tip.tr(),
child: Row( child: Row(
children: [ children: [
Icon(Icons.language_outlined, size: 20), Icon(Icons.language_outlined, size: 20),

4
app/lib/widgets/theme_switcher.dart
Unescape View File

@ -1,9 +1,9 @@
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/generated/locale_keys.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.dart';
import 'package:dde_gesture_manager/models/configs.provider.dart'; import 'package:dde_gesture_manager/models/configs.provider.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:dde_gesture_manager/extensions.dart';
class ThemeSwitcher extends StatelessWidget { class ThemeSwitcher extends StatelessWidget {
const ThemeSwitcher({Key? key}) : super(key: key); const ThemeSwitcher({Key? key}) : super(key: key);
@ -23,7 +23,7 @@ class ThemeSwitcher extends StatelessWidget {
], ],
), ),
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
tooltip: LocaleKeys.theme_label.tr(), tooltip: LocaleKeys.theme_tip.tr(),
itemBuilder: (BuildContext context) => [ itemBuilder: (BuildContext context) => [
PopupMenuItem<BrightnessMode>( PopupMenuItem<BrightnessMode>(
child: ListTile( child: ListTile(

1
app/pubspec.yaml
Unescape View File

@ -36,6 +36,7 @@ dependencies:
xdg_directories_web: xdg_directories_web:
path: 3rd_party/xdg_directories_web path: 3rd_party/xdg_directories_web
easy_localization: ^3.0.0 easy_localization: ^3.0.0
glass_kit: ^2.0.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

10
app/resources/langs/en.json
Unescape View File

@ -3,7 +3,8 @@
"label": "Theme", "label": "Theme",
"dark": "Dark", "dark": "Dark",
"light": "Light", "light": "Light",
"system": "System" "system": "System",
"tip": "Choose a theme"
}, },
"version": { "version": {
"current": "current version", "current": "current version",
@ -11,6 +12,11 @@
}, },
"app_name": "Gesture Manager for DDE", "app_name": "Gesture Manager for DDE",
"language": { "language": {
"label": "Language" "label": "Language",
"tip": "Choose a language"
},
"help": {
"label": "Help",
"tip": "Display help documentation"
} }
} }

10
app/resources/langs/zh-CN.json
Unescape View File

@ -3,7 +3,8 @@
"label": "主题", "label": "主题",
"dark": "深色", "dark": "深色",
"light": "浅色", "light": "浅色",
"system": "跟随系统" "system": "跟随系统",
"tip": "选择界面主题"
}, },
"version": { "version": {
"current": "当前版本", "current": "当前版本",
@ -11,6 +12,11 @@
}, },
"app_name": "DDE手势管理器", "app_name": "DDE手势管理器",
"language": { "language": {
"label": "语言" "label": "语言",
"tip": "选择语言"
},
"help": {
"label": "帮助",
"tip": "显示帮助文档"
} }
} }
Write Preview
Loading…
Cancel
Save