From e3b219deecece28455c93046abc3ff9a531d9d6f Mon Sep 17 00:00:00 2001 From: Alphawizz Flutter Team Date: Fri, 11 Apr 2025 18:41:03 +0530 Subject: [PATCH] my first commit --- lib/main.dart | 1 + lib/view/auth/login/otp_verification.dart | 2 +- lib/view/auth/login/sign_in.dart | 4 +- lib/view/auth/signup/sign_up.dart | 3 +- lib/view/cart/cards/cartCard.dart | 8 ++- lib/view/cart/model/cartModel.dart | 6 +- lib/view/category/category.dart | 2 +- lib/view/category/categoryCard.dart | 3 - lib/view/home/models/productsModel.dart | 37 +++++++---- lib/view/order/orderDetailDelivered.dart | 4 +- lib/view/order/orderDetailOnTheWay.dart | 4 +- .../productDetail/recommendedProductCard.dart | 5 +- lib/view/profile/address/addressList.dart | 3 +- lib/view/profile/address/manage_address.dart | 3 +- .../profile/payment/refund/refundHistory.dart | 4 +- .../payment/refund/refundHistoryCard.dart | 4 +- .../profile/payment/refund/singleRefund.dart | 8 +-- lib/view/profile/subscribe/subscribe.dart | 8 +-- lib/view/search/productsForYouCardSearch.dart | 5 +- lib/view/search/search.dart | 11 +--- lib/view/vendor/vendorDetails.dart | 2 +- lib/view/widget_common/app_image.dart | 24 +++++++ lib/view/widget_common/categoryShuffle.dart | 2 +- lib/view/widget_common/common_button.dart | 4 +- lib/viewModel/addressViewModel.dart | 10 ++- pubspec.lock | 66 +++++++++++++------ pubspec.yaml | 2 +- 27 files changed, 146 insertions(+), 89 deletions(-) create mode 100644 lib/view/widget_common/app_image.dart diff --git a/lib/main.dart b/lib/main.dart index 1401589..7721f46 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -32,6 +32,7 @@ import 'utils/shared_pref..dart'; import 'utils/string.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; + void main() async { WidgetsFlutterBinding.ensureInitialized(); await SharedPref.shared.getPref(); diff --git a/lib/view/auth/login/otp_verification.dart b/lib/view/auth/login/otp_verification.dart index 6b9f824..e683d00 100644 --- a/lib/view/auth/login/otp_verification.dart +++ b/lib/view/auth/login/otp_verification.dart @@ -110,7 +110,7 @@ class _OTPVerificationState extends State { padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), child: Text( - "${translation(context).entertheotpsentto} $mobile", + "${translation(context).entertheotpsentto} $mobile",//translation(context).entertheotpsentto style: const TextStyle( color: colors.lightTextColor, fontSize: 16, diff --git a/lib/view/auth/login/sign_in.dart b/lib/view/auth/login/sign_in.dart index a4de721..6c99890 100644 --- a/lib/view/auth/login/sign_in.dart +++ b/lib/view/auth/login/sign_in.dart @@ -247,8 +247,8 @@ class _SignInState extends State { mobileOrEmailController.text, data); }, style: ElevatedButton.styleFrom( - primary: colors.buttonColor, - onPrimary: colors.textColor, + backgroundColor: colors.buttonColor, + // onPrimary: colors.textColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), diff --git a/lib/view/auth/signup/sign_up.dart b/lib/view/auth/signup/sign_up.dart index af9d5af..2ab1dfc 100644 --- a/lib/view/auth/signup/sign_up.dart +++ b/lib/view/auth/signup/sign_up.dart @@ -75,8 +75,7 @@ class _SignUPState extends State { padding: const EdgeInsets.symmetric( horizontal: 20, vertical: 10), child: Text( - translation(context) - .createanaccounttoviewandmanageyourprojects, + translation(context).createanaccounttoviewandmanageyourprojects, style: const TextStyle( color: colors.lightTextColor, fontSize: 15), ), diff --git a/lib/view/cart/cards/cartCard.dart b/lib/view/cart/cards/cartCard.dart index 6e07731..dbf615c 100644 --- a/lib/view/cart/cards/cartCard.dart +++ b/lib/view/cart/cards/cartCard.dart @@ -2,6 +2,7 @@ import 'package:alpha_ecommerce_18oct/utils/color.dart'; import 'package:alpha_ecommerce_18oct/utils/routes.dart'; import 'package:alpha_ecommerce_18oct/view/cart/model/cartModel.dart'; import 'package:alpha_ecommerce_18oct/view/home/models/productsModel.dart'; +import 'package:alpha_ecommerce_18oct/view/widget_common/app_image.dart'; import 'package:alpha_ecommerce_18oct/view/widget_common/toast_message.dart'; import 'package:alpha_ecommerce_18oct/viewModel/cartViewModel.dart'; import 'package:dropdown_button2/dropdown_button2.dart'; @@ -19,6 +20,8 @@ cartCard( quantity.add("$i"); } + print('${model.images[0]}___________Dfdfsd'); + return Padding( padding: const EdgeInsets.only(left: 10.0, top: 8, right: 10, bottom: 8), child: Container( @@ -45,11 +48,12 @@ cartCard( Routes.navigateToProductDetailPageScreen( context, model as ProductList); }, - child: Image.network( + child: AppImage(image: model.thumbnail,width: 110, + height: 140,)/*Image.network( model.images[0], width: 110, height: 140, - ), + ),*/ ), const SizedBox(width: 30), Column( diff --git a/lib/view/cart/model/cartModel.dart b/lib/view/cart/model/cartModel.dart index e6c2e35..44d1d58 100644 --- a/lib/view/cart/model/cartModel.dart +++ b/lib/view/cart/model/cartModel.dart @@ -223,7 +223,7 @@ class CartProduct { unit: json["unit"], minQty: json["min_qty"], featured: json["featured"], - refundable: json["refundable"], + refundable: int.tryParse(json["refundable"]) ?? 0, variantCartProduct: json["variant_product"], attributes: List.from(json["attributes"].map((x) => x)), choiceOptions: List.from( @@ -594,8 +594,8 @@ class Shop { }); factory Shop.fromJson(Map json) => Shop( - id: json["id"], - sellerId: json["seller_id"], + id: int.parse(json["id"].toString()), + sellerId: int.parse(json["seller_id"].toString()), name: json["name"], address: json["address"], contact: json["contact"], diff --git a/lib/view/category/category.dart b/lib/view/category/category.dart index 32a2223..d4c9485 100644 --- a/lib/view/category/category.dart +++ b/lib/view/category/category.dart @@ -405,7 +405,7 @@ class _AllCategoryState extends State { child: ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - primary: isSelected ? colors.buttonColor : Colors.transparent, + backgroundColor: isSelected ? colors.buttonColor : Colors.transparent, ), child: Text( label, diff --git a/lib/view/category/categoryCard.dart b/lib/view/category/categoryCard.dart index cc3d837..f440da5 100644 --- a/lib/view/category/categoryCard.dart +++ b/lib/view/category/categoryCard.dart @@ -17,9 +17,6 @@ categoryCard( onTap: () { searchProvider.categoryId = categoryId; searchProvider.subCategoryId = model.id!.toString(); - print("Category Id ${searchProvider.categoryId}"); - print("Sub Category Id ${searchProvider.subCategoryId}"); - searchProvider.isHome = false; Routes.navigateToSearchScreen(context); searchProvider.getProductsListNew(context, "25", "1"); diff --git a/lib/view/home/models/productsModel.dart b/lib/view/home/models/productsModel.dart index e880e40..d4fb647 100644 --- a/lib/view/home/models/productsModel.dart +++ b/lib/view/home/models/productsModel.dart @@ -4,8 +4,7 @@ import 'dart:convert'; -ProductsModel productsModelFromJson(String str) => - ProductsModel.fromJson(json.decode(str)); +ProductsModel productsModelFromJson(String str) => ProductsModel.fromJson(json.decode(str)); String productsModelToJson(ProductsModel data) => json.encode(data.toJson()); @@ -149,7 +148,12 @@ class ProductList { required this.cart_id, }); - factory ProductList.fromJson(Map json) => ProductList( + factory ProductList.fromJson(Map json) { + + try { + return ProductList( + + id: json["id"], categoryIds: List.from( json["category_ids"].map((x) => CategoryId.fromJson(x))), @@ -165,7 +169,7 @@ class ProductList { unit: json["unit"]!, minQty: json["min_qty"], featured: json["featured"], - refundable: json["refundable"], + refundable: int.tryParse(json["refundable"]) ?? 0, variantProduct: json["variant_product"], attributes: List.from(json["attributes"].map((x) => x)), choiceOptions: List.from( @@ -198,19 +202,26 @@ class ProductList { multiplyQty: json["multiply_qty"], code: json["code"], reviewsCount: json["reviews_count"], - rating: - List.from(json["rating"].map((x) => Rating.fromJson(x))), + rating: List.from( + json["rating"].map((x) => Rating.fromJson(x))), tags: List.from(json["tags"].map((x) => Tag.fromJson(x))), translations: List.from(json["translations"].map((x) => x)), shareLink: json["share_link"], - reviews: - List.from(json["reviews"].map((x) => Review.fromJson(x))), + reviews: List.from( + json["reviews"].map((x) => Review.fromJson(x))), colorsFormatted: List.from( json["colors_formatted"].map((x) => ColorsFormatted.fromJson(x))), isFavorite: json["is_favorite"], isCart: json["is_cart"], cart_id: json["cart_id"], ); + }catch(e, stacktrace) { + print('❌ Error parsing YourModel: $e'); + print('Stacktrace: $stacktrace'); + rethrow; + } + } + Map toJson() => { "id": id, @@ -229,8 +240,7 @@ class ProductList { "refundable": refundable, "variant_product": variantProduct, "attributes": List.from(attributes.map((x) => x)), - "choice_options": - List.from(choiceOptions.map((x) => x.toJson())), + "choice_options": List.from(choiceOptions.map((x) => x.toJson())), "variation": List.from(variation.map((x) => x.toJson())), "weight": weight, "published": published, @@ -263,8 +273,7 @@ class ProductList { "translations": List.from(translations.map((x) => x)), "share_link": shareLink, "reviews": List.from(reviews.map((x) => x.toJson())), - "colors_formatted": - List.from(colorsFormatted.map((x) => x.toJson())), + "colors_formatted": List.from(colorsFormatted.map((x) => x.toJson())), "is_favorite": isFavorite, "is_cart": isCart, "cart_id": cart_id, @@ -529,8 +538,8 @@ class Shop { }); factory Shop.fromJson(Map json) => Shop( - id: json["id"], - sellerId: json["seller_id"], + id: int.tryParse(json['id'].toString()) ?? 0, + sellerId: int.tryParse(json['seller_id'].toString()) ?? 0, name: json["name"]!, address: json["address"]!, contact: json["contact"], diff --git a/lib/view/order/orderDetailDelivered.dart b/lib/view/order/orderDetailDelivered.dart index ace6f3b..5ff7bd2 100644 --- a/lib/view/order/orderDetailDelivered.dart +++ b/lib/view/order/orderDetailDelivered.dart @@ -542,8 +542,8 @@ class _OrderDetailDeliveredState extends State { width: 200, child: ElevatedButton( style: ElevatedButton.styleFrom( - primary: colors.buttonColor, - onPrimary: Colors.white, + backgroundColor: colors.buttonColor, + foregroundColor: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), diff --git a/lib/view/order/orderDetailOnTheWay.dart b/lib/view/order/orderDetailOnTheWay.dart index f2c8c1e..3af0eff 100644 --- a/lib/view/order/orderDetailOnTheWay.dart +++ b/lib/view/order/orderDetailOnTheWay.dart @@ -536,8 +536,8 @@ class _OrderDetailOnTheWayState extends State { width: 200, child: ElevatedButton( style: ElevatedButton.styleFrom( - primary: colors.buttonColor, - onPrimary: Colors.white, + backgroundColor: colors.buttonColor, + foregroundColor: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), diff --git a/lib/view/productDetail/recommendedProductCard.dart b/lib/view/productDetail/recommendedProductCard.dart index b63ddf0..83bd3e2 100644 --- a/lib/view/productDetail/recommendedProductCard.dart +++ b/lib/view/productDetail/recommendedProductCard.dart @@ -1,5 +1,6 @@ import 'package:alpha_ecommerce_18oct/utils/app_dimens/app_dimens.dart'; import 'package:alpha_ecommerce_18oct/view/home/models/productsModel.dart'; +import 'package:alpha_ecommerce_18oct/view/widget_common/app_image.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:like_button/like_button.dart'; @@ -38,10 +39,10 @@ recommendedProductCard({required context, required List model}) { decoration: const BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(10)), ), - child: CachedNetworkImage( + child: AppImage(image: card.images.first,) /*CachedNetworkImage( imageUrl: card.images.first, fit: BoxFit.fitWidth, - )), + )*/), SizedBox(height: MediaQuery.of(context).size.height * 0.0005), Padding( padding: const EdgeInsets.symmetric( diff --git a/lib/view/profile/address/addressList.dart b/lib/view/profile/address/addressList.dart index f586a4f..e1a0abc 100644 --- a/lib/view/profile/address/addressList.dart +++ b/lib/view/profile/address/addressList.dart @@ -61,8 +61,7 @@ class _AddressListScreenState extends State { Routes.navigateToManageAddressScreen(context); }, style: ElevatedButton.styleFrom( - primary: colors.buttonColor, - onPrimary: Colors.white, + foregroundColor: Colors.white, backgroundColor: colors.buttonColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), diff --git a/lib/view/profile/address/manage_address.dart b/lib/view/profile/address/manage_address.dart index f83bd1b..0eb2392 100644 --- a/lib/view/profile/address/manage_address.dart +++ b/lib/view/profile/address/manage_address.dart @@ -68,8 +68,7 @@ class _ManageAddressState extends State { addressProvider.getCurrentLoc(context); }, style: ElevatedButton.styleFrom( - primary: colors.buttonColor, - onPrimary: Colors.white, + foregroundColor: Colors.white, backgroundColor: colors.buttonColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), diff --git a/lib/view/profile/payment/refund/refundHistory.dart b/lib/view/profile/payment/refund/refundHistory.dart index adf7160..697337a 100644 --- a/lib/view/profile/payment/refund/refundHistory.dart +++ b/lib/view/profile/payment/refund/refundHistory.dart @@ -63,8 +63,8 @@ class _RefundHistoryState extends State { return ElevatedButton( style: ElevatedButton.styleFrom( - primary: buttonColor.withOpacity(0.2), - onPrimary: textColor, + backgroundColor: buttonColor.withOpacity(0.2), + foregroundColor: textColor, ), onPressed: () {}, child: Text(isSuccess ? "SUCCESS" : "unsuccessful"), diff --git a/lib/view/profile/payment/refund/refundHistoryCard.dart b/lib/view/profile/payment/refund/refundHistoryCard.dart index 9bf4382..50d732b 100644 --- a/lib/view/profile/payment/refund/refundHistoryCard.dart +++ b/lib/view/profile/payment/refund/refundHistoryCard.dart @@ -90,8 +90,8 @@ Widget buildCustomButton(bool isSuccess) { return ElevatedButton( style: ElevatedButton.styleFrom( - primary: buttonColor.withOpacity(0.2), - onPrimary: textColor, + backgroundColor: buttonColor.withOpacity(0.2), + foregroundColor: textColor, ), onPressed: () {}, child: Text(isSuccess ? "SUCCESS" : "unsuccessful"), diff --git a/lib/view/profile/payment/refund/singleRefund.dart b/lib/view/profile/payment/refund/singleRefund.dart index aecf6a8..5259aee 100644 --- a/lib/view/profile/payment/refund/singleRefund.dart +++ b/lib/view/profile/payment/refund/singleRefund.dart @@ -102,9 +102,9 @@ class _SingleRefundState extends State { width: MediaQuery.of(context).size.width * 0.54, child: ElevatedButton( style: ElevatedButton.styleFrom( - primary: + backgroundColor: const Color(0xff2568EE).withOpacity(0.2), - onPrimary: colors.textColor, + foregroundColor: colors.textColor, ), onPressed: () {}, child: const Row( @@ -272,8 +272,8 @@ class _SingleRefundState extends State { return ElevatedButton( style: ElevatedButton.styleFrom( - primary: buttonColor.withOpacity(0.2), - onPrimary: textColor, + backgroundColor: buttonColor.withOpacity(0.2), + foregroundColor: textColor, ), onPressed: () {}, child: Text(isSuccess ? "SUCCESS" : "unsuccessful"), diff --git a/lib/view/profile/subscribe/subscribe.dart b/lib/view/profile/subscribe/subscribe.dart index a02a685..7680cfa 100644 --- a/lib/view/profile/subscribe/subscribe.dart +++ b/lib/view/profile/subscribe/subscribe.dart @@ -198,8 +198,8 @@ class _SubscribeState extends State { 0.3, child: ElevatedButton( style: ElevatedButton.styleFrom( - primary: Colors.white, - onPrimary: Colors.black, + backgroundColor: Colors.white, + foregroundColor: Colors.black, padding: EdgeInsets.zero, ), onPressed: () { @@ -530,8 +530,8 @@ class _SubscribeState extends State { child: ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - primary: isSelected ? Colors.white : Colors.transparent, - onPrimary: textColor, + backgroundColor: isSelected ? Colors.white : Colors.transparent, + foregroundColor: textColor, ), child: Text( label, diff --git a/lib/view/search/productsForYouCardSearch.dart b/lib/view/search/productsForYouCardSearch.dart index c9af239..12751c8 100644 --- a/lib/view/search/productsForYouCardSearch.dart +++ b/lib/view/search/productsForYouCardSearch.dart @@ -1,5 +1,6 @@ import 'package:alpha_ecommerce_18oct/utils/app_dimens/app_dimens.dart'; import 'package:alpha_ecommerce_18oct/view/home/models/productsModel.dart'; +import 'package:alpha_ecommerce_18oct/view/widget_common/app_image.dart'; import 'package:alpha_ecommerce_18oct/viewModel/homeViewModel.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; @@ -41,10 +42,10 @@ productForYouCardSearch( decoration: const BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(10)), ), - child: CachedNetworkImage( + child: AppImage(image: model.images.first,)/*CachedNetworkImage( imageUrl: model.images.first, fit: BoxFit.fitWidth, - )), + )*/), SizedBox(height: MediaQuery.of(context).size.height * 0.0005), Padding( padding: const EdgeInsets.symmetric( diff --git a/lib/view/search/search.dart b/lib/view/search/search.dart index 3674ad3..5537c06 100644 --- a/lib/view/search/search.dart +++ b/lib/view/search/search.dart @@ -344,8 +344,7 @@ class _SearchState extends State { child: Column( children: [ Container( - padding: const EdgeInsets.symmetric( - horizontal: 10, vertical: 20), + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20), // height: MediaQuery.of(context).size.height * // 0.5 * // searchProvider.searchResults.length / @@ -354,17 +353,13 @@ class _SearchState extends State { shrinkWrap: true, padding: EdgeInsets.zero, physics: const NeverScrollableScrollPhysics(), - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, childAspectRatio: 0.68, ), itemCount: searchProvider.searchResults.length, itemBuilder: (context, j) { - return productForYouCardSearch( - searchProvider.searchResults[j], - context, - homeProvider); + return productForYouCardSearch(searchProvider.searchResults[j], context, homeProvider); }, ), ), diff --git a/lib/view/vendor/vendorDetails.dart b/lib/view/vendor/vendorDetails.dart index d32d4c1..b6549f1 100644 --- a/lib/view/vendor/vendorDetails.dart +++ b/lib/view/vendor/vendorDetails.dart @@ -392,7 +392,7 @@ class _VendorDetailsState extends State { child: ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - primary: isSelected ? colors.buttonColor : Colors.transparent, + backgroundColor: isSelected ? colors.buttonColor : Colors.transparent, ), child: Text( label, diff --git a/lib/view/widget_common/app_image.dart b/lib/view/widget_common/app_image.dart new file mode 100644 index 0000000..5bb3405 --- /dev/null +++ b/lib/view/widget_common/app_image.dart @@ -0,0 +1,24 @@ +import 'package:alpha_ecommerce_18oct/view/widget_common/appLoader.dart'; +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/material.dart'; + +class AppImage extends StatelessWidget { + const AppImage({super.key, required this.image, this.fit, this.width, this.height}); + + final String image; + final BoxFit? fit ; + final double? width; + final double? height; + + @override + Widget build(BuildContext context) { + return CachedNetworkImage( + imageUrl: image, + fit: fit ?? BoxFit.fitWidth, + width: width, + height: height, + errorWidget: (context, url, error) => Image.asset('assets/images/logo-without-text.png',opacity: const AlwaysStoppedAnimation(.5),), + placeholder: (context, url) => appLoader(), + ); + } +} diff --git a/lib/view/widget_common/categoryShuffle.dart b/lib/view/widget_common/categoryShuffle.dart index 32e71dd..74e0c13 100644 --- a/lib/view/widget_common/categoryShuffle.dart +++ b/lib/view/widget_common/categoryShuffle.dart @@ -289,7 +289,7 @@ class _CategoryFilterState extends State { child: ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - primary: isSelected ? colors.buttonColor : Colors.transparent, + backgroundColor: isSelected ? colors.buttonColor : Colors.transparent, ), child: Text( label, diff --git a/lib/view/widget_common/common_button.dart b/lib/view/widget_common/common_button.dart index 2c65ecc..f01047a 100644 --- a/lib/view/widget_common/common_button.dart +++ b/lib/view/widget_common/common_button.dart @@ -22,8 +22,8 @@ class CommonButton extends StatelessWidget { onClick(); }, style: ElevatedButton.styleFrom( - primary: color ? colors.textColor : colors.buttonColor, - onPrimary: color ? colors.buttonColor : colors.textColor, + backgroundColor: color ? colors.textColor : colors.buttonColor, + foregroundColor: color ? colors.buttonColor : colors.textColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10.0), ), diff --git a/lib/viewModel/addressViewModel.dart b/lib/viewModel/addressViewModel.dart index 0518e96..f678bdc 100644 --- a/lib/viewModel/addressViewModel.dart +++ b/lib/viewModel/addressViewModel.dart @@ -82,10 +82,14 @@ class AddressViewModel with ChangeNotifier { addressList = value.data; notifyListeners(); - setselected(0, addressList[0]); + if(addressList.isNotEmpty){ + setselected(0, addressList[0]); + SharedPref.shared.pref + ?.setString(PrefKeys.billingAddressID, addressList[0].id.toString()); + } + + - SharedPref.shared.pref - ?.setString(PrefKeys.billingAddressID, addressList[0].id.toString()); setLoading(false); }).onError((error, stackTrace) { setLoading(false); diff --git a/pubspec.lock b/pubspec.lock index ff89873..ae8282b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -405,6 +405,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" like_button: dependency: "direct main" description: @@ -433,26 +457,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.11.0" nested: dependency: transitive description: @@ -481,10 +505,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_drawing: dependency: transitive description: @@ -758,18 +782,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -798,10 +822,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -906,14 +930,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.0+2" - web: + vm_service: dependency: transitive description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "13.0.0" win32: dependency: transitive description: @@ -947,5 +971,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index bc45f55..93baf8b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,7 @@ dependencies: permission_handler: ^9.1.0 #speech_to_text: ^5.1.0 loading_animation_widget: ^1.2.0+4 - intl: ^0.18.1 + intl: 0.18.1 #0.18.1 #0.19.0 flutter_localization: ^0.1.14 cached_network_image: ^3.2.3 geolocator: ^10.1.0