Fixed : #346 (#347)

Author: nathanvandeperre97

CHANGELOG.md

@@ -157,6 +157,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Progression : user can now see the progress bar
 - Tabbar : lists menu tabbar is now bigger
 - Quantity : a message is now displayed if the quantity of an item is set to 0
+- Item creation : user can now create new items and define the properties
 
 ### Security
 

lib/main.dart

@@ -20,6 +20,7 @@ import 'package:MobileOne/providers/recipes_provider.dart';
 import 'package:MobileOne/providers/share_provider.dart';
 import 'package:MobileOne/providers/user_picture_provider.dart';
 import 'package:MobileOne/providers/wishlist_head_provider.dart';
+import 'package:MobileOne/providers/wishlist_item_provider.dart';
 import 'package:MobileOne/providers/wishlistsList_provider.dart';
 import 'package:MobileOne/pages/share.dart';
 import 'package:MobileOne/pages/share_one.dart';
@@ -96,6 +97,7 @@ void instantiateServices() {
   getIt.registerSingleton(PackageInfoProvider());
 
   getIt.registerSingleton(ShareService());
+  getIt.registerSingleton(WishlistItemProvider());
 }
 
 void main() async {

lib/pages/items_page.dart

@@ -61,12 +61,15 @@ class EditItemPageState extends State<EditItemPage> {
   @override
   Widget build(BuildContext context) {
     _args = Arguments.value(context);
+    GetIt.I
+        .get<WishlistItemProvider>()
+        .fetchItem(_args.listUuid, _args.itemUuid);
     return ChangeNotifierProvider.value(
-      value: WishlistItemProvider(_args.listUuid, _args.itemUuid),
+      value: GetIt.I.get<WishlistItemProvider>(),
       child: Consumer<WishlistItemProvider>(
         builder: (context, provider, _) {
           return Scaffold(
-            appBar: buildAppBar(provider),
+            appBar: buildAppBar(provider, _args),
             backgroundColor: _colorsApp.colorTheme,
             body: Column(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -106,15 +109,15 @@ class EditItemPageState extends State<EditItemPage> {
     );
   }
 
-  AppBar buildAppBar(WishlistItemProvider provider) {
+  AppBar buildAppBar(WishlistItemProvider provider, ItemArguments _args) {
     return AppBar(
       backgroundColor: _colorsApp.colorTheme,
       leading: IconButton(
         icon: Icon(
           Icons.arrow_back,
         ),
         onPressed: () {
-          goToPreviousPage();
+          goToPreviousPage(provider);
         },
       ),
       actions: [
@@ -123,7 +126,7 @@ class EditItemPageState extends State<EditItemPage> {
             Icons.check,
           ),
           onPressed: () {
-            _onValidate(provider);
+            _onValidate(provider, _args);
           },
         ),
       ],
@@ -292,15 +295,16 @@ class EditItemPageState extends State<EditItemPage> {
     });
   }
 
-  _onValidate(WishlistItemProvider provider) async {
+  _onValidate(WishlistItemProvider provider, ItemArguments _args) async {
     if (!provider.canValidate()) {
       Fluttertoast.showToast(msg: getString(context, "popup_alert"));
     } else {
-      waitForImageUpload(provider);
+      waitForImageUpload(provider, _args);
     }
   }
 
-  void waitForImageUpload(WishlistItemProvider provider) async {
+  void waitForImageUpload(
+      WishlistItemProvider provider, ItemArguments _args) async {
     if (_pickedImage != null) {
       StorageReference ref = getStorageRef(provider);
       StorageUploadTask uploadTask = uploadItemPicture(ref);
@@ -309,27 +313,28 @@ class EditItemPageState extends State<EditItemPage> {
       provider.imageUrl = fileURL;
     }
 
-    bool update = provider.itemUuid != null;
+    bool update = _args.itemUuid != null;
     if (update) {
-      updapteItemInList(provider);
+      updapteItemInList(provider, _args);
     } else {
-      addItemToList(provider);
+      addItemToList(provider, _args);
     }
   }
 
-  void updapteItemInList(WishlistItemProvider provider) async {
+  void updapteItemInList(
+      WishlistItemProvider provider, ItemArguments _args) async {
     _analytics.sendAnalyticsEvent("update_item");
 
-    provider.updateItemInList();
+    provider.updateItemInList(_args.listUuid, _args.itemUuid);
 
     FocusScope.of(context).unfocus();
     Navigator.of(context).pop(true);
   }
 
-  void addItemToList(WishlistItemProvider provider) async {
+  void addItemToList(WishlistItemProvider provider, ItemArguments _args) async {
     _analytics.sendAnalyticsEvent("add_item");
 
-    await provider.addItemTolist();
+    await provider.addItemTolist(_args.listUuid);
 
     FocusScope.of(context).unfocus();
     Navigator.of(context).pop(true);
@@ -366,7 +371,8 @@ class EditItemPageState extends State<EditItemPage> {
     }
   }
 
-  goToPreviousPage() {
+  goToPreviousPage(WishlistItemProvider provider) {
+    provider.uninitialise();
     Navigator.of(context).pop(false);
   }
 }

lib/providers/wishlist_item_provider.dart

@@ -5,32 +5,30 @@ import 'package:get_it/get_it.dart';
 
 class WishlistItemProvider with ChangeNotifier {
   WishlistService wishlistService = GetIt.I.get();
-  final String listUuid;
-  final String itemUuid;
 
   var label = "";
   var quantity = 1;
   var _unit = 1;
   var _imageUrl;
   var _imageName;
-
-  WishlistItemProvider(this.listUuid, this.itemUuid) {
-    _fetchItem();
-  }
-
-  void _fetchItem() {
-    var _item = itemUuid != null
-        ? wishlistService
-            .getItemList(listUuid)
-            .where((element) => element.uuid == itemUuid)
-            .first
-        : emptyItem();
-
-    label = _item.label;
-    quantity = _item.quantity;
-    _unit = _item.unit;
-    _imageUrl = _item.imageUrl;
-    _imageName = _item.imageName;
+  bool _isInitialised = false;
+
+  void fetchItem(String listUuid, String itemUuid) {
+    if (!_isInitialised) {
+      var _item = itemUuid != null
+          ? wishlistService
+              .getItemList(listUuid)
+              .where((element) => element.uuid == itemUuid)
+              .first
+          : emptyItem();
+
+      label = _item.label;
+      quantity = _item.quantity;
+      _unit = _item.unit;
+      _imageUrl = _item.imageUrl;
+      _imageName = _item.imageName;
+      _isInitialised = true;
+    }
   }
 
   set audioLabel(value) {
@@ -75,7 +73,7 @@ class WishlistItemProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> updateItemInList() async {
+  Future<void> updateItemInList(String listUuid, String itemUuid) async {
     await wishlistService.updateItemInList(
         itemUuid: itemUuid,
         name: label,
@@ -84,21 +82,23 @@ class WishlistItemProvider with ChangeNotifier {
         imageLink: _imageUrl,
         listUuid: listUuid,
         imageName: _imageName);
+    _isInitialised = false;
     notifyListeners();
   }
 
   bool canValidate() {
     return label.isNotEmpty;
   }
 
-  Future<void> addItemTolist() async {
+  Future<void> addItemTolist(String listUuid) async {
     await wishlistService.addItemTolist(
         name: label,
         count: quantity,
         typeIndex: _unit,
         imageLink: _imageUrl,
         listUuid: listUuid,
         imageName: _imageName);
+    _isInitialised = false;
     notifyListeners();
   }
 
@@ -113,4 +113,9 @@ class WishlistItemProvider with ChangeNotifier {
     quantity -= 1;
     notifyListeners();
   }
+
+  void uninitialise() {
+    _isInitialised = false;
+    notifyListeners();
+  }
 }

lib/widgets/widget_item.dart

@@ -166,6 +166,21 @@ class WidgetItemState extends State<WidgetItem> {
       case 4:
         return getString(context, 'item_kilos');
         break;
+      case 5:
+        return getString(context, "item_packs");
+        break;
+      case 6:
+        return getString(context, "item_boxes");
+        break;
+      case 7:
+        return getString(context, "item_bottles");
+        break;
+      case 8:
+        return getString(context, "item_cans");
+        break;
+      case 9:
+        return getString(context, "item_cartons");
+        break;
       default:
         return getString(context, 'item_unit');
         break;