Bugfixes/back hero animation

ecommers/i18n/en-US.json

@@ -69,7 +69,6 @@
     "fieldError": "field should not be empty.",
     "notificationsTitle": "Notifications",
     "yesterday": "Yesterday",
-    "empty": "",
     "delete": "Delete",
     "notBankCards": "You have no credit cards added",
     "paymentMethodTitle":"Payment Method",
@@ -80,5 +79,7 @@
     "exprDatePlaceHolder": "05/23",
     "cvc": "CVC",
     "addCardDetails": "ADD CARD DETAILS",
-    "selectCreditCard": "Select credit card"
+    "selectCreditCard": "Select credit card",
+    "messageToSeller" : "Message to seller (optional)",
+    "empty": ""
 }

ecommers/lib/core/app_services/payment_method_service.dart

@@ -1,5 +1,5 @@
+import 'package:ecommers/core/models/cache_wrappers/payment_method_wrapper.dart';
 import 'package:ecommers/core/models/payment_method_model.dart';
-import 'package:ecommers/core/models/payment_method_wrapper.dart';
 import 'package:ecommers/core/services/dependency_service.dart';
 import 'package:stripe_payment/stripe_payment.dart';
 
@@ -33,7 +33,7 @@ class PaymentMethodService {
       final paymentMethodModel =
           PaymentMethodModel.fromStripePaymentMethod(paymentMethod);
 
-      await paymentMethodRepository.addPaymentMethod(
+      await paymentMethodRepository.add(
         PaymentMethodWrapper.fromPaymentMethod(paymentMethodModel),
       );
 
@@ -44,13 +44,13 @@ class PaymentMethodService {
   }
 
   Future removePaymentMethod(PaymentMethodModel paymentMethodModel) async {
-    await paymentMethodRepository.removePaymentMethod(
+    await paymentMethodRepository.remove(
       PaymentMethodWrapper.fromPaymentMethod(paymentMethodModel),
     );
   }
 
   Future editPaymentMethod(PaymentMethodModel paymentMethodModel) async {
-    await paymentMethodRepository.editPaymentMethod(
+    await paymentMethodRepository.edit(
       PaymentMethodWrapper.fromPaymentMethod(paymentMethodModel),
     );
   }

ecommers/lib/core/common/cache_defines.dart

@@ -2,4 +2,5 @@ class CacheDefines {
   static const String categories = 'categories';
   static const String latestProducts = 'latestProducts';
   static const String paymentMethods = 'paymentMethods';
+  static const String orders = 'orders';
 }

ecommers/lib/core/models/cache_wrappers/order_model_wrapper.dart

@@ -0,0 +1,32 @@
+import 'package:ecommers/core/models/cache_wrappers/wrapper.dart';
+import 'package:ecommers/core/models/index.dart';
+import 'package:ecommers/core/services/index.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'order_model_wrapper.g.dart';
+
+@JsonSerializable()
+class OrderModelWrapper implements Wrapper{
+  @override
+  final int id;
+  final int userId;
+  final OrderModel order;
+
+  OrderModelWrapper({
+    this.id,
+    this.userId,
+    this.order,
+  });
+
+  factory OrderModelWrapper.fromOrderModel(
+      OrderModel order) {
+    return OrderModelWrapper(
+      id: order.product.id,
+      userId: membershipService.id,
+      order: order,
+    );
+  }
+  static const fromJson = _$OrderModelWrapperFromJson;
+
+  Map<String, dynamic> toJson() => _$OrderModelWrapperToJson(this);
+}

ecommers/lib/core/models/payment_method_wrapper.dart → ecommers/lib/core/models/cache_wrappers/payment_method_wrapper.dart

@@ -1,11 +1,13 @@
+import 'package:ecommers/core/models/cache_wrappers/wrapper.dart';
 import 'package:ecommers/core/models/payment_method_model.dart';
 import 'package:ecommers/core/services/dependency_service.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'payment_method_wrapper.g.dart';
 
 @JsonSerializable()
-class PaymentMethodWrapper {
+class PaymentMethodWrapper implements Wrapper{
+  @override
   final String id;
   final int userId;
   final PaymentMethodModel paymentMethodModel;

ecommers/lib/core/models/cache_wrappers/wrapper.dart

@@ -0,0 +1,5 @@
+class Wrapper {
+  final dynamic id;
+
+  Wrapper(this.id);
+}

ecommers/lib/core/models/order_model.dart

@@ -5,33 +5,24 @@ part 'order_model.g.dart';
 
 @JsonSerializable()
 class OrderModel {
-  final int id;
-  final String title;
-  final String description;
-  final String imagePath;
-  final double cost;
+  final Product product;
+  final String characteristics;
   int count;
 
   OrderModel({
-    this.id,
-    this.description,
-    this.cost,
-    this.imagePath,
-    this.title,
-    this.count,
+    this.product,
+    this.characteristics,
+    this.count = 1,
   });
 
   static const fromJson = _$OrderModelFromJson;
 
-  factory OrderModel.fromProduct(Product product) {
+  factory OrderModel.fromProduct({Product product, String size, String color}) {
     return OrderModel(
-      id: product.id,
-      imagePath: product.previewImage,
-      title: product.title,
-      cost: product.price,
-      description: 'Medium, Green 3',
+      product: product,
+      characteristics: '$size, $color',
       count: 1,
-    ); //todo change mapping after refactoring productPage
+    );
   }
 
   Map<String, dynamic> toJson() => _$OrderModelToJson(this);

ecommers/lib/core/models/product_color_model.dart

@@ -4,11 +4,13 @@ import 'package:meta/meta.dart';
 class ProductColorModel {
   bool isSelected;
   final int color;
+  final String title;
   final List<CarouselImage> images;
 
   ProductColorModel({
     @required this.color,
     @required this.images,
     this.isSelected = false,
+    this.title,
   });
 }

ecommers/lib/core/provider_models/cart_provider.dart

@@ -1,3 +1,4 @@
+import 'package:ecommers/core/models/cache_wrappers/order_model_wrapper.dart';
 import 'package:ecommers/core/models/index.dart';
 import 'package:ecommers/core/services/dependency_service.dart';
 import 'package:flutter/widgets.dart';
@@ -9,31 +10,31 @@ class CartProvider extends ChangeNotifier {
   int get orderCount => _orders.length;
 
   Future remove(OrderModel order, {int count = 1}) async {
-    final editOrder = _getOrder(order.id);
+    final editOrder = _getOrder(order.product.id);
 
     if (editOrder == null) {
       return;
     }
 
     if (editOrder.count > count) {
       editOrder.count = editOrder.count - count;
-      await cartRepository.editOrder(order);
+      await cartRepository.edit(OrderModelWrapper.fromOrderModel(order));
     } else {
       _orders.remove(editOrder);
-      await cartRepository.removeOrder(order);
+      await cartRepository.remove(OrderModelWrapper.fromOrderModel(order));
     }
     notifyListeners();
   }
 
   Future add(OrderModel order) async {
-    final editOrder = _getOrder(order.id);
+    final editOrder = _getOrder(order.product.id);
 
     if (editOrder == null) {
       _orders.add(order);
-      await cartRepository.addOrder(order);
+      await cartRepository.add(OrderModelWrapper.fromOrderModel(order));
     } else {
       editOrder.count++;
-      await cartRepository.editOrder(order);
+      await cartRepository.edit(OrderModelWrapper.fromOrderModel(order));
     }
     notifyListeners();
   }
@@ -52,7 +53,7 @@ class CartProvider extends ChangeNotifier {
     final double totalCost = _orders.fold(
         0.0,
         (totalOrderCost, nextOrder) =>
-            totalOrderCost + nextOrder.count * nextOrder.cost);
+            totalOrderCost + nextOrder.count * nextOrder.product.price);
 
     return totalCost * (100 - salePercent) / 100;
   }
@@ -63,5 +64,5 @@ class CartProvider extends ChangeNotifier {
   }
 
   OrderModel _getOrder(int id) =>
-      _orders.firstWhere((o) => o.id == id, orElse: () => null);
+      _orders.firstWhere((o) => o.product.id == id, orElse: () => null);
 }

ecommers/lib/core/provider_models/payment_method_provider_model.dart

@@ -1,4 +1,3 @@
-import 'package:ecommers/core/common/index.dart';
 import 'package:ecommers/core/models/payment_method_model.dart';
 import 'package:ecommers/core/services/dependency_service.dart';
 import 'package:flutter/material.dart';

ecommers/lib/core/provider_models/product_page_provider_model.dart

@@ -6,7 +6,10 @@ import 'package:ecommers/ui/widgets/right_menu_bar/models/index.dart';
 import 'package:flutter/widgets.dart';
 
 class ProductPageProviderModel extends ProviderModelBase {
+  static  const String undefineTagValue = 'undef';
+
   final Product _productModel;
+  dynamic heroImageTag;
 
   List<CarouselImage> _images;
   List<CarouselImage> get images => _images;
@@ -24,30 +27,42 @@ class ProductPageProviderModel extends ProviderModelBase {
   String get skuId => _skuId;
   set skuId(String skuId) => _skuId = skuId ?? '';
 
+  String get selectSize => _sizes.firstWhere((element) => element.isSelected,  orElse: () => sizes[0]).size;
+  String get selectColor => _colors.firstWhere((element) => element.isSelected,  orElse: () => _colors[0]).title;
+
   ProductPageProviderModel(this._productModel, {@required BuildContext context})
       : super(context) {
     _initProductImages();
     _initProductTab();
     _saveRecentProduct();
+    heroImageTag = _productModel.id;
   }
 
   void updateImages(List<CarouselImage> assets) {
     images = assets;
     notifyListeners();
   }
 
+  void navigateToCart() {
+    const int shellCartIndex = 2;
+
+    heroImageTag = undefineTagValue;
+    notifyListeners();
+
+    navigationService.goBackToShell(index: shellCartIndex);
+  }
+
   void _initProductImages() {
     if (_productModel?.models?.isNotEmpty == true &&
         _productModel.models[0] != null &&
         _productModel.models[0].imageUrls?.isNotEmpty == true) {
       images = [
         CarouselImage(
-            tag: _productModel.id,
             path: _productModel.models[0].imageUrls.first,
             previewImage: _productModel.previewImage),
         ..._productModel.models[0].imageUrls
             .skip(1)
-            .map((url) => CarouselImage(tag: _productModel.id, path: url))
+            .map((url) => CarouselImage(path: url))
             .toList()
       ];
     }
@@ -105,8 +120,9 @@ class ProductPageProviderModel extends ProviderModelBase {
   ProductColorModel _covertToProductColorModel(ProductModel product) {
     return ProductColorModel(
         color: product?.color?.argb ?? 0,
+        title: product?.color?.title,
         images: product.imageUrls
-            ?.map((url) => CarouselImage(tag: _productModel?.id, path: url))
+            ?.map((url) => CarouselImage(path: url))
             ?.toList());
   }
 

ecommers/lib/core/repositories/cart_repository.dart

@@ -1,32 +1,31 @@
+import 'package:ecommers/core/common/index.dart';
+import 'package:ecommers/core/models/cache_wrappers/order_model_wrapper.dart';
 import 'package:ecommers/core/models/index.dart';
+import 'package:ecommers/core/repositories/index.dart';
 import 'package:ecommers/core/services/index.dart';
 
-class CartRepository {
-  static const filterField = 'id';
+class CartRepository extends RepositoryBase<OrderModelWrapper> {
+  static const filterFieldUserId = 'userId';
+  static const filterFieldOrderId = 'id';
+  CartRepository()
+      : super(
+          filterFieldForItem: filterFieldOrderId,
+          filterFieldForUser: filterFieldUserId,
+          repositoryKey: CacheDefines.orders,
+        );
 
   Future<List<OrderModel>> getAllOrders() async {
-    return cacheDatabase.getAll(
-        membershipService.id.toString(), OrderModel.fromJson);
-  }
-
-  Future dropOrders() async {
-    await cacheDatabase.dropData(membershipService.id.toString());
-  }
+    final oederWrappers = await cacheDatabase.getByEqualsFilter(
+        repositoryKey,
+        OrderModelWrapper.fromJson,
+        {filterFieldUserId: membershipService.id});
 
-  Future editOrder(OrderModel order) async {
-    await cacheDatabase.updateByEqualsFilter(membershipService.id.toString(),
-        order.toJson(), {filterField: order.id});
+    return oederWrappers.map((e) => e.order).toList();
   }
 
-  Future addOrder(OrderModel order) async {
-    await cacheDatabase.saveMap(
-      membershipService.id.toString(),
-      order.toJson(),
-    );
+  Future dropOrders() async {
+    await cacheDatabase.deleteDataByFilter(repositoryKey, {
+      filterFieldForUser: membershipService.id}); 
   }
 
-  Future removeOrder(OrderModel order) async {
-    await cacheDatabase.deleteDataByFilter(
-        membershipService.id.toString(), {filterField: order.id});
-  }
 }

ecommers/lib/core/repositories/index.dart

@@ -1,3 +1,4 @@
 export 'cart_repository.dart';
 export 'category_data_repository.dart';
 export 'payment_method_repository.dart';
+export 'repository_base.dart';