From f365654bb510a3968abf8090f6c277590774ae86 Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Mon, 18 Dec 2023 20:18:28 +0200 Subject: [PATCH 1/5] bugs fixed, now products are displayed correctly --- lib/models/product.dart | 12 +++++------ pubspec.lock | 48 ++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/models/product.dart b/lib/models/product.dart index f024e27..6930f02 100644 --- a/lib/models/product.dart +++ b/lib/models/product.dart @@ -1,4 +1,4 @@ -import 'dart:ffi'; +//import 'dart:ffi'; class Product { Product({ @@ -25,9 +25,9 @@ class Product { : id = json['id'] as String, name = json['name'] as String, url = json['url'] as String, - imageUrls = json['imageUrls'] as List, - rating = json['rating'] as double, - price = json['name'] as double, - description = json['description'] as String, - wasOpened = json['wasOpened'] as bool; + imageUrls = (json['imageUrls'] is Null) ? [''] : json['imageUrls'] as List, + rating = (json['rating'] is int) ? (json['rating'] as int).toDouble() : json['rating'] as double, + price = (json['price'] is int) ? (json['price'] as int).toDouble() : json['price'] as double, + description = (json['description'] is Null) ? '' : json['description'] as String, + wasOpened = (json['wasOpened'] is Null) ? false : json['wasOpened'] as bool; } \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 19bca57..bb2f44b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" connectivity_plus: dependency: transitive description: @@ -244,10 +244,10 @@ packages: dependency: "direct main" description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.0" http_parser: dependency: transitive description: @@ -308,10 +308,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" nm: dependency: transitive description: @@ -396,10 +396,10 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "5.4.0" platform: dependency: transitive description: @@ -468,10 +468,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: @@ -497,18 +497,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -529,10 +529,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" typed_data: dependency: transitive description: @@ -593,10 +593,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.0" url_launcher_windows: dependency: transitive description: @@ -649,10 +649,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -681,10 +681,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.3.0" yaml: dependency: transitive description: @@ -694,5 +694,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.1.4 <4.0.0" + flutter: ">=3.13.0" From 6cbe514192a76d00c8a57f30a235d50f83a3c2c2 Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Mon, 18 Dec 2023 23:56:17 +0200 Subject: [PATCH 2/5] default image added --- assets/img/default-white.png | Bin 0 -> 1145 bytes lib/screens/cart.dart | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 assets/img/default-white.png diff --git a/assets/img/default-white.png b/assets/img/default-white.png new file mode 100644 index 0000000000000000000000000000000000000000..d13a4df7070961f8659464db2b3edbef71aa9fab GIT binary patch literal 1145 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)K$^Ea{HEjtmSN`?>!lvI4mVo-U3d z6>)E`ZWLrtK-Vt>Z}%gv&mA_a|U$M4Lv+{?8_{72$ftqpMx*65o>G=Ap|Tgc?n zm>?K>`%O}6gXV>!NxNQ!H!oE`z``MRIds32jxD2_!-g5_eqBv?$!WmYbhPB^dNyzW z22KH;WvlBS-kmpq~d}#z_NtF)78&qol`;+05&Yw4*&oF literal 0 HcmV?d00001 diff --git a/lib/screens/cart.dart b/lib/screens/cart.dart index 015f790..2e3cb05 100644 --- a/lib/screens/cart.dart +++ b/lib/screens/cart.dart @@ -177,7 +177,23 @@ class CartItem extends StatelessWidget{ Container( width: 100, alignment: Alignment.center, - child: Image(image: NetworkImage(_product.imageUrls[0]),), + child: Image.network( + _product.imageUrls[0], + loadingBuilder: (BuildContext context, Widget child, ImageChunkEvent? loadingProgress) { + if (loadingProgress == null) return child; + return Center( + child: CircularProgressIndicator( + value: loadingProgress.expectedTotalBytes != null + ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes! + : null, + ), + ); + }, + errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) { + // Повертає зображення за замовчуванням у випадку помилки + return Image.asset('../assets/img/default-white.png'); + }, + ), ), SizedBox(width: 20), Expanded( From a99e181412c57ca07b41b01d00f1b9b415212e9b Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Tue, 19 Dec 2023 01:06:28 +0200 Subject: [PATCH 3/5] cache image library added --- pubspec.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pubspec.yaml | 1 + 2 files changed, 65 insertions(+) diff --git a/pubspec.lock b/pubspec.lock index bb2f44b..611ac12 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -25,6 +25,30 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + cached_network_image: + dependency: "direct main" + description: + name: cached_network_image + sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f + url: "https://pub.dev" + source: hosted + version: "3.3.0" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257" + url: "https://pub.dev" + source: hosted + version: "1.1.0" characters: dependency: transitive description: @@ -118,6 +142,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + url: "https://pub.dev" + source: hosted + version: "3.3.1" flutter_hooks: dependency: transitive description: @@ -328,6 +360,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.8.2+1" + octo_image: + dependency: transitive + description: + name: octo_image + sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" + url: "https://pub.dev" + source: hosted + version: "2.0.0" path: dependency: transitive description: @@ -493,6 +533,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sqflite: + dependency: transitive + description: + name: sqflite + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6 + url: "https://pub.dev" + source: hosted + version: "2.5.0+2" stack_trace: dependency: transitive description: @@ -517,6 +573,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + url: "https://pub.dev" + source: hosted + version: "3.1.0+1" term_glyph: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5c7ea09..7c2feb7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,6 +33,7 @@ dependencies: flutter_spinkit: ^5.0.0 logger: ^2.0.2+1 url_launcher: ^6.0.12 + cached_network_image: ^3.3.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From d1e8f3c4f2351d6488539c3cc21956276677ecfd Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Tue, 19 Dec 2023 01:22:45 +0200 Subject: [PATCH 4/5] Changed method for displaying images --- lib/screens/cart.dart | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/screens/cart.dart b/lib/screens/cart.dart index 2e3cb05..6627c90 100644 --- a/lib/screens/cart.dart +++ b/lib/screens/cart.dart @@ -1,3 +1,4 @@ +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:graphql/client.dart'; @@ -177,22 +178,10 @@ class CartItem extends StatelessWidget{ Container( width: 100, alignment: Alignment.center, - child: Image.network( - _product.imageUrls[0], - loadingBuilder: (BuildContext context, Widget child, ImageChunkEvent? loadingProgress) { - if (loadingProgress == null) return child; - return Center( - child: CircularProgressIndicator( - value: loadingProgress.expectedTotalBytes != null - ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes! - : null, - ), - ); - }, - errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) { - // Повертає зображення за замовчуванням у випадку помилки - return Image.asset('../assets/img/default-white.png'); - }, + child: CachedNetworkImage( + imageUrl: _product.imageUrls[0], + placeholder: (context, url) => CircularProgressIndicator(), + errorWidget: (context, url, error) => Image.asset('../assets/img/default-white.png'), ), ), SizedBox(width: 20), From c29a10c74936d6960a5a7b63cbf9d3fd739dc80f Mon Sep 17 00:00:00 2001 From: Mykyta Dubovyi Date: Tue, 19 Dec 2023 02:17:28 +0200 Subject: [PATCH 5/5] Changed method for displaying images --- lib/screens/cart.dart | 2 +- pubspec.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/screens/cart.dart b/lib/screens/cart.dart index 6627c90..27b1072 100644 --- a/lib/screens/cart.dart +++ b/lib/screens/cart.dart @@ -181,7 +181,7 @@ class CartItem extends StatelessWidget{ child: CachedNetworkImage( imageUrl: _product.imageUrls[0], placeholder: (context, url) => CircularProgressIndicator(), - errorWidget: (context, url, error) => Image.asset('../assets/img/default-white.png'), + errorWidget: (context, url, error) => Container(color: Colors.white,), ), ), SizedBox(width: 20), diff --git a/pubspec.yaml b/pubspec.yaml index 7c2feb7..e8d5be0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -83,6 +83,7 @@ flutter: - assets/icons/star.svg - assets/icons/half-star.svg - assets/icons/empty-star.svg + - assets/img/default-white.png # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware