From 7304484369028fa3782de65993f102e6a0d04ffb Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 6 Apr 2020 23:51:46 +1000 Subject: [PATCH] Refactoring --- lib/barcode.dart | 8 ++++---- lib/widget/category_display.dart | 10 ++++++++-- lib/widget/company_detail.dart | 6 ++++++ lib/widget/location_display.dart | 4 ++-- lib/widget/{part_display.dart => part_detail.dart} | 6 +++--- lib/widget/{stock_display.dart => stock_detail.dart} | 10 +++++----- 6 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 lib/widget/company_detail.dart rename lib/widget/{part_display.dart => part_detail.dart} (95%) rename lib/widget/{stock_display.dart => stock_detail.dart} (93%) diff --git a/lib/barcode.dart b/lib/barcode.dart index 7716d7de..975fd088 100644 --- a/lib/barcode.dart +++ b/lib/barcode.dart @@ -6,9 +6,9 @@ import 'package:InvenTree/inventree/stock.dart'; import 'package:InvenTree/inventree/part.dart'; import 'package:InvenTree/widget/location_display.dart'; -import 'package:InvenTree/widget/part_display.dart'; +import 'package:InvenTree/widget/part_detail.dart'; import 'package:InvenTree/widget/category_display.dart'; -import 'package:InvenTree/widget/stock_display.dart'; +import 'package:InvenTree/widget/stock_detail.dart'; import 'dart:convert'; @@ -59,12 +59,12 @@ void _handleInvenTreeBarcode(BuildContext context, Map data) { } else if (codeType == 'stockitem') { InvenTreeStockItem().get(pk).then((var item) { - Navigator.push(context, MaterialPageRoute(builder: (context) => StockItemDisplayWidget(item))); + Navigator.push(context, MaterialPageRoute(builder: (context) => StockDetailWidget(item))); }); } else if (codeType == 'part') { InvenTreePart().get(pk).then((var part) { Navigator.push(context, - MaterialPageRoute(builder: (context) => PartDisplayWidget(part))); + MaterialPageRoute(builder: (context) => PartDetailWidget(part))); }); } } \ No newline at end of file diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart index 12cadf68..7f7f47d2 100644 --- a/lib/widget/category_display.dart +++ b/lib/widget/category_display.dart @@ -3,7 +3,7 @@ import 'package:InvenTree/api.dart'; import 'package:InvenTree/inventree/part.dart'; import 'package:InvenTree/preferences.dart'; -import 'package:InvenTree/widget/part_display.dart'; +import 'package:InvenTree/widget/part_detail.dart'; import 'package:InvenTree/widget/drawer.dart'; import 'package:flutter/cupertino.dart'; @@ -164,6 +164,9 @@ class _CategoryDisplayState extends State { InvenTreePreferences().expandCategoryList = !InvenTreePreferences().expandCategoryList; }); }, + onLongPress: () { + // TODO - Context menu for e.g. creating a new PartCategory + }, ); }, body: SubcategoryList(_subcategories), @@ -180,6 +183,9 @@ class _CategoryDisplayState extends State { InvenTreePreferences().expandPartList = !InvenTreePreferences().expandPartList; }); }, + onLongPress: () { + // TODO - Context menu for e.g. creating a new Part + }, ); }, body: PartList(_parts), @@ -249,7 +255,7 @@ class PartList extends StatelessWidget { InvenTreePart().get(pk).then((var part) { if (part is InvenTreePart) { - Navigator.push(context, MaterialPageRoute(builder: (context) => PartDisplayWidget(part))); + Navigator.push(context, MaterialPageRoute(builder: (context) => PartDetailWidget(part))); } }); } diff --git a/lib/widget/company_detail.dart b/lib/widget/company_detail.dart new file mode 100644 index 00000000..42478769 --- /dev/null +++ b/lib/widget/company_detail.dart @@ -0,0 +1,6 @@ + +import 'package:flutter/cupertino.dart'; + +class CompanyDetailWidget extends StatefulWidget { + +} \ No newline at end of file diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart index 90e2afff..fa1456ac 100644 --- a/lib/widget/location_display.dart +++ b/lib/widget/location_display.dart @@ -2,7 +2,7 @@ import 'package:InvenTree/api.dart'; import 'package:InvenTree/inventree/stock.dart'; import 'package:InvenTree/preferences.dart'; import 'package:InvenTree/widget/drawer.dart'; -import 'package:InvenTree/widget/stock_display.dart'; +import 'package:InvenTree/widget/stock_detail.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; @@ -246,7 +246,7 @@ class StockList extends StatelessWidget { void _openItem(BuildContext context, int pk) { InvenTreeStockItem().get(pk).then((var item) { if (item is InvenTreeStockItem) { - Navigator.push(context, MaterialPageRoute(builder: (context) => StockItemDisplayWidget(item))); + Navigator.push(context, MaterialPageRoute(builder: (context) => StockDetailWidget(item))); } }); } diff --git a/lib/widget/part_display.dart b/lib/widget/part_detail.dart similarity index 95% rename from lib/widget/part_display.dart rename to lib/widget/part_detail.dart index d987d91b..13a7d498 100644 --- a/lib/widget/part_display.dart +++ b/lib/widget/part_detail.dart @@ -9,9 +9,9 @@ import 'package:InvenTree/api.dart'; import 'package:InvenTree/widget/drawer.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -class PartDisplayWidget extends StatefulWidget { +class PartDetailWidget extends StatefulWidget { - PartDisplayWidget(this.part, {Key key}) : super(key: key); + PartDetailWidget(this.part, {Key key}) : super(key: key); final InvenTreePart part; @@ -21,7 +21,7 @@ class PartDisplayWidget extends StatefulWidget { } -class _PartDisplayState extends State { +class _PartDisplayState extends State { _PartDisplayState(this.part) { // TODO diff --git a/lib/widget/stock_display.dart b/lib/widget/stock_detail.dart similarity index 93% rename from lib/widget/stock_display.dart rename to lib/widget/stock_detail.dart index 6a4c5938..507cb72a 100644 --- a/lib/widget/stock_display.dart +++ b/lib/widget/stock_detail.dart @@ -3,7 +3,7 @@ import 'package:InvenTree/inventree/stock.dart'; import 'package:InvenTree/inventree/part.dart'; import 'package:InvenTree/widget/location_display.dart'; -import 'package:InvenTree/widget/part_display.dart'; +import 'package:InvenTree/widget/part_detail.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -12,9 +12,9 @@ import 'package:InvenTree/api.dart'; import 'package:InvenTree/widget/drawer.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -class StockItemDisplayWidget extends StatefulWidget { +class StockDetailWidget extends StatefulWidget { - StockItemDisplayWidget(this.item, {Key key}) : super(key: key); + StockDetailWidget(this.item, {Key key}) : super(key: key); final InvenTreeStockItem item; @@ -23,7 +23,7 @@ class StockItemDisplayWidget extends StatefulWidget { } -class _StockItemDisplayState extends State { +class _StockItemDisplayState extends State { _StockItemDisplayState(this.item) { // TODO @@ -64,7 +64,7 @@ class _StockItemDisplayState extends State { if (item.partId > 0) { InvenTreePart().get(item.partId).then((var part) { if (part is InvenTreePart) { - Navigator.push(context, MaterialPageRoute(builder: (context) => PartDisplayWidget(part))); + Navigator.push(context, MaterialPageRoute(builder: (context) => PartDetailWidget(part))); } }); }