v2.3.0

Author: agordn52

ShopMax/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.3.0] - 2025-05-28
+
+* Upgrade project
+* pubspec.yaml updates
+
 ## [2.2.0] - 2025-02-07
 
 * pubspec.yaml updates

ShopMax/android/app/build.gradle

@@ -75,5 +75,5 @@ flutter {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 }

ShopMax/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ShopMax/lib/app/forms/login_form.dart

@@ -8,18 +8,19 @@ import 'package:nylo_framework/nylo_framework.dart';
 |-------------------------------------------------------------------------- */
 
 class LoginForm extends NyFormData {
-
   LoginForm({String? name}) : super(name ?? "login");
 
   @override
   fields() => [
-     Field.email("Email",
-        style: "compact",
-       validate: FormValidator.email(),
-    ),
-    Field.password("Password",
-        style: "compact",
-      validate: FormValidator.password(strength: 1),
-    ),
-  ];
+        Field.email(
+          "Email",
+          style: "compact",
+          validate: FormValidator.email(),
+        ),
+        Field.password(
+          "Password",
+          style: "compact",
+          validate: FormValidator.password(strength: 1),
+        ),
+      ];
 }

ShopMax/lib/app/forms/register_form.dart

@@ -8,29 +8,21 @@ import 'package:nylo_framework/nylo_framework.dart';
 |-------------------------------------------------------------------------- */
 
 class RegisterForm extends NyFormData {
-
   RegisterForm({String? name}) : super(name ?? "register");
 
   @override
   fields() => [
-    [
-      Field.text("First Name",
-          style: "compact",
-          validate: FormValidator.maxLength(100)
-      ),
-      Field.text("Last Name",
-          style: "compact",
-          validate: FormValidator.maxLength(100)
-      ),
-    ],
-     Field.email("Email Address",
-        style: "compact",
-       validate: FormValidator.email()
-    ),
-    Field.password("Password",
-        style: "compact",
-      viewable: true,
-        validate: FormValidator.password()
-    ),
-  ];
-}
+        [
+          Field.text("First Name",
+              style: "compact", validate: FormValidator.maxLength(100)),
+          Field.text("Last Name",
+              style: "compact", validate: FormValidator.maxLength(100)),
+        ],
+        Field.email("Email Address",
+            style: "compact", validate: FormValidator.email()),
+        Field.password("Password",
+            style: "compact",
+            viewable: true,
+            validate: FormValidator.password()),
+      ];
+}

ShopMax/lib/app/providers/payments/stripe_pay.dart

