feat: use 'scheme' instead of 'solution'.

This commit is contained in:
2021-10-09 13:37:08 +08:00
parent 094d74b746
commit b160adc654
13 changed files with 132 additions and 132 deletions
+4 -4
View File
@@ -1,8 +1,8 @@
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/solution.dart';
import 'package:dde_gesture_manager/models/solution.provider.dart';
import 'package:dde_gesture_manager/models/scheme.dart';
import 'package:dde_gesture_manager/models/scheme.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';
@@ -50,7 +50,7 @@ class GestureEditor extends StatelessWidget {
@override
Widget build(BuildContext context) {
var layoutProvider = context.watch<ContentLayoutProvider>();
var solutionProvider = context.watch<SolutionProvider>();
var schemeProvider = context.watch<SchemeProvider>();
return Flexible(
child: Padding(
padding: const EdgeInsets.all(10),
@@ -140,7 +140,7 @@ class GestureEditor extends StatelessWidget {
DDataColumn(label: Text(LocaleKeys.gesture_editor_command.tr())),
DDataColumn(label: Text(LocaleKeys.gesture_editor_remark.tr())),
],
rows: _buildDataRow(solutionProvider.gestures, context),
rows: _buildDataRow(schemeProvider.gestures, context),
),
),
),
+4 -4
View File
@@ -1,6 +1,6 @@
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/local_solutions_provider.dart';
import 'package:dde_gesture_manager/models/solution.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/pages/content.dart';
import 'package:dde_gesture_manager/pages/footer.dart';
import 'package:flutter/material.dart';
@@ -18,7 +18,7 @@ class _HomePageState extends State<HomePage> {
return Scaffold(
body: MultiProvider(
providers: [
ChangeNotifierProvider(create: (context) => SolutionProvider.parse('''
ChangeNotifierProvider(create: (context) => SchemeProvider.parse('''
{
"name": "test",
"desc": "some desc",
@@ -66,7 +66,7 @@ class _HomePageState extends State<HomePage> {
}
''')),
ChangeNotifierProvider(create: (context) => GesturePropProvider.empty()),
ChangeNotifierProvider(create: (context) => LocalSolutionsProvider(),lazy: false),
ChangeNotifierProvider(create: (context) => LocalSchemesProvider(),lazy: false),
],
child: Column(
mainAxisSize: MainAxisSize.max,
+6 -6
View File
@@ -1,8 +1,8 @@
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/local_solutions_provider.dart';
import 'package:dde_gesture_manager/models/solution.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/widgets/dde_button.dart';
import 'package:flutter/animation.dart';
import 'package:flutter/cupertino.dart';
@@ -39,7 +39,7 @@ class _LocalManagerState extends State<LocalManager> {
@override
Widget build(BuildContext context) {
var isOpen = context.watch<ContentLayoutProvider>().localManagerOpened == true;
var localSolutions = context.watch<LocalSolutionsProvider>().solutions ?? [];
var localschemes = context.watch<LocalSchemesProvider>().schemes ?? [];
return AnimatedContainer(
duration: mediumDuration,
curve: Curves.easeInOut,
@@ -91,7 +91,7 @@ class _LocalManagerState extends State<LocalManager> {
controller: _scrollController,
itemBuilder: (context, index) => GestureDetector(
onDoubleTap: () {
context.read<SolutionProvider>().copyFrom(localSolutions[index].solution);
context.read<SchemeProvider>().copyFrom(localschemes[index].scheme);
setState(() {
_selectedIndex = index;
});
@@ -115,7 +115,7 @@ class _LocalManagerState extends State<LocalManager> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(localSolutions[index].solution.name ?? ''),
Text(localschemes[index].scheme.name ?? ''),
Text('456'),
],
),
@@ -123,7 +123,7 @@ class _LocalManagerState extends State<LocalManager> {
),
),
),
itemCount: localSolutions.length,
itemCount: localschemes.length,
),
),
Container(