Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

05be9c3c · Mobile : Garn (Flutter) · 87a3a42d · 600ae026 · 05be9c3c · 05be9c3c
Commit 05be9c3c authored Jul 02, 2020 by Mobile : Garn (Flutter)
9 changed files
--- a/assets/images/btn_order.png
+++ b/assets/images/btn_order.png
--- a/assets/images/ic_NotInUse.png
+++ b/assets/images/ic_NotInUse.png
--- a/assets/images/ic_check.png
+++ b/assets/images/ic_check.png
--- a/assets/images/ic_like.png
+++ b/assets/images/ic_like.png
--- a/lib/ui/favorite/favorite.dart
+++ b/lib/ui/favorite/favorite.dart
--- a/lib/ui/my_order_status/my_order_status.dart
+++ b/lib/ui/my_order_status/my_order_status.dart
--- a/lib/ui/payment/payment_detail.dart
+++ b/lib/ui/payment/payment_detail.dart
--- a/lib/ui/payment/payment_page.dart
+++ b/lib/ui/payment/payment_page.dart
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,42 +7,42 @@ packages:
      name: archive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
  args:
    dependency: transitive
    description:
      name: args
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
  charcode:
    dependency: transitive
    description:
      name: charcode
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
  collection:
    dependency: transitive
    description:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
  convert:
    dependency: transitive
    description:
@@ -56,7 +56,7 @@ packages:
      name: crypto
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -87,7 +87,7 @@ packages:
      name: image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
  matcher:
    dependency: transitive
    description:
@@ -109,13 +109,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
  petitparser:
    dependency: transitive
    description:
@@ -129,7 +122,7 @@ packages:
      name: quiver
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
  sky_engine:
    dependency: transitive
    description: flutter
@@ -141,7 +134,7 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
  stack_trace:
    dependency: transitive
    description:
@@ -176,7 +169,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
  typed_data:
    dependency: transitive
    description:
@@ -197,6 +190,6 @@ packages:
      name: xml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
 sdks:
  dart: ">=2.6.0 <3.0.0"