v8.0.0

LabelStoreMax/.env

@@ -6,8 +6,8 @@ APP_DEBUG="true"
 APP_URL="https://mywoocommercestore.com"
 API_BASE_URL="https://mywoocommercestore.com"
 
-ASSET_PATH_PUBLIC="public/assets/"
-ASSET_PATH_IMAGES="public/assets/images"
+ASSET_PATH_PUBLIC="public/"
+ASSET_PATH_IMAGES="public/images"
 TIMEZONE="UTC"
 
 LIGHT_THEME_ID="default_light_theme"

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [8.0.0] - 2024-12-01
+
+* Update project for Nylo 6.x
+* Pubspec.yaml dependency updates
+
 ## [7.5.7] - 2024-07-31
 
 * Update order_wc.dart class

LabelStoreMax/analysis_options.yaml

@@ -11,7 +11,7 @@
 # (the recommended set includes the core lints).
 # The core lints are also what is used by pub.dev for scoring packages.
 
-include: package:lints/recommended.yaml
+#include: package:flutter_lints/flutter.yaml
 
 # Uncomment the following section to specify additional rules.
 

LabelStoreMax/android/app/build.gradle

@@ -23,11 +23,23 @@ if (flutterVersionName == null) {
 }
 
 android {
+    namespace "com.woosignal.android"
+    compileSdk 35
+    ndkVersion = "25.1.8937393"
+
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
     }
 
-    compileSdkVersion 34
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = 17
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -60,4 +72,6 @@ flutter {
     source '../..'
 }
 
-dependencies {}
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+}

LabelStoreMax/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.woosignal.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

LabelStoreMax/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.woosignal.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

LabelStoreMax/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.woosignal.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

LabelStoreMax/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

LabelStoreMax/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

LabelStoreMax/android/settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+    id "com.android.application" version "8.3.2" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"

LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj

@@ -490,6 +490,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -672,6 +673,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -698,6 +700,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";

LabelStoreMax/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

LabelStoreMax/ios/Runner/Info.plist

@@ -28,6 +28,12 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+		<string>fetch</string>
+		<string>processing</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

LabelStoreMax/ios/Runner/Runner.entitlements

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
 </plist>

LabelStoreMax/lib/app/controllers/controller.dart

@@ -11,7 +11,7 @@
 import 'package:nylo_framework/nylo_framework.dart';
 
 /// Base Controller for the Nylo
-/// See more on controllers here - https://nylo.dev/docs/5.20.0/controllers
+/// See more on controllers here - https://nylo.dev/docs/6.x/controllers
 class Controller extends NyController {
   Controller();
 }

LabelStoreMax/lib/app/controllers/product_detail_controller.dart

@@ -11,7 +11,6 @@
 import 'package:flutter/material.dart';
 import '/app/models/cart.dart';
 import '/app/models/cart_line_item.dart';
-import '/bootstrap/enums/wishlist_action_enums.dart';
 import '/bootstrap/helpers.dart';
 import '/resources/widgets/cart_quantity_widget.dart';
 import '/resources/widgets/product_quantity_widget.dart';
