diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index dd2c4ad..4065ea4 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -1,4 +1,11 @@ -## [6.4.0] - 2023-01-06 +## [6.4.1] - 2023-02-23 + +* Upgrade to Nylo v4.1.3 +* Small refactor to TextStyle +* Fix the ThemeColor.get helper method to support ColorStyles. +* Pubspec.yaml dependency updates + +* ## [6.4.0] - 2023-01-06 * Upgrade to Nylo v4.0.0 * Update copyright diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md index 94e40db..72a0c0c 100644 --- a/LabelStoreMax/README.md +++ b/LabelStoreMax/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v6.4.0 +### Label StoreMax - v6.4.1 [Official WooSignal WooCommerce App](https://woosignal.com) diff --git a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj index ca0c3e0..1641b1b 100644 --- a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj +++ b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -199,6 +199,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -213,6 +214,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/LabelStoreMax/ios/Runner/Info.plist b/LabelStoreMax/ios/Runner/Info.plist index 8eb5192..4956d2c 100644 --- a/LabelStoreMax/ios/Runner/Info.plist +++ b/LabelStoreMax/ios/Runner/Info.plist @@ -63,5 +63,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/LabelStoreMax/lib/app/providers/app_provider.dart b/LabelStoreMax/lib/app/providers/app_provider.dart index e0125ae..e44654a 100644 --- a/LabelStoreMax/lib/app/providers/app_provider.dart +++ b/LabelStoreMax/lib/app/providers/app_provider.dart @@ -110,6 +110,7 @@ class AppProvider implements NyProvider { nylo.appThemes = appThemes; nylo.appLoader = loader; + nylo.appLogo = logo; String initialRoute = AppHelper.instance.appConfig!.appStatus != null ? '/home' diff --git a/LabelStoreMax/lib/bootstrap/helpers.dart b/LabelStoreMax/lib/bootstrap/helpers.dart index 9538775..6a75209 100644 --- a/LabelStoreMax/lib/bootstrap/helpers.dart +++ b/LabelStoreMax/lib/bootstrap/helpers.dart @@ -56,10 +56,10 @@ class ThemeColor { static ColorStyles get(BuildContext context, {String? themeId}) { Nylo nylo = Backpack.instance.read('nylo'); - List appThemes = nylo.appThemes; + List> appThemes = nylo.appThemes as List>; if (themeId == null) { - dynamic themeFound = appThemes + BaseThemeConfig themeFound = appThemes .firstWhere( (theme) => theme.id == getEnv(Theme.of(context).brightness == Brightness.light ? 'LIGHT_THEME_ID' : 'DARK_THEME_ID'), orElse: () => appThemes.first @@ -67,7 +67,7 @@ class ThemeColor { return themeFound.colors; } - dynamic baseThemeConfig = appThemes.firstWhere((theme) => theme.id == themeId, orElse: () => appThemes.first); + BaseThemeConfig baseThemeConfig = appThemes.firstWhere((theme) => theme.id == themeId, orElse: () => appThemes.first); return baseThemeConfig.colors; } } diff --git a/LabelStoreMax/lib/config/design.dart b/LabelStoreMax/lib/config/design.dart index 549d563..5c668c3 100644 --- a/LabelStoreMax/lib/config/design.dart +++ b/LabelStoreMax/lib/config/design.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_app/resources/widgets/app_loader_widget.dart'; +import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; /* |-------------------------------------------------------------------------- @@ -10,4 +11,8 @@ import 'package:flutter_app/resources/widgets/app_loader_widget.dart'; |-------------------------------------------------------------------------- */ +Widget logo = StoreLogo(); +// resources/widgets/woosignal_ui.dart + Widget loader = AppLoaderWidget(); +// resources/widgets/app_loader_widget.dart \ No newline at end of file diff --git a/LabelStoreMax/lib/config/theme.dart b/LabelStoreMax/lib/config/theme.dart index 6f97ee2..8afe5db 100644 --- a/LabelStoreMax/lib/config/theme.dart +++ b/LabelStoreMax/lib/config/theme.dart @@ -12,7 +12,7 @@ import 'package:nylo_framework/nylo_framework.dart'; */ // App Themes -final List appThemes = [ +final List> appThemes = [ ThemeConfig.light(), ThemeConfig.dark(), ]; @@ -38,7 +38,7 @@ ColorStyles darkColors = DarkThemeColors(); // Preset Themes class ThemeConfig { // LIGHT - static BaseThemeConfig light() => BaseThemeConfig( + static BaseThemeConfig light() => BaseThemeConfig( id: "default_light_theme", description: "Light theme", theme: lightTheme(lightColors), @@ -46,7 +46,7 @@ class ThemeConfig { ); // DARK - static BaseThemeConfig dark() => BaseThemeConfig( + static BaseThemeConfig dark() => BaseThemeConfig( id: "default_dark_theme", description: "Dark theme", theme: darkTheme(darkColors), @@ -60,10 +60,10 @@ class ThemeConfig { // First add the colors which was created into the above section like the following: // Bright Colors - /// BaseColorStyles brightColors = BrightThemeColors(); + /// ColorStyles brightColors = BrightThemeColors(); // Next, uncomment the below: - /// static BaseThemeConfig bright() => BaseThemeConfig( + /// static BaseThemeConfig bright() => BaseThemeConfig( /// id: "default_bright_theme", /// description: "Bright theme", /// theme: brightTheme(brightColors), diff --git a/LabelStoreMax/lib/main.dart b/LabelStoreMax/lib/main.dart index 6a1c63a..e3505d5 100644 --- a/LabelStoreMax/lib/main.dart +++ b/LabelStoreMax/lib/main.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_app/bootstrap/app.dart'; -import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/boot.dart'; import 'package:nylo_framework/nylo_framework.dart'; diff --git a/LabelStoreMax/lib/resources/pages/account_delete_page.dart b/LabelStoreMax/lib/resources/pages/account_delete_page.dart index 21aca83..23a53e1 100644 --- a/LabelStoreMax/lib/resources/pages/account_delete_page.dart +++ b/LabelStoreMax/lib/resources/pages/account_delete_page.dart @@ -51,7 +51,7 @@ class _AccountDeletePageState extends NyState { Icon(Icons.no_accounts_rounded, size: 50), Text( trans("Delete your account"), - style: textTheme.headline3, + style: textTheme.displaySmall, ), Padding( padding: const EdgeInsets.only(top: 18), diff --git a/LabelStoreMax/lib/resources/pages/account_landing_page.dart b/LabelStoreMax/lib/resources/pages/account_landing_page.dart index 2aeb9b7..c519606 100644 --- a/LabelStoreMax/lib/resources/pages/account_landing_page.dart +++ b/LabelStoreMax/lib/resources/pages/account_landing_page.dart @@ -64,7 +64,7 @@ class _AccountLandingPageState extends NyState { child: Text( trans("Login"), textAlign: TextAlign.left, - style: Theme.of(context).textTheme.headline4!.copyWith( + style: Theme.of(context).textTheme.headlineMedium!.copyWith( fontSize: 24, fontWeight: FontWeight.w700, ), @@ -120,7 +120,7 @@ class _AccountLandingPageState extends NyState { Padding( child: Text( trans("Create an account"), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), padding: EdgeInsets.only(left: 8), ) diff --git a/LabelStoreMax/lib/resources/pages/account_order_detail_page.dart b/LabelStoreMax/lib/resources/pages/account_order_detail_page.dart index 414133c..54bb528 100644 --- a/LabelStoreMax/lib/resources/pages/account_order_detail_page.dart +++ b/LabelStoreMax/lib/resources/pages/account_order_detail_page.dart @@ -166,7 +166,7 @@ class _AccountOrderDetailPageState extends NyState { ), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith( fontWeight: FontWeight.w600, ), @@ -176,7 +176,7 @@ class _AccountOrderDetailPageState extends NyState { "x${lineItem.quantity.toString()}", style: Theme.of(context) .textTheme - .bodyText1, + .bodyLarge, textAlign: TextAlign.left, ), ], diff --git a/LabelStoreMax/lib/resources/pages/browse_category_page.dart b/LabelStoreMax/lib/resources/pages/browse_category_page.dart index d9748e9..10260d2 100644 --- a/LabelStoreMax/lib/resources/pages/browse_category_page.dart +++ b/LabelStoreMax/lib/resources/pages/browse_category_page.dart @@ -62,7 +62,7 @@ class _BrowseCategoryPageState extends NyState { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - Text(trans("Browse"), style: Theme.of(context).textTheme.subtitle1), + Text(trans("Browse"), style: Theme.of(context).textTheme.titleMedium), Text(parseHtmlString(productCategory!.name)) ], ), diff --git a/LabelStoreMax/lib/resources/pages/browse_search_page.dart b/LabelStoreMax/lib/resources/pages/browse_search_page.dart index e9b50d3..8201fcf 100644 --- a/LabelStoreMax/lib/resources/pages/browse_search_page.dart +++ b/LabelStoreMax/lib/resources/pages/browse_search_page.dart @@ -55,7 +55,7 @@ class _BrowseSearchState extends NyState { mainAxisAlignment: MainAxisAlignment.center, children: [ Text(trans("Search results for"), - style: Theme.of(context).textTheme.subtitle1), + style: Theme.of(context).textTheme.titleMedium), Text("\"" + _search! + "\"") ], ), diff --git a/LabelStoreMax/lib/resources/pages/cart_page.dart b/LabelStoreMax/lib/resources/pages/cart_page.dart index 8d071c4..3011f5d 100644 --- a/LabelStoreMax/lib/resources/pages/cart_page.dart +++ b/LabelStoreMax/lib/resources/pages/cart_page.dart @@ -198,7 +198,7 @@ class _CartPageState extends State { child: Padding( child: Text( trans("Clear Cart"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), padding: EdgeInsets.only(right: 8), ), @@ -229,7 +229,7 @@ class _CartPageState extends State { Padding( child: Text( trans("Empty Basket"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), padding: EdgeInsets.only(top: 10), ) diff --git a/LabelStoreMax/lib/resources/pages/checkout_confirmation_page.dart b/LabelStoreMax/lib/resources/pages/checkout_confirmation_page.dart index 31893f7..109bc37 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_confirmation_page.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_confirmation_page.dart @@ -165,7 +165,7 @@ class CheckoutConfirmationPageState extends State { padding: const EdgeInsets.only(top: 15), child: Text( "${trans("One moment")}...", - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ) ], diff --git a/LabelStoreMax/lib/resources/pages/checkout_details_page.dart b/LabelStoreMax/lib/resources/pages/checkout_details_page.dart index ec1fe1c..f2b5b01 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_details_page.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_details_page.dart @@ -277,7 +277,7 @@ class _CheckoutDetailsPageState extends NyState { children: [ Text( trans("Ship to a different address?"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), Checkbox( value: _hasDifferentShippingAddress, @@ -292,7 +292,7 @@ class _CheckoutDetailsPageState extends NyState { children: [ Text( trans("Remember my details"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), Checkbox( value: valRememberDetails, diff --git a/LabelStoreMax/lib/resources/pages/checkout_payment_type_page.dart b/LabelStoreMax/lib/resources/pages/checkout_payment_type_page.dart index 79f4eca..7e38461 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_payment_type_page.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_payment_type_page.dart @@ -82,7 +82,7 @@ class _CheckoutPaymentTypePageState extends State { child: Text( trans("No payment methods are available"), style: - Theme.of(context).textTheme.bodyText1, + Theme.of(context).textTheme.bodyLarge, ), ) : ListView.separated( @@ -112,7 +112,7 @@ class _CheckoutPaymentTypePageState extends State { title: Text(paymentType.desc, style: Theme.of(context) .textTheme - .subtitle1), + .titleMedium), selected: true, trailing: (CheckoutSession .getInstance.paymentType == diff --git a/LabelStoreMax/lib/resources/pages/checkout_shipping_type_page.dart b/LabelStoreMax/lib/resources/pages/checkout_shipping_type_page.dart index 616213b..58eedc0 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_shipping_type_page.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_shipping_type_page.dart @@ -282,7 +282,7 @@ class _CheckoutShippingTypePageState extends State { _wsShippingOptions[index]['title'], style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontWeight: FontWeight.bold, ), @@ -313,7 +313,7 @@ class _CheckoutShippingTypePageState extends State { text: '', style: Theme.of(context) .textTheme - .bodyText2, + .bodyMedium, children: [ (shippingOption[ "object"] @@ -335,7 +335,7 @@ class _CheckoutShippingTypePageState extends State { style: Theme.of( context) .textTheme - .bodyText2! + .bodyMedium! .copyWith( fontSize: 14)) @@ -367,7 +367,7 @@ class _CheckoutShippingTypePageState extends State { trans( "Shipping is not supported for your location, sorry"), style: - Theme.of(context).textTheme.headline6, + Theme.of(context).textTheme.titleLarge, textAlign: TextAlign.center, ))), LinkButton( diff --git a/LabelStoreMax/lib/resources/pages/checkout_status_page.dart b/LabelStoreMax/lib/resources/pages/checkout_status_page.dart index 84dfc6a..01a0284 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_status_page.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_status_page.dart @@ -62,23 +62,23 @@ class _CheckoutStatusState extends NyState { Padding( child: Text( trans("Order Status"), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), padding: EdgeInsets.only(bottom: 15), ), Text( trans("Thank You!"), - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, textAlign: TextAlign.left, ), Text( trans("Your transaction details"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, textAlign: TextAlign.left, ), Text( "${trans("Order Ref")}. #${_order!.id.toString()}", - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, textAlign: TextAlign.left, ), ], @@ -110,7 +110,7 @@ class _CheckoutStatusState extends NyState { child: Padding( child: Text( trans("Items"), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, textAlign: TextAlign.left, ), padding: EdgeInsets.all(8), @@ -138,7 +138,7 @@ class _CheckoutStatusState extends NyState { Text( lineItem.name!, style: - Theme.of(context).textTheme.bodyText1, + Theme.of(context).textTheme.bodyLarge, softWrap: false, maxLines: 2, overflow: TextOverflow.ellipsis, @@ -146,7 +146,7 @@ class _CheckoutStatusState extends NyState { Text( "x${lineItem.quantity.toString()}", style: - Theme.of(context).textTheme.bodyText2, + Theme.of(context).textTheme.bodyMedium, ), ], ), @@ -155,7 +155,7 @@ class _CheckoutStatusState extends NyState { formatStringCurrency( total: lineItem.total.toString(), ), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ) ], ), diff --git a/LabelStoreMax/lib/resources/pages/coupon_page.dart b/LabelStoreMax/lib/resources/pages/coupon_page.dart index aec3b1a..fe898b7 100644 --- a/LabelStoreMax/lib/resources/pages/coupon_page.dart +++ b/LabelStoreMax/lib/resources/pages/coupon_page.dart @@ -80,7 +80,7 @@ class _CouponPageState extends State { Icon(Icons.local_offer_outlined, size: 30), Text( trans('Redeem Coupon'), - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), SizedBox( height: 30, diff --git a/LabelStoreMax/lib/resources/pages/customer_countries_page.dart b/LabelStoreMax/lib/resources/pages/customer_countries_page.dart index cceefbd..f272dfe 100644 --- a/LabelStoreMax/lib/resources/pages/customer_countries_page.dart +++ b/LabelStoreMax/lib/resources/pages/customer_countries_page.dart @@ -152,7 +152,7 @@ class _CustomerCountriesPageState extends State { child: Container( child: Text( state.name!, - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), padding: EdgeInsets.only(top: 25, bottom: 25), ), diff --git a/LabelStoreMax/lib/resources/pages/home_search_page.dart b/LabelStoreMax/lib/resources/pages/home_search_page.dart index 8161fe3..0efbd97 100644 --- a/LabelStoreMax/lib/resources/pages/home_search_page.dart +++ b/LabelStoreMax/lib/resources/pages/home_search_page.dart @@ -59,7 +59,7 @@ class _HomeSearchPageState extends State { TextField( decoration: InputDecoration(prefixIcon: Icon(Icons.search)), controller: _txtSearchController, - style: Theme.of(context).textTheme.headline3, + style: Theme.of(context).textTheme.displaySmall, keyboardType: TextInputType.text, autocorrect: false, autofocus: true, diff --git a/LabelStoreMax/lib/resources/pages/leave_review_page.dart b/LabelStoreMax/lib/resources/pages/leave_review_page.dart index 45e2f06..8f99550 100644 --- a/LabelStoreMax/lib/resources/pages/leave_review_page.dart +++ b/LabelStoreMax/lib/resources/pages/leave_review_page.dart @@ -72,14 +72,14 @@ class _LeaveReviewPageState extends NyState { ), Text( trans("How would you rate"), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), Text(_lineItem!.name!), Flexible( child: Container( child: TextField( controller: _textEditingController, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, keyboardType: TextInputType.text, autocorrect: false, autofocus: true, diff --git a/LabelStoreMax/lib/resources/pages/no_connection_page.dart b/LabelStoreMax/lib/resources/pages/no_connection_page.dart index 81933e7..20d6ae8 100644 --- a/LabelStoreMax/lib/resources/pages/no_connection_page.dart +++ b/LabelStoreMax/lib/resources/pages/no_connection_page.dart @@ -52,7 +52,7 @@ class _NoConnectionPageState extends State { padding: const EdgeInsets.all(16.0), child: Text( trans("Oops, something went wrong"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, textAlign: TextAlign.center, ), ), diff --git a/LabelStoreMax/lib/resources/pages/product_detail_page.dart b/LabelStoreMax/lib/resources/pages/product_detail_page.dart index 7a0fbd7..e938b0f 100644 --- a/LabelStoreMax/lib/resources/pages/product_detail_page.dart +++ b/LabelStoreMax/lib/resources/pages/product_detail_page.dart @@ -94,7 +94,7 @@ class _ProductDetailState extends NyState { return ListTile( title: Text( _product!.attributes[attributeIndex].options![index], - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), trailing: (_tmpAttributeObj.isNotEmpty && _tmpAttributeObj.containsKey(attributeIndex) && @@ -134,11 +134,11 @@ class _ProductDetailState extends NyState { itemBuilder: (BuildContext context, int index) { return ListTile( title: Text(_product!.attributes[index].name!, - style: Theme.of(context).textTheme.subtitle1), + style: Theme.of(context).textTheme.titleMedium), subtitle: (_tmpAttributeObj.isNotEmpty && _tmpAttributeObj.containsKey(index)) ? Text(_tmpAttributeObj[index]["value"], - style: Theme.of(context).textTheme.bodyText1) + style: Theme.of(context).textTheme.bodyLarge) : Text( "${trans("Select a")} ${_product!.attributes[index].name}"), trailing: (_tmpAttributeObj.isNotEmpty && @@ -163,7 +163,7 @@ class _ProductDetailState extends NyState { productVariation == null) ? trans("This variation is unavailable") : trans("Choose your options"))), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), Text( (productVariation != null @@ -171,7 +171,7 @@ class _ProductDetailState extends NyState { ? trans("Out of stock") : "" : ""), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), PrimaryButton( title: trans("Add to cart"), diff --git a/LabelStoreMax/lib/resources/pages/product_reviews_page.dart b/LabelStoreMax/lib/resources/pages/product_reviews_page.dart index 1e4e7ea..f622554 100644 --- a/LabelStoreMax/lib/resources/pages/product_reviews_page.dart +++ b/LabelStoreMax/lib/resources/pages/product_reviews_page.dart @@ -80,14 +80,14 @@ class _ProductReviewsPageState extends NyState { Container( child: Text( _product!.name!, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, ), ), Container( padding: EdgeInsets.symmetric(vertical: 8), child: Text( _product!.ratingCount.toString() + " Reviews", - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ), Row( @@ -96,7 +96,7 @@ class _ProductReviewsPageState extends NyState { margin: EdgeInsets.only(right: 8), child: Text( _product!.averageRating! + " Stars", - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ), RatingBarIndicator( diff --git a/LabelStoreMax/lib/resources/pages/wishlist_page_widget.dart b/LabelStoreMax/lib/resources/pages/wishlist_page_widget.dart index 3f7e3dd..6490c35 100644 --- a/LabelStoreMax/lib/resources/pages/wishlist_page_widget.dart +++ b/LabelStoreMax/lib/resources/pages/wishlist_page_widget.dart @@ -78,7 +78,7 @@ class _WishListPageWidgetState extends State { Text(trans("No items found"), style: Theme.of(context) .textTheme - .headline6! + .titleLarge! .setColor(context, (color) => color!.primaryContent)) ], diff --git a/LabelStoreMax/lib/resources/themes/dark_theme.dart b/LabelStoreMax/lib/resources/themes/dark_theme.dart index 7b5b73e..f57d14f 100644 --- a/LabelStoreMax/lib/resources/themes/dark_theme.dart +++ b/LabelStoreMax/lib/resources/themes/dark_theme.dart @@ -26,18 +26,16 @@ ThemeData darkTheme(ColorStyles darkColors) { } TextTheme darkTheme = getAppTextTheme( - appFont, defaultTextTheme.merge(_darkTextTheme(darkColors))); + appFont, defaultTextTheme.merge(_textTheme(darkColors))); return ThemeData( primaryColor: darkColors.primaryContent, - backgroundColor: darkColors.background, - colorScheme: ColorScheme.dark(), primaryColorDark: darkColors.primaryContent, brightness: Brightness.dark, focusColor: darkColors.primaryContent, scaffoldBackgroundColor: darkColors.background, appBarTheme: AppBarTheme( backgroundColor: darkColors.appBarBackground, - titleTextStyle: darkTheme.headline6! + titleTextStyle: darkTheme.titleLarge! .copyWith(color: darkColors.appBarPrimaryContent), iconTheme: IconThemeData(color: darkColors.appBarPrimaryContent), elevation: 1.0, @@ -66,7 +64,7 @@ ThemeData darkTheme(ColorStyles darkColors) { TextStyle(color: darkColors.bottomTabBarLabelSelected), selectedItemColor: darkColors.bottomTabBarLabelSelected, ), - textTheme: darkTheme, + textTheme: darkTheme, colorScheme: ColorScheme.dark().copyWith(background: darkColors.background), ); } @@ -76,47 +74,13 @@ ThemeData darkTheme(ColorStyles darkColors) { |-------------------------------------------------------------------------- */ -TextTheme _darkTextTheme(BaseColorStyles dark) { - final Color darkPrimaryContent = dark.primaryContent; - return TextTheme( - headline6: TextStyle( - color: darkPrimaryContent.withOpacity(0.8), - ), - headline5: TextStyle( - color: darkPrimaryContent, - ), - headline4: TextStyle( - color: darkPrimaryContent, - ), - headline3: TextStyle( - color: darkPrimaryContent, - ), - headline2: TextStyle( - color: darkPrimaryContent, - ), - headline1: TextStyle( - color: darkPrimaryContent, - ), - subtitle2: TextStyle( - color: darkPrimaryContent, - ), - subtitle1: TextStyle( - color: darkPrimaryContent, - ), - overline: TextStyle( - color: darkPrimaryContent, - ), - button: TextStyle( - color: darkPrimaryContent.withOpacity(0.8), - ), - bodyText2: TextStyle( - color: darkPrimaryContent.withOpacity(0.8), - ), - bodyText1: TextStyle( - color: darkPrimaryContent, - ), - caption: TextStyle( - color: darkPrimaryContent.withOpacity(0.8), - ), +TextTheme _textTheme(ColorStyles colors) { + Color primaryContent = colors.primaryContent; + TextTheme textTheme = TextTheme().apply(displayColor: primaryContent); + return textTheme.copyWith( + titleLarge: TextStyle(color: primaryContent.withOpacity(0.8)), + labelLarge: TextStyle(color: primaryContent.withOpacity(0.8)), + bodySmall: TextStyle(color: primaryContent.withOpacity(0.8)), + bodyMedium: TextStyle(color: primaryContent.withOpacity(0.8)) ); } diff --git a/LabelStoreMax/lib/resources/themes/light_theme.dart b/LabelStoreMax/lib/resources/themes/light_theme.dart index 1af8c97..ffcfe34 100644 --- a/LabelStoreMax/lib/resources/themes/light_theme.dart +++ b/LabelStoreMax/lib/resources/themes/light_theme.dart @@ -26,19 +26,17 @@ ThemeData lightTheme(ColorStyles lightColors) { } TextTheme lightTheme = getAppTextTheme( - appFont, defaultTextTheme.merge(_lightTextTheme(lightColors))); + appFont, defaultTextTheme.merge(_textTheme(lightColors))); return ThemeData( primaryColor: lightColors.primaryContent, - backgroundColor: lightColors.background, - colorScheme: ColorScheme.light(), primaryColorLight: lightColors.primaryAccent, focusColor: lightColors.primaryContent, scaffoldBackgroundColor: lightColors.background, hintColor: lightColors.primaryAccent, appBarTheme: AppBarTheme( backgroundColor: lightColors.appBarBackground, - titleTextStyle: lightTheme.headline6! + titleTextStyle: lightTheme.titleLarge! .copyWith(color: lightColors.appBarPrimaryContent), iconTheme: IconThemeData(color: lightColors.appBarPrimaryContent), elevation: 1.0, @@ -68,7 +66,7 @@ ThemeData lightTheme(ColorStyles lightColors) { TextStyle(color: lightColors.bottomTabBarLabelSelected), selectedItemColor: lightColors.bottomTabBarLabelSelected, ), - textTheme: lightTheme, + textTheme: lightTheme, colorScheme: ColorScheme.light().copyWith(background: lightColors.background), ); } @@ -78,47 +76,11 @@ ThemeData lightTheme(ColorStyles lightColors) { |-------------------------------------------------------------------------- */ -TextTheme _lightTextTheme(BaseColorStyles lightColors) { - Color lightPrimaryContent = lightColors.primaryContent; - return TextTheme( - headline6: TextStyle( - color: lightPrimaryContent, - ), - headline5: TextStyle( - color: lightPrimaryContent, - ), - headline4: TextStyle( - color: lightPrimaryContent, - ), - headline3: TextStyle( - color: lightPrimaryContent, - ), - headline2: TextStyle( - color: lightPrimaryContent, - ), - headline1: TextStyle( - color: lightPrimaryContent, - ), - subtitle2: TextStyle( - color: lightPrimaryContent, - ), - subtitle1: TextStyle( - color: lightPrimaryContent, - ), - overline: TextStyle( - color: lightPrimaryContent, - ), - button: TextStyle( - color: lightPrimaryContent.withOpacity(0.8), - ), - bodyText2: TextStyle( - color: lightPrimaryContent.withOpacity(0.8), - ), - bodyText1: TextStyle( - color: lightPrimaryContent, - ), - caption: TextStyle( - color: lightPrimaryContent, - ), +TextTheme _textTheme(ColorStyles colors) { + Color primaryContent = colors.primaryContent; + TextTheme textTheme = TextTheme().apply(displayColor: primaryContent); + return textTheme.copyWith( + labelLarge: TextStyle(color: primaryContent.withOpacity(0.8)), + bodyMedium: TextStyle(color: primaryContent.withOpacity(0.8)), ); -} +} \ No newline at end of file diff --git a/LabelStoreMax/lib/resources/themes/text_theme/default_text_theme.dart b/LabelStoreMax/lib/resources/themes/text_theme/default_text_theme.dart index 2f40598..0846729 100644 --- a/LabelStoreMax/lib/resources/themes/text_theme/default_text_theme.dart +++ b/LabelStoreMax/lib/resources/themes/text_theme/default_text_theme.dart @@ -7,49 +7,49 @@ import 'package:flutter/material.dart'; */ const TextTheme defaultTextTheme = TextTheme( - headline6: TextStyle( + titleLarge: TextStyle( fontSize: 18.0, fontWeight: FontWeight.w600, ), - headline5: TextStyle( + headlineSmall: TextStyle( fontSize: 22.0, ), - headline4: TextStyle( + headlineMedium: TextStyle( fontSize: 24.0, fontWeight: FontWeight.w600, ), - headline3: TextStyle( + displaySmall: TextStyle( fontSize: 26.0, fontWeight: FontWeight.w700, ), - headline2: TextStyle( + displayMedium: TextStyle( fontSize: 28.0, fontWeight: FontWeight.w600, ), - headline1: TextStyle( + displayLarge: TextStyle( fontSize: 36.0, fontWeight: FontWeight.w300, ), - subtitle2: TextStyle( + titleSmall: TextStyle( fontSize: 14.0, fontWeight: FontWeight.w500, ), - subtitle1: TextStyle( + titleMedium: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, ), - overline: TextStyle( + labelSmall: TextStyle( fontSize: 10.0, fontWeight: FontWeight.w400, ), - button: TextStyle(), - bodyText2: TextStyle( + labelLarge: TextStyle(), + bodyMedium: TextStyle( fontSize: 14.0, ), - bodyText1: TextStyle( + bodyLarge: TextStyle( fontSize: 16.0, ), - caption: TextStyle( + bodySmall: TextStyle( fontSize: 16.0, ), -); +); \ No newline at end of file diff --git a/LabelStoreMax/lib/resources/widgets/account_detail_orders_widget.dart b/LabelStoreMax/lib/resources/widgets/account_detail_orders_widget.dart index c47c01d..2f1bab7 100644 --- a/LabelStoreMax/lib/resources/widgets/account_detail_orders_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/account_detail_orders_widget.dart @@ -141,7 +141,7 @@ class _AccountDetailOrdersWidgetState extends State { formatStringCurrency(total: order.total), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontWeight: FontWeight.w600), textAlign: TextAlign.left, ), @@ -151,7 +151,7 @@ class _AccountDetailOrdersWidgetState extends State { trans("items"), style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith(fontWeight: FontWeight.w600), textAlign: TextAlign.left, ), @@ -168,7 +168,7 @@ class _AccountDetailOrdersWidgetState extends State { formatType: formatForDateTime(FormatType.time), ), textAlign: TextAlign.right, - style: Theme.of(context).textTheme.bodyText1!.copyWith( + style: Theme.of(context).textTheme.bodyLarge!.copyWith( fontWeight: FontWeight.w400, ), ), diff --git a/LabelStoreMax/lib/resources/widgets/app_version_widget.dart b/LabelStoreMax/lib/resources/widgets/app_version_widget.dart index 6e341b4..ccc76a1 100644 --- a/LabelStoreMax/lib/resources/widgets/app_version_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/app_version_widget.dart @@ -32,7 +32,7 @@ class AppVersionWidget extends StatelessWidget { child: Text("${trans("Version")}: ${snapshot.data!.version}", style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontWeight: FontWeight.w300)), padding: EdgeInsets.only(top: 15, bottom: 15), ); diff --git a/LabelStoreMax/lib/resources/widgets/buttons.dart b/LabelStoreMax/lib/resources/widgets/buttons.dart index d16903f..dd8988b 100644 --- a/LabelStoreMax/lib/resources/widgets/buttons.dart +++ b/LabelStoreMax/lib/resources/widgets/buttons.dart @@ -28,7 +28,7 @@ class PrimaryButton extends StatelessWidget { title: title, action: action, isLoading: isLoading, - textStyle: Theme.of(context).textTheme.button!.copyWith( + textStyle: Theme.of(context).textTheme.labelLarge!.copyWith( fontSize: 16, fontWeight: FontWeight.bold, color: ThemeColor.get(context).buttonPrimaryContent), @@ -51,7 +51,7 @@ class SecondaryButton extends StatelessWidget { key: key, title: title, action: action, - textStyle: Theme.of(context).textTheme.bodyText1!.copyWith( + textStyle: Theme.of(context).textTheme.bodyLarge!.copyWith( color: Colors.black87, ), bgColor: Color(0xFFF6F6F9), @@ -83,7 +83,7 @@ class LinkButton extends StatelessWidget { child: Text( title!, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, )), ), onTap: action == null ? null : () async => await action!(), @@ -120,10 +120,9 @@ class WooSignalButton extends StatelessWidget { style: ElevatedButton.styleFrom( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12.0), - ), + ), backgroundColor: bgColor, padding: EdgeInsets.all(8), elevation: 0, - primary: bgColor, shadowColor: Colors.transparent, ), child: isLoading diff --git a/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart b/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart index 2504b26..3d8cb32 100644 --- a/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/cart_icon_widget.dart @@ -55,7 +55,7 @@ class _CartIconWidgetState extends State { } return Text( cartValue, - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, textAlign: TextAlign.center, ); } diff --git a/LabelStoreMax/lib/resources/widgets/checkout_select_coupon_widget.dart b/LabelStoreMax/lib/resources/widgets/checkout_select_coupon_widget.dart index f25835d..6990551 100644 --- a/LabelStoreMax/lib/resources/widgets/checkout_select_coupon_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/checkout_select_coupon_widget.dart @@ -47,7 +47,7 @@ class CheckoutSelectCouponWidget extends StatelessWidget { hasCoupon ? "Coupon Applied: " + checkoutSession.coupon!.code! : trans('Apply Coupon'), - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), ], ), diff --git a/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart b/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart index 20d5ad6..0aef901 100644 --- a/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart @@ -50,7 +50,8 @@ class _CompoHomeWidgetState extends State { perPage: 10, category: category.id.toString(), status: "publish", - stockStatus: "instock"), + stockStatus: "instock", + ), )); if (products.isNotEmpty) { categoryAndProducts.addAll({category: products}); @@ -140,7 +141,7 @@ class _CompoHomeWidgetState extends State { catProds.key.name!, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontWeight: FontWeight.bold, fontSize: 22), diff --git a/LabelStoreMax/lib/resources/widgets/compo_theme_widget.dart b/LabelStoreMax/lib/resources/widgets/compo_theme_widget.dart index e962bc5..6b19730 100644 --- a/LabelStoreMax/lib/resources/widgets/compo_theme_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/compo_theme_widget.dart @@ -32,10 +32,10 @@ class CompoThemeWidget extends StatefulWidget { final GlobalKey globalKey; @override - CcompoThemeWidgetState createState() => CcompoThemeWidgetState(); + CompoThemeWidgetState createState() => CompoThemeWidgetState(); } -class CcompoThemeWidgetState extends State { +class CompoThemeWidgetState extends State { Widget? activeWidget; int _currentIndex = 0; diff --git a/LabelStoreMax/lib/resources/widgets/customer_address_input.dart b/LabelStoreMax/lib/resources/widgets/customer_address_input.dart index 7d250b0..e5ad475 100644 --- a/LabelStoreMax/lib/resources/widgets/customer_address_input.dart +++ b/LabelStoreMax/lib/resources/widgets/customer_address_input.dart @@ -120,7 +120,7 @@ class CustomerAddressInput extends StatelessWidget { height: 23, child: Text( trans("State"), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, textAlign: TextAlign.left, ), width: double.infinity, @@ -144,7 +144,7 @@ class CustomerAddressInput extends StatelessWidget { height: 23, child: Text( trans("Country"), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, textAlign: TextAlign.left, ), width: double.infinity, diff --git a/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart b/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart index 0e44522..a777391 100644 --- a/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart @@ -65,7 +65,7 @@ class _HomeDrawerWidgetState extends State { Padding( child: Text( trans("Menu"), - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), padding: EdgeInsets.only(left: 16, top: 8, bottom: 8), ), @@ -75,7 +75,7 @@ class _HomeDrawerWidgetState extends State { trans("Profile"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16), ), leading: Icon(Icons.account_circle), @@ -87,7 +87,7 @@ class _HomeDrawerWidgetState extends State { trans("Wishlist"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16), ), leading: Icon(Icons.favorite_border), @@ -98,7 +98,7 @@ class _HomeDrawerWidgetState extends State { trans("Cart"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16), ), leading: Icon(Icons.shopping_cart), @@ -111,7 +111,7 @@ class _HomeDrawerWidgetState extends State { Padding( child: Text( trans("About Us"), - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), padding: EdgeInsets.only(left: 16, top: 8, bottom: 8), ), @@ -122,7 +122,7 @@ class _HomeDrawerWidgetState extends State { trans("Terms and conditions"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16), ), leading: Icon(Icons.menu_book_rounded), @@ -136,7 +136,7 @@ class _HomeDrawerWidgetState extends State { trans("Privacy policy"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16), ), trailing: Icon(Icons.keyboard_arrow_right_rounded), @@ -147,7 +147,7 @@ class _HomeDrawerWidgetState extends State { title: Text(trans((isDark ? "Light Mode" : "Dark Mode")), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16)), leading: Icon(Icons.brightness_4_rounded), onTap: () { @@ -163,7 +163,7 @@ class _HomeDrawerWidgetState extends State { Padding( child: Text( trans("Social"), - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), padding: EdgeInsets.only(left: 16, top: 8, bottom: 8), ), @@ -173,7 +173,7 @@ class _HomeDrawerWidgetState extends State { title: Text(menuLink.label, style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16)), leading: Padding( padding: const EdgeInsets.symmetric(vertical: 8), diff --git a/LabelStoreMax/lib/resources/widgets/no_results_for_products_widget.dart b/LabelStoreMax/lib/resources/widgets/no_results_for_products_widget.dart index f845e61..ee4d2f3 100644 --- a/LabelStoreMax/lib/resources/widgets/no_results_for_products_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/no_results_for_products_widget.dart @@ -19,7 +19,7 @@ class NoResultsForProductsWidget extends StatelessWidget { children: [ Text( trans("No results"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ], ); diff --git a/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart b/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart index 6d10fa6..ce9a97b 100644 --- a/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart @@ -102,7 +102,7 @@ class _NoticHomeWidgetState extends State { onTap: _modalBottomSheetMenu, child: Text( trans("Categories"), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ), ), @@ -146,7 +146,7 @@ class _NoticHomeWidgetState extends State { Flexible( child: Text( trans("Our selection of new items"), - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, maxLines: 2, overflow: TextOverflow.ellipsis, ), diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_description_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_description_widget.dart index 42f0ff5..f00084b 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_description_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_description_widget.dart @@ -41,7 +41,7 @@ class ProductDetailDescriptionWidget extends StatelessWidget { Text( trans("Description"), style: - Theme.of(context).textTheme.caption!.copyWith(fontSize: 18), + Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 18), textAlign: TextAlign.left, ), if (product!.shortDescription!.isNotEmpty && @@ -51,7 +51,7 @@ class ProductDetailDescriptionWidget extends StatelessWidget { trans("Full description"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 14), textAlign: TextAlign.right, overflow: TextOverflow.ellipsis, @@ -72,7 +72,7 @@ class ProductDetailDescriptionWidget extends StatelessWidget { renderMode: RenderMode.column, onTapUrl: (String url) async { await launchUrl(Uri.parse(url)); return true; - }, textStyle: Theme.of(context).textTheme.bodyText2), + }, textStyle: Theme.of(context).textTheme.bodyMedium), ), ], ); diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart index dcc9bd6..b36acef 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart @@ -64,7 +64,7 @@ class ProductDetailFooterActionsWidget extends StatelessWidget { trans("Quantity"), style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith(color: Colors.grey), ), Row( @@ -78,7 +78,7 @@ class ProductDetailFooterActionsWidget extends StatelessWidget { ), Text( quantity.toString(), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, ), IconButton( icon: Icon( @@ -101,7 +101,7 @@ class ProductDetailFooterActionsWidget extends StatelessWidget { formatStringCurrency( total: (parseWcPrice(product!.price) * quantity).toString()), - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, textAlign: TextAlign.center, ), alignment: Alignment.centerLeft, diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_header_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_header_widget.dart index 502cc7c..747d136 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_header_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_header_widget.dart @@ -33,7 +33,7 @@ class ProductDetailHeaderWidget extends StatelessWidget { child: Text( product!.name!, style: - Theme.of(context).textTheme.bodyText1!.copyWith(fontSize: 20), + Theme.of(context).textTheme.bodyLarge!.copyWith(fontSize: 20), textAlign: TextAlign.left, overflow: TextOverflow.ellipsis, maxLines: 2, @@ -47,7 +47,7 @@ class ProductDetailHeaderWidget extends StatelessWidget { children: [ Text( formatStringCurrency(total: product!.price), - style: Theme.of(context).textTheme.headline4!.copyWith( + style: Theme.of(context).textTheme.headlineMedium!.copyWith( fontSize: 20, ), textAlign: TextAlign.right, diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart index 47c18f3..caca811 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_related_products_widget.dart @@ -44,7 +44,7 @@ class ProductDetailRelatedProductsWidget extends StatelessWidget { Text( trans("Related products"), style: - Theme.of(context).textTheme.caption!.copyWith(fontSize: 18), + Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 18), textAlign: TextAlign.left, ), ], diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_review_tile_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_review_tile_widget.dart index cfba72f..a1d3c7a 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_review_tile_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_review_tile_widget.dart @@ -73,7 +73,7 @@ class _ProductDetailReviewTileWidgetState child: Text(trans("More"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontWeight: FontWeight.bold)), onTap: () => setState(() { _maxLines = null; diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_upsell_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_upsell_widget.dart index ef3cb34..4ae93a4 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_upsell_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_upsell_widget.dart @@ -66,7 +66,7 @@ class _ProductDetailUpsellWidgetState extends State { Text( trans("${trans('You may also like')}…"), style: - Theme.of(context).textTheme.caption!.copyWith(fontSize: 18), + Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 18), textAlign: TextAlign.left, ), ], diff --git a/LabelStoreMax/lib/resources/widgets/switch_address_tab.dart b/LabelStoreMax/lib/resources/widgets/switch_address_tab.dart index 3573fc0..93aa609 100644 --- a/LabelStoreMax/lib/resources/widgets/switch_address_tab.dart +++ b/LabelStoreMax/lib/resources/widgets/switch_address_tab.dart @@ -41,7 +41,7 @@ class SwitchAddressTab extends StatelessWidget { width: double.infinity, child: Text( title, - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( color: isActive ? Colors.white : Colors.black, ), textAlign: TextAlign.center, diff --git a/LabelStoreMax/lib/resources/widgets/text_row_widget.dart b/LabelStoreMax/lib/resources/widgets/text_row_widget.dart index eed907f..def4801 100644 --- a/LabelStoreMax/lib/resources/widgets/text_row_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/text_row_widget.dart @@ -24,7 +24,7 @@ class TextRowWidget extends StatelessWidget { children: [ Flexible( child: Container( - child: Text(title!, style: Theme.of(context).textTheme.headline6), + child: Text(title!, style: Theme.of(context).textTheme.titleLarge), ), flex: 3, ), @@ -33,7 +33,7 @@ class TextRowWidget extends StatelessWidget { child: Text( text!, style: - Theme.of(context).textTheme.bodyText1!.copyWith(fontSize: 16), + Theme.of(context).textTheme.bodyLarge!.copyWith(fontSize: 16), ), ), flex: 3, diff --git a/LabelStoreMax/lib/resources/widgets/top_nav_widget.dart b/LabelStoreMax/lib/resources/widgets/top_nav_widget.dart index dd9c4ea..b06dd14 100644 --- a/LabelStoreMax/lib/resources/widgets/top_nav_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/top_nav_widget.dart @@ -29,7 +29,7 @@ class TopNavWidget extends StatelessWidget { "${(trans("Shop").capitalize())} / ", style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontWeight: FontWeight.bold), maxLines: 1, ), @@ -37,7 +37,7 @@ class TopNavWidget extends StatelessWidget { trans("Newest"), style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontWeight: FontWeight.bold), maxLines: 1, ), @@ -49,7 +49,7 @@ class TopNavWidget extends StatelessWidget { height: 60, child: AutoSizeText( trans("Browse categories"), - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, maxLines: 1, textAlign: TextAlign.right, ), diff --git a/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart b/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart index 65ded3b..5d75846 100644 --- a/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart +++ b/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart @@ -151,7 +151,7 @@ class CheckoutRowLine extends StatelessWidget { heading, style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 16, fontWeight: FontWeight.bold), ), padding: EdgeInsets.only(bottom: 8), @@ -171,7 +171,7 @@ class CheckoutRowLine extends StatelessWidget { child: Container( child: Text( leadTitle!, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, maxLines: 2, overflow: TextOverflow.ellipsis, softWrap: false, @@ -233,7 +233,7 @@ class TextEditingRow extends StatelessWidget { heading!, style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith(color: ThemeColor.get(context).primaryContent), ), padding: EdgeInsets.only(bottom: 2), @@ -242,7 +242,7 @@ class TextEditingRow extends StatelessWidget { Flexible( child: TextField( controller: controller, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, keyboardType: keyboardType ?? TextInputType.text, autocorrect: false, autofocus: shouldAutoFocus ?? false, @@ -270,14 +270,14 @@ class CheckoutMetaLine extends StatelessWidget { Flexible( child: Container( child: AutoSizeText(title!, - style: Theme.of(context).textTheme.bodyText2), + style: Theme.of(context).textTheme.bodyMedium), ), flex: 3, ), Flexible( child: Container( child: - Text(amount!, style: Theme.of(context).textTheme.bodyText1), + Text(amount!, style: Theme.of(context).textTheme.bodyLarge), ), flex: 3, ) @@ -354,14 +354,14 @@ class ProductItemContainer extends StatelessWidget { textAlign: TextAlign.center, text: TextSpan( text: '', - style: Theme.of(context).textTheme.bodyText1, + style: Theme.of(context).textTheme.bodyLarge, children: [ TextSpan( text: "${workoutSaleDiscount(salePrice: product!.salePrice, priceBefore: product!.regularPrice)}% ${trans("off")}", style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith( color: Colors.black87, fontSize: 11, @@ -382,7 +382,7 @@ class ProductItemContainer extends StatelessWidget { product!.name!, style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontSize: 15), maxLines: 2, overflow: TextOverflow.ellipsis, @@ -398,7 +398,7 @@ class ProductItemContainer extends StatelessWidget { "${formatStringCurrency(total: product!.price)} ", style: Theme.of(context) .textTheme - .bodyText2! + .bodyMedium! .copyWith(fontWeight: FontWeight.w600), textAlign: TextAlign.left, ), @@ -409,7 +409,7 @@ class ProductItemContainer extends StatelessWidget { text: '${trans("Was")}: ', style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith( fontSize: 11, ), @@ -420,7 +420,7 @@ class ProductItemContainer extends StatelessWidget { ), style: Theme.of(context) .textTheme - .bodyText1! + .bodyLarge! .copyWith( decoration: TextDecoration.lineThrough, color: Colors.grey, @@ -471,7 +471,7 @@ wsModalBottom(BuildContext context, padding: EdgeInsets.symmetric(vertical: 16), child: Text( title!, - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, textAlign: TextAlign.left, ), ), @@ -641,14 +641,14 @@ class CartItemContainer extends StatelessWidget { cartLineItem.name!, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontWeight: FontWeight.bold), overflow: TextOverflow.ellipsis, maxLines: 3, ), (cartLineItem.variationOptions != null ? Text(cartLineItem.variationOptions!, - style: Theme.of(context).textTheme.bodyText1) + style: Theme.of(context).textTheme.bodyLarge) : Container()), Row( crossAxisAlignment: CrossAxisAlignment.center, @@ -659,8 +659,8 @@ class CartItemContainer extends StatelessWidget { ? trans("Out of stock") : trans("In Stock")), style: (cartLineItem.stockStatus == "outofstock" - ? Theme.of(context).textTheme.caption - : Theme.of(context).textTheme.bodyText2), + ? Theme.of(context).textTheme.bodySmall + : Theme.of(context).textTheme.bodyMedium), ), Text( formatDoubleCurrency( @@ -668,7 +668,7 @@ class CartItemContainer extends StatelessWidget { ), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontWeight: FontWeight.bold), textAlign: TextAlign.center, ) @@ -696,7 +696,7 @@ class CartItemContainer extends StatelessWidget { highlightColor: Colors.transparent, ), Text(cartLineItem.quantity.toString(), - style: Theme.of(context).textTheme.headline6), + style: Theme.of(context).textTheme.titleLarge), IconButton( icon: Icon(Icons.add_circle_outline), onPressed: actionIncrementQuantity, diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock index 2db655b..06da711 100644 --- a/LabelStoreMax/pubspec.lock +++ b/LabelStoreMax/pubspec.lock @@ -5,266 +5,296 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + url: "https://pub.dev" source: hosted - version: "41.0.0" + version: "47.0.0" _flutterfire_internals: dependency: transitive description: name: _flutterfire_internals - url: "https://pub.dartlang.org" + sha256: "64fcb0dbca4386356386c085142fa6e79c00a3326ceaa778a2d25f5d9ba61441" + url: "https://pub.dev" source: hosted - version: "1.0.12" + version: "1.0.16" analyzer: dependency: "direct main" description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.7.0" animate_do: dependency: transitive description: name: animate_do - url: "https://pub.dartlang.org" + sha256: "9aeacc1a7238f971c039bdf45d13c628be554a242e0251c4ddda09d19a1a923f" + url: "https://pub.dev" source: hosted version: "3.0.2" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d + url: "https://pub.dev" source: hosted - version: "3.1.11" + version: "3.3.6" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" auto_size_text: dependency: "direct main" description: name: auto_size_text - url: "https://pub.dartlang.org" + sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599" + url: "https://pub.dev" source: hosted version: "3.0.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" bubble_tab_indicator: dependency: "direct main" description: name: bubble_tab_indicator - url: "https://pub.dartlang.org" + sha256: "0aa37980a00e3374d917f9da8e83acd7f59ba872a3d05c306220063f28f945aa" + url: "https://pub.dev" source: hosted version: "0.1.6" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.dartlang.org" + sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15 + url: "https://pub.dev" source: hosted version: "3.2.3" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - url: "https://pub.dartlang.org" + sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7 + url: "https://pub.dev" source: hosted version: "2.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - url: "https://pub.dartlang.org" + sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0 + url: "https://pub.dev" source: hosted version: "1.0.2" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.dartlang.org" + sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + url: "https://pub.dev" source: hosted version: "0.3.5" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: "direct main" description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.4" device_info_plus: dependency: transitive description: name: device_info_plus - url: "https://pub.dartlang.org" + sha256: "7ff671ed0a6356fa8f2e1ae7d3558d3fb7b6a41e24455e4f8df75b811fb8e4ab" + url: "https://pub.dev" source: hosted version: "8.0.0" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + url: "https://pub.dev" source: hosted version: "7.0.0" dio: dependency: transitive description: name: dio - url: "https://pub.dartlang.org" + sha256: "9fdbf71baeb250fc9da847f6cb2052196f62c19906a3657adfc18631a667d316" + url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "5.0.0" eventify: dependency: transitive description: name: eventify - url: "https://pub.dartlang.org" + sha256: b829429f08586cc2001c628e7499e3e3c2493a1d895fd73b00ecb23351aa5a66 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: fe30ac230f12f8836bb97e6e09197340d3c584526825b1746ea362a82e1e43f7 + url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.7.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: "5615b30c36f55b2777d0533771deda7e5730e769e5d3cb7fda79e9bed86cfa55" + url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "4.5.3" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "291fbcace608aca6c860652e1358ef89752be8cc3ef227f8bbcd1e62775b833a" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.2.1" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - url: "https://pub.dartlang.org" + sha256: "95f7565b8e992d2188cdd8dc5612330f7c309485fe425d3f9844f18e90741e3e" + url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" + sha256: c5e79e15d1018cafffea1a6e45249db0d6bc42dbe35178634c77488179880e79 + url: "https://pub.dev" source: hosted - version: "4.2.10" + version: "4.2.14" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - url: "https://pub.dartlang.org" + sha256: cd0cfcab7a63282049dec95a9955e7a487b5e580162310d12a82a10c0c32c546 + url: "https://pub.dev" source: hosted - version: "3.2.11" + version: "3.2.15" flare_flutter: dependency: transitive description: name: flare_flutter - url: "https://pub.dartlang.org" + sha256: "99d63c60f00fac81249ce6410ee015d7b125c63d8278a30da81edf3317a1f6a0" + url: "https://pub.dev" source: hosted version: "3.0.2" flutter: @@ -276,28 +306,32 @@ packages: dependency: transitive description: name: flutter_blurhash - url: "https://pub.dartlang.org" + sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" + url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.7.0" flutter_cache_manager: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + url: "https://pub.dev" source: hosted version: "3.3.0" flutter_dotenv: dependency: transitive description: name: flutter_dotenv - url: "https://pub.dartlang.org" + sha256: d9283d92059a22e9834bc0a31336658ffba77089fb6f3cc36751f1fc7c6661a3 + url: "https://pub.dev" source: hosted version: "5.0.2" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c + url: "https://pub.dev" source: hosted version: "0.11.0" flutter_localizations: @@ -309,84 +343,96 @@ packages: dependency: "direct main" description: name: flutter_rating_bar - url: "https://pub.dartlang.org" + sha256: d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93 + url: "https://pub.dev" source: hosted version: "4.0.1" flutter_secure_storage: dependency: transitive description: name: flutter_secure_storage - url: "https://pub.dartlang.org" + sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5" + url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "8.0.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - url: "https://pub.dartlang.org" + sha256: "0912ae29a572230ad52d8a4697e5518d7f0f429052fd51df7e5a7952c7efe2a3" + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - url: "https://pub.dartlang.org" + sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - url: "https://pub.dartlang.org" + sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b + url: "https://pub.dev" source: hosted version: "1.0.1" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - url: "https://pub.dartlang.org" + sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe" + url: "https://pub.dev" source: hosted version: "1.1.1" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - url: "https://pub.dartlang.org" + sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.0.0" flutter_spinkit: dependency: "direct main" description: name: flutter_spinkit - url: "https://pub.dartlang.org" + sha256: "77a2117c0517ff909221f3160b8eb20052ab5216107581168af574ac1f05dff8" + url: "https://pub.dev" source: hosted version: "5.1.0" flutter_staggered_grid_view: dependency: "direct main" description: name: flutter_staggered_grid_view - url: "https://pub.dartlang.org" + sha256: "1312314293acceb65b92754298754801b0e1f26a1845833b740b30415bbbcf07" + url: "https://pub.dev" source: hosted version: "0.6.2" flutter_stripe: dependency: "direct main" description: name: flutter_stripe - url: "https://pub.dartlang.org" + sha256: "00e612c11ea57f9b78510e5b2aa8719022698bd8a023140e9b7f52c1dfa2e27d" + url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "8.0.0+1" flutter_styled_toast: dependency: transitive description: name: flutter_styled_toast - url: "https://pub.dartlang.org" + sha256: cc32aed2a49ce77a1ed5844073c6c0f5e381c81fd6d694e0ba3c5dc2a645963d + url: "https://pub.dev" source: hosted version: "2.1.3" flutter_swiper_view: dependency: "direct main" description: name: flutter_swiper_view - url: "https://pub.dartlang.org" + sha256: "2a165b259e8a4c49d4da5626b967ed42a73dac2d075bd9e266ad8d23b9f01879" + url: "https://pub.dev" source: hosted version: "1.1.8" flutter_test: @@ -398,7 +444,8 @@ packages: dependency: "direct main" description: name: flutter_web_browser - url: "https://pub.dartlang.org" + sha256: a5564b736253f745e147b8c4eff86de436324d081974cc1f16bff881134a400f + url: "https://pub.dev" source: hosted version: "0.17.1" flutter_web_plugins: @@ -410,415 +457,466 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html_core - url: "https://pub.dartlang.org" + sha256: "2ee1f47662f5ba34fe535915b034fae0450bc0a15ae6935ca4abcc7fa987e948" + url: "https://pub.dev" source: hosted - version: "0.9.0+2" + version: "0.10.0" fluttertoast: dependency: transitive description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1" + url: "https://pub.dev" source: hosted - version: "8.0.9" + version: "8.1.2" freezed_annotation: dependency: transitive description: name: freezed_annotation - url: "https://pub.dartlang.org" + sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.2.0" fwfh_text_style: dependency: transitive description: name: fwfh_text_style - url: "https://pub.dartlang.org" + sha256: "37806ee0222f79b6e8d4c698c322c897eae6a817258156f40aeece4e588fac60" + url: "https://pub.dev" source: hosted version: "2.22.08+1" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.1" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: "927573f2e8a8d65c17931e21918ad0ab0666b1b636537de7c4932bdb487b190f" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.0.3" html: dependency: "direct main" description: name: html - url: "https://pub.dartlang.org" + sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 + url: "https://pub.dev" source: hosted version: "0.15.1" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted version: "0.13.5" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.3.0" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.8.0" json_dart_generator: dependency: transitive description: name: json_dart_generator - url: "https://pub.dartlang.org" + sha256: "88c710a9278e1f8a9ad65a695350153f517d7deeca293ea45c6f997c066437a5" + url: "https://pub.dev" source: hosted version: "1.1.0+1" lints: dependency: "direct dev" description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" logger: dependency: transitive description: name: logger - url: "https://pub.dartlang.org" + sha256: "5076f09225f91dc49289a4ccb92df2eeea9ea01cf7c26d49b3a1f04c6a49eec1" + url: "https://pub.dev" source: hosted version: "1.1.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" math_expressions: dependency: "direct main" description: name: math_expressions - url: "https://pub.dartlang.org" + sha256: "6cec3bb1f5a78701cc25d63705ddfa807062d00bc0d85ba8b2d13daed9fe61c5" + url: "https://pub.dev" source: hosted version: "2.3.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" money_formatter: dependency: "direct main" description: name: money_formatter - url: "https://pub.dartlang.org" + sha256: "7cea53417f91b1a965c814d364f5021d8633f5f013659db5cdabbc95c4971eb4" + url: "https://pub.dev" source: hosted version: "0.0.3" nylo_framework: dependency: "direct main" description: name: nylo_framework - url: "https://pub.dartlang.org" + sha256: "3cc0379e73a56b2f2864f5fd850fdc582fc1908c5c8025e96a3ae7dbd3efa2f2" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.3" nylo_support: dependency: transitive description: name: nylo_support - url: "https://pub.dartlang.org" + sha256: b662441b463a1e68c1642cd2711af026f66fb2122ecc1ae331fc8300a7bc4be7 + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.3.0" octo_image: dependency: transitive description: name: octo_image - url: "https://pub.dartlang.org" + sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" package_info: dependency: "direct main" description: name: package_info - url: "https://pub.dartlang.org" + sha256: "6c07d9d82c69e16afeeeeb6866fe43985a20b3b50df243091bfc4a4ad2b03b75" + url: "https://pub.dev" source: hosted version: "2.0.2" package_info_plus: dependency: transitive description: name: package_info_plus - url: "https://pub.dartlang.org" + sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637 + url: "https://pub.dev" source: hosted version: "1.4.3+1" package_info_plus_linux: dependency: transitive description: name: package_info_plus_linux - url: "https://pub.dartlang.org" + sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc" + url: "https://pub.dev" source: hosted version: "1.0.5" package_info_plus_macos: dependency: transitive description: name: package_info_plus_macos - url: "https://pub.dartlang.org" + sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6 + url: "https://pub.dev" source: hosted version: "1.3.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8 + url: "https://pub.dev" source: hosted version: "1.0.2" package_info_plus_web: dependency: transitive description: name: package_info_plus_web - url: "https://pub.dartlang.org" + sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" package_info_plus_windows: dependency: transitive description: name: package_info_plus_windows - url: "https://pub.dartlang.org" + sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" page_transition: dependency: transitive description: name: page_transition - url: "https://pub.dartlang.org" + sha256: a7694bc120b7064a7f57c336914bb8885acf4f70bb3772c30c2fcfe6a85e43ff + url: "https://pub.dev" source: hosted version: "2.0.9" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95 + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.12" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e + url: "https://pub.dev" source: hosted - version: "2.0.11" - path_provider_ios: + version: "2.0.22" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74" + url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.1.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + url: "https://pub.dev" source: hosted version: "2.1.7" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" source: hosted version: "1.11.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "5.1.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a + url: "https://pub.dev" source: hosted version: "2.1.3" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346 + url: "https://pub.dev" + source: hosted + version: "3.6.2" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" pull_to_refresh_flutter3: dependency: "direct main" description: name: pull_to_refresh_flutter3 - url: "https://pub.dartlang.org" + sha256: "223a6241067162dc15cf8c46c05af998ce7aa85e0703d8f696101eb1b5629d76" + url: "https://pub.dev" source: hosted version: "2.0.1" razorpay_flutter: dependency: "direct main" description: name: razorpay_flutter - url: "https://pub.dartlang.org" + sha256: "959dbedc3af25fd41b43944bc5db00d4be1ea1967fed5d69fba3fc6700b1f103" + url: "https://pub.dev" source: hosted version: "1.3.4" recase: dependency: transitive description: name: recase - url: "https://pub.dartlang.org" + sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213 + url: "https://pub.dev" source: hosted version: "4.1.0" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" source: hosted - version: "0.27.3" + version: "0.27.7" shared_preferences: dependency: transitive description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9" + url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.17" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7" + url: "https://pub.dev" source: hosted - version: "2.0.11" - shared_preferences_ios: + version: "2.0.15" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: "2b55c18636a4edc529fa5cd44c03d3f3100c00513f518c5127c951978efcccd0" + url: "https://pub.dev" source: hosted - version: "2.0.10" + version: "2.1.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874 + url: "https://pub.dev" source: hosted - version: "2.1.0" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" + version: "2.1.3" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" sky_engine: dependency: transitive description: flutter @@ -828,261 +926,298 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.2.4+1" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: bfd6973aaeeb93475bc0d875ac9aefddf7965ef22ce09790eb963992ffc5183f + url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2+2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" status_alert: dependency: "direct main" description: name: status_alert - url: "https://pub.dartlang.org" + sha256: "220ce6c1400d19d817665ac5a87f772e87c901677ac37b93320f4764edf4d23f" + url: "https://pub.dev" source: hosted version: "1.0.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" stripe_android: dependency: transitive description: name: stripe_android - url: "https://pub.dartlang.org" + sha256: "3cf43dfb70d8011ded0730c091e741b94cd4aaccaad22732a19f5941503072d6" + url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "8.0.0+1" stripe_ios: dependency: transitive description: name: stripe_ios - url: "https://pub.dartlang.org" + sha256: b3da653013be8aada352b158439024963a0d5dc0648524127d3ef4fd6b0a0cc7 + url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "8.0.0" stripe_platform_interface: dependency: transitive description: name: stripe_platform_interface - url: "https://pub.dartlang.org" + sha256: "28c409b0c0e98115c4ab38a9a34a883010811036e6d9fa8d495f67c3ba01c034" + url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "8.0.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" theme_provider: dependency: transitive description: name: theme_provider - url: "https://pub.dartlang.org" + sha256: "0f1d7235bf1b0b09a6b4c0dbefddab0309323c04d4ae8cd2f0e9178be85f8ae4" + url: "https://pub.dev" source: hosted version: "0.5.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b + url: "https://pub.dev" source: hosted - version: "6.1.7" + version: "6.1.9" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1" + url: "https://pub.dev" source: hosted - version: "6.0.15" + version: "6.0.23" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815" + url: "https://pub.dev" source: hosted - version: "6.0.15" + version: "6.1.0" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.2" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.2" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0" + url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.14" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615 + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.3" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" validated: dependency: "direct main" description: name: validated - url: "https://pub.dartlang.org" + sha256: f4da18b50fa2aeda8d2f6e55bdf73759593abe3f9dd4aeece4e98bf3438e6a9f + url: "https://pub.dev" source: hosted version: "2.0.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" webview_flutter: dependency: "direct main" description: name: webview_flutter - url: "https://pub.dartlang.org" + sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88" + url: "https://pub.dev" source: hosted version: "3.0.4" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - url: "https://pub.dartlang.org" + sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd" + url: "https://pub.dev" source: hosted version: "2.10.4" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf" + url: "https://pub.dev" source: hosted version: "1.9.5" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" + sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0 + url: "https://pub.dev" source: hosted version: "2.9.5" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "3.1.3" woosignal: dependency: "direct main" description: name: woosignal - url: "https://pub.dartlang.org" + sha256: "0236c5a4568d39140be544b44cbabd9932a425f28285694e99d6daec85809fef" + url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.3" wp_json_api: dependency: "direct main" description: name: wp_json_api - url: "https://pub.dartlang.org" + sha256: ed8f33b8f8c87ca75ad4d936854b53cfacc0779f38de40400c9693753679647f + url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.3.2" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86 + url: "https://pub.dev" source: hosted - version: "0.2.0+1" + version: "0.2.0+3" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "6.2.2" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=2.19.0 <4.0.0" + flutter: ">=3.7.0-0" diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index e9bf653..f86d947 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -1,7 +1,7 @@ # Official WooSignal App Template for WooCommerce # Label StoreMax -# Version: 6.4.0 +# Version: 6.4.1 # Author: Anthony Gordon # Homepage: https://woosignal.com # Documentation: https://woosignal.com/docs/app/label-storemax @@ -22,16 +22,16 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: - google_fonts: ^3.0.1 + google_fonts: ^4.0.3 analyzer: ^4.2.0 intl: ^0.17.0 - nylo_framework: ^4.0.0 - woosignal: ^3.2.1 - flutter_stripe: ^7.0.0 - wp_json_api: ^3.3.1 + nylo_framework: ^4.1.3 + woosignal: ^3.2.3 + flutter_stripe: ^8.0.0+1 + wp_json_api: ^3.3.2 cached_network_image: ^3.2.3 package_info: ^2.0.2 money_formatter: ^0.0.3 @@ -47,12 +47,12 @@ dependencies: flutter_spinkit: ^5.1.0 auto_size_text: ^3.0.0 html: ^0.15.1 - flutter_widget_from_html_core: ^0.9.0+2 + flutter_widget_from_html_core: ^0.10.0 flutter_rating_bar: ^4.0.1 flutter_staggered_grid_view: ^0.6.2 flutter_swiper_view: ^1.1.8 - firebase_messaging: ^14.2.1 - firebase_core: ^2.4.1 + firebase_messaging: ^14.2.5 + firebase_core: ^2.7.0 flutter: sdk: flutter flutter_localizations: