diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index dbcf249..a0085c4 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -1,3 +1,9 @@ +## [6.2.0] - 2022-08-29 + +* Migration to use Nylo v3.3.0 +* Pubspec.yaml dependency updates +* Increase the minimum targetSdkVersion to 31 + ## [6.1.0] - 2022-07-09 * Add RazorPay diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md index d47ee40..03b71bf 100644 --- a/LabelStoreMax/README.md +++ b/LabelStoreMax/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v6.1.0 +### Label StoreMax - v6.2.0 [Official WooSignal WooCommerce App](https://woosignal.com) diff --git a/LabelStoreMax/android/app/build.gradle b/LabelStoreMax/android/app/build.gradle index 8a4bbbf..b88ed91 100644 --- a/LabelStoreMax/android/app/build.gradle +++ b/LabelStoreMax/android/app/build.gradle @@ -44,7 +44,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.woosignal.android" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true diff --git a/LabelStoreMax/lib/app/providers/app_provider.dart b/LabelStoreMax/lib/app/providers/app_provider.dart index 030afb5..bf1cd47 100644 --- a/LabelStoreMax/lib/app/providers/app_provider.dart +++ b/LabelStoreMax/lib/app/providers/app_provider.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/helpers.dart'; +import 'package:flutter_app/config/theme.dart'; import 'package:nylo_framework/nylo_framework.dart'; import 'package:flutter_app/config/localization.dart'; import 'package:woosignal/models/response/woosignal_app.dart'; @@ -91,6 +92,8 @@ class AppProvider implements NyProvider { assetsDirectory: assetsDirectory, valuesAsMap: valuesAsMap); + nylo.appThemes = appThemes; + return nylo; } } diff --git a/LabelStoreMax/lib/app/providers/stripe_pay.dart b/LabelStoreMax/lib/app/providers/stripe_pay.dart index 4d68c7b..6abf3ac 100644 --- a/LabelStoreMax/lib/app/providers/stripe_pay.dart +++ b/LabelStoreMax/lib/app/providers/stripe_pay.dart @@ -80,16 +80,11 @@ stripePay(context, await Stripe.instance.initPaymentSheet( paymentSheetParameters: SetupPaymentSheetParameters( - applePay: false, - googlePay: false, style: Theme.of(state.context).brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark, - testEnv: liveMode, - merchantCountryCode: envVal('STRIPE_COUNTRY_CODE', - defaultValue: wooSignalApp!.stripeCountryCode), merchantDisplayName: - envVal('APP_NAME', defaultValue: wooSignalApp.appName), + envVal('APP_NAME', defaultValue: wooSignalApp?.appName), paymentIntentClientSecret: rsp['client_secret'], )); diff --git a/LabelStoreMax/lib/bootstrap/app.dart b/LabelStoreMax/lib/bootstrap/app.dart index 25a1181..f1cd85a 100644 --- a/LabelStoreMax/lib/bootstrap/app.dart +++ b/LabelStoreMax/lib/bootstrap/app.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/config/theme.dart'; import 'package:nylo_framework/nylo_framework.dart'; // ignore: must_be_immutable @@ -60,14 +59,11 @@ class AppBuild extends StatelessWidget { @override Widget build(BuildContext context) { + Nylo nylo = Backpack.instance.read('nylo'); + List appThemes = nylo.appThemes.map((appTheme) => appTheme.toAppTheme()).toList(); return LocalizedApp( child: ThemeProvider( - themes: appThemes - .map((appTheme) => appTheme.toAppTheme( - defaultTheme: appTheme.theme!.brightness == Brightness.light - ? lightTheme - : darkTheme)) - .toList(), + themes: appThemes, child: ThemeConsumer( child: Builder( builder: (themeContext) => ValueListenableBuilder( @@ -93,7 +89,7 @@ class AppBuild extends StatelessWidget { title: title ?? "", initialRoute: initialRoute, onGenerateRoute: onGenerateRoute, - darkTheme: darkTheme ?? ThemeConfig.dark().theme, + darkTheme: darkTheme ?? appThemes.firstWhere((theme) => theme.id == getEnv('DARK_THEME_ID'), orElse: () => appThemes.first).data, theme: themeData ?? ThemeProvider.themeOf(context).data, localeResolutionCallback: (Locale? locale, Iterable supportedLocales) { diff --git a/LabelStoreMax/lib/bootstrap/base_theme_config.dart b/LabelStoreMax/lib/bootstrap/base_theme_config.dart deleted file mode 100644 index 3544964..0000000 --- a/LabelStoreMax/lib/bootstrap/base_theme_config.dart +++ /dev/null @@ -1,24 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; -import 'package:nylo_framework/nylo_framework.dart'; - -class BaseThemeConfig { - final String? id; - final String? description; - final ThemeData? theme; - final BaseColorStyles? colors; - final dynamic meta; - - BaseThemeConfig( - {this.id, - this.description, - this.theme, - this.colors, - this.meta = const {}}); - - AppTheme toAppTheme({ThemeData? defaultTheme}) => AppTheme( - id: id!, - data: defaultTheme ?? theme!, - description: description!, - ); -} diff --git a/LabelStoreMax/lib/bootstrap/helpers.dart b/LabelStoreMax/lib/bootstrap/helpers.dart index 1bfcc81..399ba1e 100644 --- a/LabelStoreMax/lib/bootstrap/helpers.dart +++ b/LabelStoreMax/lib/bootstrap/helpers.dart @@ -25,8 +25,6 @@ import 'package:flutter_app/config/currency.dart'; import 'package:flutter_app/config/decoders.dart'; import 'package:flutter_app/config/events.dart'; import 'package:flutter_app/config/payment_gateways.dart'; -import 'package:flutter_app/config/theme.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; @@ -42,6 +40,7 @@ import 'package:status_alert/status_alert.dart'; import 'package:woosignal/models/response/products.dart'; import 'package:woosignal/models/response/tax_rate.dart'; import 'package:woosignal/woosignal.dart'; +import '../resources/themes/styles/color_styles.dart'; Future getUser() async => (await (NyStorage.read(SharedKey.authUser, model: User()))); @@ -52,10 +51,22 @@ Future appWooSignal(Function(WooSignal) api) async { /// helper to find correct color from the [context]. class ThemeColor { - static BaseColorStyles? get(BuildContext context) { - return ((Theme.of(context).brightness == Brightness.light) - ? ThemeConfig.light().colors - : ThemeConfig.dark().colors); + static ColorStyles get(BuildContext context, {String? themeId}) { + + Nylo nylo = Backpack.instance.read('nylo'); + List appThemes = nylo.appThemes; + + if (themeId == null) { + dynamic themeFound = appThemes + .firstWhere( + (theme) => theme.id == getEnv(Theme.of(context).brightness == Brightness.light ? 'LIGHT_THEME_ID' : 'DARK_THEME_ID'), + orElse: () => appThemes.first + ); + return themeFound.colors; + } + + dynamic baseThemeConfig = appThemes.firstWhere((theme) => theme.id == themeId, orElse: () => appThemes.first); + return baseThemeConfig.colors; } } diff --git a/LabelStoreMax/lib/config/theme.dart b/LabelStoreMax/lib/config/theme.dart index 036df2e..6f97ee2 100644 --- a/LabelStoreMax/lib/config/theme.dart +++ b/LabelStoreMax/lib/config/theme.dart @@ -1,9 +1,9 @@ -import 'package:flutter_app/bootstrap/base_theme_config.dart'; import 'package:flutter_app/resources/themes/dark_theme.dart'; import 'package:flutter_app/resources/themes/light_theme.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; +import 'package:flutter_app/resources/themes/styles/color_styles.dart'; import 'package:flutter_app/resources/themes/styles/dark_theme_colors.dart'; import 'package:flutter_app/resources/themes/styles/light_theme_colors.dart'; +import 'package:nylo_framework/nylo_framework.dart'; /* |-------------------------------------------------------------------------- @@ -12,7 +12,7 @@ import 'package:flutter_app/resources/themes/styles/light_theme_colors.dart'; */ // App Themes -final appThemes = [ +final List appThemes = [ ThemeConfig.light(), ThemeConfig.dark(), ]; @@ -24,10 +24,10 @@ final appThemes = [ */ // Light Colors -BaseColorStyles lightColors = LightThemeColors(); +ColorStyles lightColors = LightThemeColors(); // Dark Colors -BaseColorStyles darkColors = DarkThemeColors(); +ColorStyles darkColors = DarkThemeColors(); /* |-------------------------------------------------------------------------- diff --git a/LabelStoreMax/lib/resources/pages/account_billing_details.dart b/LabelStoreMax/lib/resources/pages/account_billing_details.dart index fc032c8..2f1b2e8 100644 --- a/LabelStoreMax/lib/resources/pages/account_billing_details.dart +++ b/LabelStoreMax/lib/resources/pages/account_billing_details.dart @@ -155,7 +155,7 @@ class _AccountBillingDetailsPageState extends State { ], ), decoration: BoxDecoration( - color: ThemeColor.get(context)!.surfaceBackground, + color: ThemeColor.get(context).surfaceBackground, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) diff --git a/LabelStoreMax/lib/resources/pages/account_detail.dart b/LabelStoreMax/lib/resources/pages/account_detail.dart index 48f659c..c7a66e4 100644 --- a/LabelStoreMax/lib/resources/pages/account_detail.dart +++ b/LabelStoreMax/lib/resources/pages/account_detail.dart @@ -212,7 +212,7 @@ class _AccountDetailPageState extends State (Theme.of(context).brightness == Brightness.light) ? wsBoxShadow() : null, - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, ), ), Expanded(child: activeBody), diff --git a/LabelStoreMax/lib/resources/pages/account_landing.dart b/LabelStoreMax/lib/resources/pages/account_landing.dart index 6887598..bfe26c4 100644 --- a/LabelStoreMax/lib/resources/pages/account_landing.dart +++ b/LabelStoreMax/lib/resources/pages/account_landing.dart @@ -79,7 +79,7 @@ class _AccountLandingPageState extends NyState { (Theme.of(context).brightness == Brightness.light) ? wsBoxShadow() : null, - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, ), padding: EdgeInsets.symmetric(vertical: 18, horizontal: 8), margin: EdgeInsets.symmetric(horizontal: 16), diff --git a/LabelStoreMax/lib/resources/pages/account_register.dart b/LabelStoreMax/lib/resources/pages/account_register.dart index 2a39504..d06e210 100644 --- a/LabelStoreMax/lib/resources/pages/account_register.dart +++ b/LabelStoreMax/lib/resources/pages/account_register.dart @@ -114,9 +114,7 @@ class _AccountRegistrationPageState extends NyState { child: InkWell( child: RichText( text: TextSpan( - text: trans("By tapping \"Register\" you agree to ") + - AppHelper.instance.appConfig!.appName! + - '\'s ', + text: '${trans("By tapping \"Register\" you agree to ")} ${AppHelper.instance.appConfig!.appName!}\'s', children: [ TextSpan( text: trans("terms and conditions"), diff --git a/LabelStoreMax/lib/resources/pages/account_shipping_details.dart b/LabelStoreMax/lib/resources/pages/account_shipping_details.dart index 2d9bd82..0fe5d97 100644 --- a/LabelStoreMax/lib/resources/pages/account_shipping_details.dart +++ b/LabelStoreMax/lib/resources/pages/account_shipping_details.dart @@ -172,7 +172,7 @@ class _AccountShippingDetailsPageState ], ), decoration: BoxDecoration( - color: ThemeColor.get(context)!.surfaceBackground, + color: ThemeColor.get(context).surfaceBackground, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) diff --git a/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart b/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart index 87ec152..e064ef2 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_confirmation.dart @@ -199,7 +199,7 @@ class CheckoutConfirmationPageState extends State { child: Container( padding: EdgeInsets.only(left: 10, right: 10), decoration: BoxDecoration( - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) ? wsBoxShadow() diff --git a/LabelStoreMax/lib/resources/pages/checkout_details.dart b/LabelStoreMax/lib/resources/pages/checkout_details.dart index 58d26c8..ec13343 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_details.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_details.dart @@ -226,7 +226,7 @@ class _CheckoutDetailsPageState extends State { Expanded( child: Container( decoration: BoxDecoration( - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) diff --git a/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart b/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart index 73b1c8c..beccb1b 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_payment_type.dart @@ -138,7 +138,7 @@ class _CheckoutPaymentTypePageState extends State { ], ), decoration: BoxDecoration( - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) diff --git a/LabelStoreMax/lib/resources/pages/checkout_shipping_type.dart b/LabelStoreMax/lib/resources/pages/checkout_shipping_type.dart index 33011c5..f8f419d 100644 --- a/LabelStoreMax/lib/resources/pages/checkout_shipping_type.dart +++ b/LabelStoreMax/lib/resources/pages/checkout_shipping_type.dart @@ -330,10 +330,9 @@ class _CheckoutShippingTypePageState extends State { "min_amount"] != null) TextSpan( - text: "\n${trans("Spend a minimum of")} " + - formatStringCurrency( - total: shippingOption[ - "min_amount"]), + text: "\n${trans("Spend a minimum of")} ${formatStringCurrency( + total: shippingOption[ + "min_amount"])}", style: Theme.of( context) .textTheme @@ -379,7 +378,7 @@ class _CheckoutShippingTypePageState extends State { ], ), decoration: BoxDecoration( - color: ThemeColor.get(context)!.backgroundContainer, + color: ThemeColor.get(context).backgroundContainer, borderRadius: BorderRadius.circular(10), boxShadow: (Theme.of(context).brightness == Brightness.light) diff --git a/LabelStoreMax/lib/resources/pages/coupon_page.dart b/LabelStoreMax/lib/resources/pages/coupon_page.dart index 1165532..712bb10 100644 --- a/LabelStoreMax/lib/resources/pages/coupon_page.dart +++ b/LabelStoreMax/lib/resources/pages/coupon_page.dart @@ -98,7 +98,7 @@ class _CouponPageState extends State { Radius.circular(8.0), ), borderSide: BorderSide( - color: ThemeColor.get(context)!.primaryAccent)), + color: ThemeColor.get(context).primaryAccent)), filled: true, hintStyle: TextStyle(color: Colors.grey[800]), hintText: trans('Add coupon code'), diff --git a/LabelStoreMax/lib/resources/pages/customer_countries.dart b/LabelStoreMax/lib/resources/pages/customer_countries.dart index e7d88fa..9a3036d 100644 --- a/LabelStoreMax/lib/resources/pages/customer_countries.dart +++ b/LabelStoreMax/lib/resources/pages/customer_countries.dart @@ -64,7 +64,7 @@ class _CustomerCountriesPageState extends State { offset: Offset(0, 2), ), ], - color: ThemeColor.get(context)!.background), + color: ThemeColor.get(context).background), height: 60, child: Row( children: [ diff --git a/LabelStoreMax/lib/resources/pages/product_image_viewer_page.dart b/LabelStoreMax/lib/resources/pages/product_image_viewer_page.dart index 205a4a0..0edd01d 100644 --- a/LabelStoreMax/lib/resources/pages/product_image_viewer_page.dart +++ b/LabelStoreMax/lib/resources/pages/product_image_viewer_page.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_app/app/controllers/product_image_viewer_controller.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/safearea_widget.dart'; -import 'package:flutter_swiper_tv/flutter_swiper.dart'; +import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:nylo_framework/nylo_framework.dart'; class ProductImageViewerPage extends NyStatefulWidget { diff --git a/LabelStoreMax/lib/resources/themes/dark_theme.dart b/LabelStoreMax/lib/resources/themes/dark_theme.dart index c948aa8..a421bf6 100644 --- a/LabelStoreMax/lib/resources/themes/dark_theme.dart +++ b/LabelStoreMax/lib/resources/themes/dark_theme.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/config/font.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; +import 'package:flutter_app/resources/themes/styles/color_styles.dart'; import 'package:flutter_app/resources/themes/text_theme/default_text_theme.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:nylo_framework/nylo_framework.dart'; @@ -15,7 +15,7 @@ import 'package:nylo_framework/nylo_framework.dart'; |-------------------------------------------------------------------------- */ -ThemeData darkTheme(BaseColorStyles darkColors) { +ThemeData darkTheme(ColorStyles darkColors) { try { appFont = GoogleFonts.getFont( AppHelper.instance.appConfig!.themeFont ?? "Poppins"); diff --git a/LabelStoreMax/lib/resources/themes/light_theme.dart b/LabelStoreMax/lib/resources/themes/light_theme.dart index ae13833..9547afd 100644 --- a/LabelStoreMax/lib/resources/themes/light_theme.dart +++ b/LabelStoreMax/lib/resources/themes/light_theme.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/config/font.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; +import 'package:flutter_app/resources/themes/styles/color_styles.dart'; import 'package:flutter_app/resources/themes/text_theme/default_text_theme.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:nylo_framework/nylo_framework.dart'; @@ -15,7 +15,7 @@ import 'package:nylo_framework/nylo_framework.dart'; |-------------------------------------------------------------------------- */ -ThemeData lightTheme(BaseColorStyles lightColors) { +ThemeData lightTheme(ColorStyles lightColors) { try { appFont = GoogleFonts.getFont( AppHelper.instance.appConfig!.themeFont ?? "Poppins"); diff --git a/LabelStoreMax/lib/resources/themes/styles/base_styles.dart b/LabelStoreMax/lib/resources/themes/styles/color_styles.dart similarity index 88% rename from LabelStoreMax/lib/resources/themes/styles/base_styles.dart rename to LabelStoreMax/lib/resources/themes/styles/color_styles.dart index dc19230..15c29db 100644 --- a/LabelStoreMax/lib/resources/themes/styles/base_styles.dart +++ b/LabelStoreMax/lib/resources/themes/styles/color_styles.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:nylo_framework/nylo_framework.dart'; /// Interface for your base styles. /// Add more styles here and then implement in /// light_theme_colors.dart and dark_theme_colors.dart. -abstract class BaseColorStyles { +abstract class ColorStyles extends BaseColorStyles { // general Color get background; Color get backgroundContainer; diff --git a/LabelStoreMax/lib/resources/themes/styles/dark_theme_colors.dart b/LabelStoreMax/lib/resources/themes/styles/dark_theme_colors.dart index aa2ff89..23eaa47 100644 --- a/LabelStoreMax/lib/resources/themes/styles/dark_theme_colors.dart +++ b/LabelStoreMax/lib/resources/themes/styles/dark_theme_colors.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; +import 'package:flutter_app/resources/themes/styles/color_styles.dart'; /* |-------------------------------------------------------------------------- @@ -8,7 +8,7 @@ import 'package:flutter_app/resources/themes/styles/base_styles.dart'; |-------------------------------------------------------------------------- */ -class DarkThemeColors implements BaseColorStyles { +class DarkThemeColors implements ColorStyles { // general @override Color get background => Color(int.parse( diff --git a/LabelStoreMax/lib/resources/themes/styles/light_theme_colors.dart b/LabelStoreMax/lib/resources/themes/styles/light_theme_colors.dart index a931184..4c722f8 100644 --- a/LabelStoreMax/lib/resources/themes/styles/light_theme_colors.dart +++ b/LabelStoreMax/lib/resources/themes/styles/light_theme_colors.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_app/bootstrap/app_helper.dart'; -import 'package:flutter_app/resources/themes/styles/base_styles.dart'; +import 'package:flutter_app/resources/themes/styles/color_styles.dart'; /* |-------------------------------------------------------------------------- @@ -8,7 +8,7 @@ import 'package:flutter_app/resources/themes/styles/base_styles.dart'; |-------------------------------------------------------------------------- */ -class LightThemeColors implements BaseColorStyles { +class LightThemeColors implements ColorStyles { // general @override diff --git a/LabelStoreMax/lib/resources/widgets/buttons.dart b/LabelStoreMax/lib/resources/widgets/buttons.dart index 67198ae..3cb5977 100644 --- a/LabelStoreMax/lib/resources/widgets/buttons.dart +++ b/LabelStoreMax/lib/resources/widgets/buttons.dart @@ -31,8 +31,8 @@ class PrimaryButton extends StatelessWidget { textStyle: Theme.of(context).textTheme.button!.copyWith( fontSize: 16, fontWeight: FontWeight.bold, - color: ThemeColor.get(context)!.buttonPrimaryContent), - bgColor: ThemeColor.get(context)!.buttonBackground, + color: ThemeColor.get(context).buttonPrimaryContent), + bgColor: ThemeColor.get(context).buttonBackground, ); } diff --git a/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart b/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart index c507d79..eb63767 100644 --- a/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/compo_home_widget.dart @@ -6,7 +6,7 @@ import 'package:flutter_app/resources/widgets/buttons.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/home_drawer_widget.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; -import 'package:flutter_swiper_tv/flutter_swiper.dart'; +import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:nylo_framework/nylo_framework.dart'; import 'package:woosignal/models/response/product_category.dart'; import 'package:woosignal/models/response/woosignal_app.dart'; diff --git a/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart b/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart index 0c93fc0..f885d00 100644 --- a/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/home_drawer_widget.dart @@ -45,14 +45,14 @@ class _HomeDrawerWidgetState extends State { bool isDark = (Theme.of(context).brightness == Brightness.dark); return Drawer( child: Container( - color: ThemeColor.get(context)!.background, + color: ThemeColor.get(context).background, child: ListView( padding: EdgeInsets.zero, children: [ DrawerHeader( child: Center(child: StoreLogo()), decoration: BoxDecoration( - color: ThemeColor.get(context)!.background, + color: ThemeColor.get(context).background, ), ), if (["compo"].contains(_themeType) == false) diff --git a/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart b/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart index 28f4942..0fe3cf1 100644 --- a/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/notic_home_widget.dart @@ -8,7 +8,7 @@ import 'package:flutter_app/resources/widgets/home_drawer_widget.dart'; import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart'; import 'package:flutter_app/resources/widgets/safearea_widget.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; -import 'package:flutter_swiper_tv/flutter_swiper.dart'; +import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:nylo_framework/nylo_framework.dart'; import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart'; import 'package:woosignal/models/response/woosignal_app.dart'; 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 489fdeb..2031ce5 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_footer_actions_widget.dart @@ -38,7 +38,7 @@ class ProductDetailFooterActionsWidget extends StatelessWidget { height: 140, padding: EdgeInsets.symmetric(horizontal: 16), decoration: BoxDecoration( - color: ThemeColor.get(context)!.background, + color: ThemeColor.get(context).background, boxShadow: [ BoxShadow( color: Colors.black12, diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_image_swiper_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_image_swiper_widget.dart index cc116ee..30ef3d8 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_image_swiper_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_image_swiper_widget.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; -import 'package:flutter_swiper_tv/flutter_swiper.dart'; +import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:nylo_framework/nylo_framework.dart'; import 'package:woosignal/models/response/products.dart'; diff --git a/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart b/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart index 7f9dc3c..032f612 100644 --- a/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart +++ b/LabelStoreMax/lib/resources/widgets/product_detail_reviews_widget.dart @@ -51,8 +51,8 @@ class _ProductDetailReviewsWidgetState children: [ Expanded( child: ExpansionTile( - textColor: ThemeColor.get(context)!.primaryAccent, - iconColor: ThemeColor.get(context)!.primaryAccent, + textColor: ThemeColor.get(context).primaryAccent, + iconColor: ThemeColor.get(context).primaryAccent, tilePadding: EdgeInsets.symmetric(horizontal: 16), childrenPadding: EdgeInsets.all(0), title: AutoSizeText( diff --git a/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart b/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart index 28b7689..96611cc 100644 --- a/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart +++ b/LabelStoreMax/lib/resources/widgets/woosignal_ui.dart @@ -21,7 +21,7 @@ import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart'; import 'package:flutter_app/resources/widgets/top_nav_widget.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; -import 'package:flutter_swiper_tv/flutter_swiper.dart'; +import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:nylo_framework/nylo_framework.dart'; import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart'; import 'package:woosignal/models/response/products.dart'; @@ -234,7 +234,7 @@ class TextEditingRow extends StatelessWidget { style: Theme.of(context) .textTheme .bodyText1! - .copyWith(color: ThemeColor.get(context)!.primaryContent), + .copyWith(color: ThemeColor.get(context).primaryContent), ), padding: EdgeInsets.only(bottom: 2), ), @@ -459,7 +459,7 @@ wsModalBottom(BuildContext context, child: Container( padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( - color: ThemeColor.get(context)!.background, + color: ThemeColor.get(context).background, borderRadius: BorderRadius.only( topLeft: const Radius.circular(10.0), topRight: const Radius.circular(10.0), @@ -484,7 +484,7 @@ wsModalBottom(BuildContext context, (Theme.of(context).brightness == Brightness.light) ? wsBoxShadow() : null, - color: ThemeColor.get(context)!.background, + color: ThemeColor.get(context).background, borderRadius: BorderRadius.circular(8), ), child: bodyWidget, diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock index df82991..71d1810 100644 --- a/LabelStoreMax/pubspec.lock +++ b/LabelStoreMax/pubspec.lock @@ -161,42 +161,42 @@ packages: name: device_info_plus url: "https://pub.dartlang.org" source: hosted - version: "3.2.3" + version: "4.1.2" device_info_plus_linux: dependency: transitive description: name: device_info_plus_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.0" device_info_plus_macos: dependency: transitive description: name: device_info_plus_macos url: "https://pub.dartlang.org" source: hosted - version: "2.2.3" + version: "3.0.0" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.3.0+1" + version: "3.0.0" device_info_plus_web: dependency: transitive description: name: device_info_plus_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "3.0.0" device_info_plus_windows: dependency: transitive description: name: device_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "4.0.0" dio: dependency: transitive description: @@ -224,7 +224,7 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "2.0.1" file: dependency: transitive description: @@ -277,13 +277,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_page_indicator_tv: - dependency: transitive - description: - name: flutter_page_indicator_tv - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.3-nullsafety" flutter_rating_bar: dependency: "direct main" description: @@ -297,21 +290,21 @@ packages: name: flutter_secure_storage url: "https://pub.dartlang.org" source: hosted - version: "5.0.2" + version: "6.0.0" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" flutter_secure_storage_platform_interface: dependency: transitive description: @@ -346,14 +339,14 @@ packages: name: flutter_staggered_grid_view url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "0.6.2" flutter_stripe: dependency: "direct main" description: name: flutter_stripe url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "4.0.0" flutter_styled_toast: dependency: "direct main" description: @@ -368,13 +361,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" - flutter_swiper_tv: + flutter_swiper_view: dependency: "direct main" description: - name: flutter_swiper_tv + name: flutter_swiper_view url: "https://pub.dartlang.org" source: hosted - version: "1.1.6-nullsafety" + version: "1.1.8" flutter_test: dependency: "direct dev" description: flutter @@ -489,7 +482,7 @@ packages: name: google_fonts url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "3.0.1" html: dependency: "direct main" description: @@ -622,14 +615,14 @@ packages: name: nylo_framework url: "https://pub.dartlang.org" source: hosted - version: "3.1.4" + version: "3.3.0" nylo_support: dependency: transitive description: name: nylo_support url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.4.0" octo_image: dependency: transitive description: @@ -651,6 +644,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.2" + package_info_plus: + dependency: transitive + description: + name: package_info_plus + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.3+1" + package_info_plus_linux: + dependency: transitive + description: + name: package_info_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + package_info_plus_macos: + dependency: transitive + description: + name: package_info_plus_macos + url: "https://pub.dartlang.org" + 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" + source: hosted + version: "1.0.2" + package_info_plus_web: + dependency: transitive + description: + name: package_info_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + package_info_plus_windows: + dependency: transitive + description: + name: package_info_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" page_transition: dependency: "direct main" description: @@ -706,7 +741,7 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.7" path_provider_macos: dependency: transitive description: @@ -727,7 +762,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.1.2" pedantic: dependency: transitive description: @@ -790,7 +825,7 @@ packages: name: razorpay_flutter url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.2" recase: dependency: transitive description: @@ -921,21 +956,21 @@ packages: name: stripe_android url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "4.0.0" stripe_ios: dependency: transitive description: name: stripe_ios url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "4.0.0" stripe_platform_interface: dependency: transitive description: name: stripe_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "4.0.0" synchronized: dependency: transitive description: @@ -964,13 +999,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.5.0" - transformer_page_view_tv: - dependency: transitive - description: - name: transformer_page_view_tv - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.7-nullsafety" typed_data: dependency: transitive description: @@ -984,7 +1012,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.4" + version: "6.1.5" url_launcher_android: dependency: transitive description: @@ -1166,14 +1194,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.11" + version: "2.7.0" woosignal: dependency: "direct main" description: name: woosignal url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" wp_json_api: dependency: "direct main" description: diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index e3e5da0..ccd7c6c 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -1,7 +1,7 @@ # Official WooSignal App Template for WooCommerce # Label StoreMax -# Version: 6.1.0 +# Version: 6.2.0 # Author: Anthony Gordon # Homepage: https://woosignal.com # Documentation: https://woosignal.com/docs/app/label-storemax @@ -25,13 +25,13 @@ environment: sdk: '>=2.17.0 <3.0.0' dependencies: - google_fonts: ^2.3.3 + google_fonts: ^3.0.1 analyzer: ^4.2.0 intl: ^0.17.0 page_transition: ^2.0.9 - nylo_framework: ^3.1.4 - woosignal: ^3.1.0 - flutter_stripe: ^3.2.0 + nylo_framework: ^3.3.0 + woosignal: ^3.1.1 + flutter_stripe: ^4.0.0 wp_json_api: ^3.2.0 cached_network_image: ^3.2.1 package_info: ^2.0.2 @@ -39,11 +39,11 @@ dependencies: flutter_web_browser: ^0.17.1 webview_flutter: ^3.0.4 pull_to_refresh_flutter3: 2.0.1 - url_launcher: ^6.1.4 + url_launcher: ^6.1.5 flutter_styled_toast: ^2.1.3 animate_do: ^2.1.0 bubble_tab_indicator: ^0.1.5 - razorpay_flutter: ^1.3.0 + razorpay_flutter: ^1.3.2 status_alert: ^1.0.0 math_expressions: ^2.3.1 validated: ^2.0.0 @@ -52,8 +52,8 @@ dependencies: html: ^0.15.0 flutter_widget_from_html: ^0.8.5 flutter_rating_bar: ^4.0.1 - flutter_staggered_grid_view: ^0.6.1 - flutter_swiper_tv: ^1.1.6-nullsafety + flutter_staggered_grid_view: ^0.6.2 + flutter_swiper_view: ^1.1.8 # firebase_messaging: ^11.2.3 # firebase_core: ^1.10.5 flutter: diff --git a/README.md b/README.md index c6e0552..2041e79 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # WooCommerce App: Label StoreMax -### Label StoreMax - v6.1.0 +### Label StoreMax - v6.2.0 [Official WooSignal WooCommerce App](https://woosignal.com)