@@ -75,7 +75,7 @@ stripePay(context) async {
               ? ThemeMode.light
               : ThemeMode.dark,
           merchantDisplayName:
-          getEnv('APP_NAME', defaultValue: wooSignalApp?.appName),
+              getEnv('APP_NAME', defaultValue: wooSignalApp?.appName),
           customerId: rsp!['customer'],
           paymentIntentClientSecret: rsp!['client_secret'],
           customerEphemeralKeySecret: rsp!['ephemeral_key'],

ShopMax/lib/app/providers/route_provider.dart

@@ -15,21 +15,4 @@ class RouteProvider implements NyProvider {
   afterBoot(Nylo nylo) async {
     nylo.initRoutes();
   }
-
-// _onDeepLink(route, data) {
-//   print("Deep link route: $route");
-//   print("Deep link data: $data");
-
-// Example of updating the route stack
-//  if (route == ProfilePage.path) {
-//    Nylo.updateRouteStack([
-//      SettingsPage.path, // first route
-//      PostsPage.path, // second route
-//      PostDetailPage.path, // and so on..
-//      ProfilePage.path // deep link route
-//    ], replace: true, deepLink: true, dataForRoute: {
-//          PostsPage.path: {"name": "John Doe"}
-//    });
-//  }
-// }
 }

ShopMax/lib/app/providers/woosignal_provider.dart

@@ -4,13 +4,11 @@ import '/bootstrap/helpers.dart';
 import '/bootstrap/app_helper.dart';
 import 'package:woosignal_shopify_api/woosignal_shopify_api.dart' as shopify;
 import 'package:woosignal_shopify_api/models/response/woosignal_app.dart'
-as shopify;
+    as shopify;
 
 class WoosignalProvider implements NyProvider {
-
   @override
   boot(Nylo nylo) async {
-
     await shopify.WooSignalShopify.instance.init(
       appKey: getEnv('APP_KEY'),
       debugMode: getEnv('APP_DEBUG'),
@@ -41,7 +39,7 @@ class WoosignalProvider implements NyProvider {
 
     // WooSignal Setup
     shopify.WooSignalApp? wooSignalApp = await (appWooSignalShopify(
-            (api) => api.getApp(encrypted: shouldEncrypt())));
+        (api) => api.getApp(encrypted: shouldEncrypt())));
 
     Locale? locale;
 
@@ -58,17 +56,16 @@ class WoosignalProvider implements NyProvider {
 
     await NyLocalization.instance.init(
       localeType: localeType,
-      languageCode: locale?.languageCode ?? languageCode,
+      languageCode: (locale?.languageCode ?? languageCode) ?? "en",
       assetsDirectory: assetsDirectory,
     );
-   
-     return nylo;
+
+    return nylo;
   }
-  
+
   @override
   afterBoot(Nylo nylo) async {
-   
-     // Called after Nylo has finished booting
-     // ...
+    // Called after Nylo has finished booting
+    // ...
   }
 }

ShopMax/lib/bootstrap/extensions.dart

@@ -56,9 +56,9 @@ extension DateTimeExtension on DateTime? {
   }
 
   bool? isBetween(
-      DateTime fromDateTime,
-      DateTime toDateTime,
-      ) {
+    DateTime fromDateTime,
+    DateTime toDateTime,
+  ) {
     final date = this;
     if (date != null) {
       final isAfter = date.isAfterOrEqualTo(fromDateTime) ?? false;
@@ -80,4 +80,4 @@ extension ColorApp on Color {
     assert(opacity >= 0.0 && opacity <= 1.0);
     return withAlpha((255.0 * opacity).round());
   }
-}
+}

ShopMax/lib/bootstrap/helpers.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:woosignal_shopify_api/money_formatter/money_formatter.dart';
 import '/bootstrap/status_alert/models/status_alert_media_configuration.dart';
 import '/bootstrap/status_alert/status_alert.dart';
 import '/app/models/cart.dart';
@@ -18,7 +19,6 @@ import '/config/currency.dart';
 import '/config/payment_gateways.dart';
 import '/config/keys.dart';
 import 'package:html/parser.dart';
-import 'package:money_formatter/money_formatter.dart';
 import 'package:nylo_framework/nylo_framework.dart';
 import 'package:woosignal_shopify_api/models/response/auth/auth_customer_info.dart';
 import 'package:woosignal_shopify_api/woosignal_shopify_api.dart';
@@ -38,7 +38,6 @@ class ThemeColor {
   static Color fromHex(String hexColor) => nyHexColor(hexColor);
 }
 
-
 Future appWooSignalShopify(Function(WooSignalShopify api) api) async {
   return await api(WooSignalShopify.instance);
 }
@@ -53,7 +52,7 @@ bool isProductNew(DateTime? createdAt) {
   if (createdAt == null) false;
   try {
     return createdAt.isBetween(
-        DateTime.now().subtract(Duration(days: 2)), DateTime.now()) ??
+            DateTime.now().subtract(Duration(days: 2)), DateTime.now()) ??
         false;
   } on Exception catch (e) {
     NyLogger.error(e.toString());
@@ -82,18 +81,18 @@ Future<List<PaymentType?>> getShopifyPaymentTypes() async {
 
   for (var appPaymentGateway in appPaymentGateways) {
     paymentTypes.add(paymentTypeList.firstWhereOrNull(
-            (paymentTypeList) => paymentTypeList.name == appPaymentGateway));
+        (paymentTypeList) => paymentTypeList.name == appPaymentGateway));
   }
 
   return paymentTypes.where((v) => v != null).toList();
 }
 
 PaymentType addPayment(
-    {required int id,
-      required String name,
-      required String description,
-      required String assetImage,
-      required Function pay}) =>
+        {required int id,
+        required String name,
+        required String description,
+        required String assetImage,
+        required Function pay}) =>
     PaymentType(
       id: id,
       name: name,
@@ -104,9 +103,9 @@ PaymentType addPayment(
 
 showStatusAlert(context,
     {required String title,
-      required String subtitle,
-      IconData? icon,
-      int? duration}) {
+    required String subtitle,
+    IconData? icon,
+    int? duration}) {
   StatusAlert.show(
     context,
     duration: Duration(seconds: duration ?? 2),
@@ -127,7 +126,7 @@ String moneyFormatter(double amount) {
       amount: amount,
       settings: MoneyFormatterSettings(
           symbol:
-          AppHelper.instance.shopifyAppConfig?.currencyMeta?.symbolNative,
+              AppHelper.instance.shopifyAppConfig?.currencyMeta?.symbolNative,
           symbolAndNumberSeparator: ""),
     );
     if (appCurrencySymbolPosition == SymbolPositionType.left) {
@@ -177,9 +176,9 @@ bool isNumeric(String? str) {
 
 checkoutShopify(
     Function(String total, BillingDetails? billingDetails, Cart cart)
-    completeCheckout) async {
+        completeCheckout) async {
   String cartTotal =
-  await shopify.CheckoutSession.getInstance.total(withFormat: false);
+      await shopify.CheckoutSession.getInstance.total(withFormat: false);
   BillingDetails? billingDetails =
       shopify.CheckoutSession.getInstance.billingDetails;
   Cart cart = Cart.getInstance;
@@ -188,9 +187,9 @@ checkoutShopify(
 
 navigatorPush(BuildContext context,
     {required String routeName,
-      Object? arguments,
-      bool forgetAll = false,
-      int? forgetLast}) {
+    Object? arguments,
+    bool forgetAll = false,
+    int? forgetLast}) {
   if (forgetAll) {
     Navigator.of(context).pushNamedAndRemoveUntil(
         routeName, (Route<dynamic> route) => false,
@@ -216,13 +215,13 @@ class UserAuth {
 
 Future<List<DefaultShipping>> getDefaultShipping() async {
   String data =
-  await rootBundle.loadString('public/json/default_shipping.json');
+      await rootBundle.loadString('public/json/default_shipping.json');
   dynamic dataJson = json.decode(data);
   List<DefaultShipping> shipping = [];
 
   dataJson.forEach((key, value) {
     DefaultShipping defaultShipping =
-    DefaultShipping(code: key, country: value['country'], states: []);
+        DefaultShipping(code: key, country: value['country'], states: []);
     if (value['states'] != null) {
       value['states'].forEach((key1, value2) {
         defaultShipping.states
@@ -237,7 +236,7 @@ Future<List<DefaultShipping>> getDefaultShipping() async {
 Future<DefaultShipping?> findCountryMetaForShipping(String countryCode) async {
   List<DefaultShipping> defaultShipping = await getDefaultShipping();
   List<DefaultShipping> shippingByCountryCode =
-  defaultShipping.where((element) => element.code == countryCode).toList();
+      defaultShipping.where((element) => element.code == countryCode).toList();
   if (shippingByCountryCode.isNotEmpty) {
     return shippingByCountryCode.first;
   }
@@ -247,7 +246,7 @@ Future<DefaultShipping?> findCountryMetaForShipping(String countryCode) async {
 DefaultShippingState? findDefaultShippingStateByCode(
     DefaultShipping defaultShipping, String code) {
   List<DefaultShippingState> defaultShippingStates =
-  defaultShipping.states.where((state) => state.code == code).toList();
+      defaultShipping.states.where((state) => state.code == code).toList();
   if (defaultShippingStates.isEmpty) {
     return null;
   }
@@ -262,7 +261,7 @@ String truncateString(String data, int length) {
 
 Future<List<String>> getWishlistProducts() async {
   List<String> currentProductsJSON =
-  await (NyStorage.readCollection(Keys.wishlistProducts));
+      await (NyStorage.readCollection(Keys.wishlistProducts));
 
   return currentProductsJSON;
 }
@@ -350,7 +349,7 @@ class NyNotification {
   /// Get all notifications
   static Future<List<NotificationItem>> allNotifications() async {
     List<NotificationItem> notifications =
-    await NyStorage.readCollection("app_notifications");
+        await NyStorage.readCollection("app_notifications");
     String? userId = await WooSignalShopify.authUserId();
     notifications.removeWhere((notification) {
       if (notification.meta != null &&