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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	app/lib/pages/local_manager.dart
This commit is contained in:
DebuggerX
2021-10-12 14:19:56 +08:00
parent 12cdbaecbe bf652afe6c
commit 1797ea1d5d
5 changed files with 151 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/models/settings.dart
+8
View File
@@ -1,7 +1,15 @@
import 'package:dde_gesture_manager/builder/provider_annotation.dart';
import 'package:flutter/material.dart';
export 'package:flutter/material.dart' show Color;
@ProviderModel()
class Settings {
@ProviderModelProp()
bool? isDarkMode;
@ProviderModelProp()
Color? activeColor;
Color get currentActiveColor => activeColor ?? const Color(0xff0069cc);
}
app/lib/pages/gesture_editor.dart
+47 -14
View File
@@ -3,6 +3,7 @@ import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
import 'package:dde_gesture_manager/models/scheme.dart';
import 'package:dde_gesture_manager/models/scheme.provider.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:dde_gesture_manager/widgets/dde_data_table.dart';
@@ -12,8 +13,9 @@ import 'package:flutter/material.dart';
class GestureEditor extends StatelessWidget {
const GestureEditor({Key? key}) : super(key: key);
List<DDataRow> _buildDataRow(List<GestureProp>? gestures, BuildContext context) => (gestures ?? [])
.map((gesture) => DDataRow(
List<DDataRow> _buildDataRow(List<GestureProp>? gestures, BuildContext context) => (gestures ?? []).map((gesture) {
bool selected = context.watch<GesturePropProvider>() == gesture;
return DDataRow(
onSelectChanged: (selected) {
if (selected == true)
context.read<GesturePropProvider>().setProps(
@@ -25,27 +27,57 @@ class GestureEditor extends StatelessWidget {
remark: gesture.remark,
);
},
selected: context.watch<GesturePropProvider>() == gesture,
selected: selected,
cells: [
Center(
child: Text('${LocaleKeys.gesture_editor_gestures}.${H.getGestureName(gesture.gesture)}').tr(),
child: Text(
'${LocaleKeys.gesture_editor_gestures}.${H.getGestureName(gesture.gesture)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr(),
),
Center(
child: Text('${LocaleKeys.gesture_editor_directions}.${H.getGestureDirectionName(gesture.direction)}')
.tr()),
Center(
child: Text('${gesture.fingers}'),
child: Text(
'${LocaleKeys.gesture_editor_directions}.${H.getGestureDirectionName(gesture.direction)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr()),
Center(
child: Text(
'${gesture.fingers}',
style: TextStyle(
color: selected ? Colors.white : null,
),
),
),
Center(
child: Text(
'${LocaleKeys.gesture_editor_types}.${H.getGestureTypeName(gesture.type)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr()),
Text(
gesture.command ?? '',
style: TextStyle(
color: selected ? Colors.white : null,
),
),
Text(
gesture.remark ?? '',
style: TextStyle(
color: selected ? Colors.white : null,
),
),
Center(child: Text('${LocaleKeys.gesture_editor_types}.${H.getGestureTypeName(gesture.type)}').tr()),
Text(gesture.command ?? ''),
Text(gesture.remark ?? ''),
]
.map(
(ele) => DDataCell(ele),
)
.toList(),
))
.toList();
);
}).toList();
@override
Widget build(BuildContext context) {
@@ -129,7 +161,8 @@ class GestureEditor extends StatelessWidget {
),
dataRowColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.hovered)) return context.t.dialogBackgroundColor;
if (states.contains(MaterialState.selected)) return Colors.blueAccent;
if (states.contains(MaterialState.selected))
return context.read<SettingsProvider>().currentActiveColor;
return null;
}),
columns: [
app/lib/pages/local_manager.dart
+60 -1
View File
@@ -3,6 +3,7 @@ import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
import 'package:dde_gesture_manager/models/scheme.provider.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:flutter/animation.dart';
import 'package:flutter/cupertino.dart';
@@ -35,7 +36,7 @@ class _LocalManagerState extends State<LocalManager> {
Color _getItemBackgroundColor(int index) {
Color _color = index % 2 == 0 ? context.t.scaffoldBackgroundColor : context.t.backgroundColor;
if (index == _hoveringIndex) _color = context.t.scaffoldBackgroundColor;
if (index == _selectedIndex) _color = Colors.blueAccent;
if (index == _selectedIndex) _color = context.read<SettingsProvider>().currentActiveColor;
return _color;
}
@@ -157,6 +158,64 @@ class _LocalManagerState extends State<LocalManager> {
),
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: ListView.builder(
controller: _scrollController,
itemBuilder: (context, index) => GestureDetector(
onDoubleTap: () {
context.read<SchemeProvider>().copyFrom(localSchemes[index].scheme);
setState(() {
_selectedIndex = index;
});
},
onTap: () {
setState(() {
_selectedIndex = index;
});
},
child: MouseRegion(
cursor: SystemMouseCursors.click,
onEnter: (_) {
setState(() {
_hoveringIndex = index;
});
},
child: Container(
color: _getItemBackgroundColor(index),
child: Padding(
padding: const EdgeInsets.only(right: 12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
localSchemes[index].scheme.name ?? '',
style: TextStyle(
color: index == _selectedIndex ? Colors.white : null,
),
),
Text(
'456',
style: TextStyle(
color: index == _selectedIndex ? Colors.white : null,
),
),
],
),
),
),
),
),
itemCount: localSchemes.length,
),
),
Container(
height: 150,
color: Colors.black,
),
],
),
),
],
app/lib/utils/helper.dart
+9
View File
@@ -97,6 +97,15 @@ class H {
'commandline': GestureType.commandline,
}[typeName] ??
GestureType.built_in;
static Color? parseQtActiveColor(String? inp) {
if (inp == null) return null;
var list = inp.split(',');
if (list.length != 4) return null;
var rgba = list.map<int>((e) => int.parse(e) ~/ 257).toList();
rgba.sout();
return Color.fromARGB(rgba[3], rgba[0], rgba[1], rgba[2]);
}
}
class PreferredPanelsStatus {
app/lib/utils/init_linux.dart
+7
View File
@@ -18,8 +18,11 @@ Future<void> initEvents(BuildContext context) async {
} else {
var xsettings = GSettings('com.deepin.xsettings');
String? themeName;
Color? activeColor;
try {
themeName = (await xsettings.get('theme-name')).toString();
var _activeColor = (await xsettings.get('qt-active-color'));
activeColor = H.parseQtActiveColor(_activeColor.toNative());
} catch (e) {
print(e);
context.read<SettingsProvider>().setProps(isDarkMode: false);
@@ -27,10 +30,14 @@ Future<void> initEvents(BuildContext context) async {
if (themeName != null) {
context.read<SettingsProvider>().setProps(isDarkMode: themeName.contains('dark'));
context.read<SettingsProvider>().setProps(activeColor: activeColor);
xsettings.keysChanged.listen((event) {
xsettings.get('theme-name').then((value) {
context.read<SettingsProvider>().setProps(isDarkMode: value.toString().contains('dark'));
});
xsettings.get('qt-active-color').then((value) {
context.read<SettingsProvider>().setProps(activeColor: H.parseQtActiveColor(value.toNative()));
});
});
}
}