@@ -26,14 +25,8 @@ class ProductDetailController extends Controller {
   int quantity = 1;
   Product? product;
 
-  @override
-  construct(BuildContext context) {
-    super.construct(context);
-    product = data() as Product?;
-  }
-
   viewExternalProduct() {
-    if (product!.externalUrl != null && product!.externalUrl!.isNotEmpty) {
+    if (product?.externalUrl?.isNotEmpty ?? false) {
       openBrowserTab(url: product!.externalUrl!);
     }
   }
@@ -55,13 +48,13 @@ class ProductDetailController extends Controller {
   }
 
   addQuantityTapped({Function? onSuccess}) {
-    if (product!.manageStock != null && product!.manageStock == true) {
-      if (quantity >= product!.stockQuantity!) {
+    if (product?.manageStock == true) {
+      if (quantity >= (product?.stockQuantity ?? 0)) {
         showToastNotification(context!,
             title: trans("Maximum quantity reached"),
             description:
-                "${trans("Sorry, only")} ${product!.stockQuantity} ${trans("left")}",
-            style: ToastNotificationStyleType.INFO);
+                "${trans("Sorry, only")} ${product?.stockQuantity ?? "0"} ${trans("left")}",
+            style: ToastNotificationStyleType.info);
         return;
       }
     }
@@ -86,28 +79,6 @@ class ProductDetailController extends Controller {
     }
   }
 
-  toggleWishList(
-      {required Function onSuccess,
-      required WishlistAction wishlistAction}) async {
-    String subtitleMsg;
-    if (wishlistAction == WishlistAction.remove) {
-      await removeWishlistProduct(product: product);
-      subtitleMsg = trans("This product has been removed from your wishlist");
-    } else {
-      await saveWishlistProduct(product: product);
-      subtitleMsg = trans("This product has been added to your wishlist");
-    }
-    showStatusAlert(
-      context,
-      title: trans("Success"),
-      subtitle: subtitleMsg,
-      icon: Icons.favorite,
-      duration: 1,
-    );
-
-    onSuccess();
-  }
-
   ws_product_variation.ProductVariation? findProductVariation(
       {required Map<int, dynamic> tmpAttributeObj,
       required List<ws_product_variation.ProductVariation> productVariations}) {

LabelStoreMax/lib/app/events/cart_remove_all_event.dart

@@ -0,0 +1,24 @@
+import '/resources/pages/cart_page.dart';
+import 'package:nylo_framework/nylo_framework.dart';
+
+import '/resources/widgets/shopping_cart_total_widget.dart';
+import '/app/models/cart.dart';
+
+class CartRemoveAllEvent implements NyEvent {
+  @override
+  final listeners = {
+    DefaultListener: DefaultListener(),
+  };
+}
+
+class DefaultListener extends NyListener {
+  @override
+  handle(dynamic event) async {
+    await Cart.getInstance.clear();
+
+    // update states
+    updateState(ShoppingCartTotal.state);
+    NyListView.stateReset("shopping_cart_items_list_view");
+    updateState(CartPage.path, data: {"action": "showToastCartCleared"});
+  }
+}

LabelStoreMax/lib/app/events/cart_remove_item_event.dart

@@ -0,0 +1,32 @@
+import '/resources/widgets/cart_quantity_widget.dart';
+import '/resources/pages/cart_page.dart';
+import 'package:nylo_framework/nylo_framework.dart';
+
+import '/resources/widgets/shopping_cart_total_widget.dart';
+import '/app/models/cart.dart';
+import '/app/models/cart_line_item.dart';
+
+class CartRemoveItemEvent implements NyEvent {
+  @override
+  final listeners = {
+    DefaultListener: DefaultListener(),
+  };
+}
+
+class DefaultListener extends NyListener {
+  @override
+  handle(dynamic event) async {
+    CartLineItem cartLineItem = event["cartLineItem"];
+    bool complete = (await Cart.getInstance.removeCartItem(cartLineItem));
+    if (complete != true) {
+      return;
+    }
+
+    // update states
+    updateState(CartPage.path, data: {"action": "showToastCartItemRemoved"});
+
+    updateState(ShoppingCartTotal.state);
+    NyListView.stateReset("shopping_cart_items_list_view");
+    updateState(CartQuantity.state);
+  }
+}

LabelStoreMax/lib/app/events/category_notification_event.dart

@@ -0,0 +1,39 @@
+import 'package:firebase_messaging/firebase_messaging.dart';
+import '/resources/pages/browse_category_page.dart';
+import 'package:nylo_framework/nylo_framework.dart';
+import 'package:wp_json_api/wp_json_api.dart';
+
+class CategoryNotificationEvent implements NyEvent {
+  @override
+  final listeners = {
+    DefaultListener: DefaultListener(),
+  };
+}
+
+class DefaultListener extends NyListener {
+  @override
+  handle(dynamic event) async {
+    RemoteMessage message = event['RemoteMessage'];
+
+    if (!message.data.containsKey('order_id')) {
+      return;
+    }
+    if (!message.data.containsKey('user_id')) {
+      return;
+    }
+
+    String userId = message.data['user_id'];
+
+    if ((await WPJsonAPI.wpUserLoggedIn()) != true) {
+      return;
+    }
+
+    String? currentUserId = await WPJsonAPI.wpUserId();
+    if (currentUserId != userId) {
+      return;
+    }
+
+    routeTo(BrowseCategoryPage.path,
+        data: int.parse(message.data['category_id']));
+  }
+}

LabelStoreMax/lib/app/forms/login_form.dart

@@ -0,0 +1,27 @@
+import 'package:nylo_framework/nylo_framework.dart';
+
+/* Login Form
+|--------------------------------------------------------------------------
+| Usage: https://nylo.dev/docs/6.x/forms#how-it-works
+| Casts: https://nylo.dev/docs/6.x/forms#form-casts
+| Validation Rules: https://nylo.dev/docs/6.x/validation#validation-rules
+|-------------------------------------------------------------------------- */
+
+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",
+          viewable: true,
+          validate: FormValidator.password(),
+        ),
+      ];
+}