v6.4.1 updates

Author: agordn52

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

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)

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 = (
 			);

LabelStoreMax/ios/Runner/Info.plist

@@ -63,5 +63,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

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'

LabelStoreMax/lib/bootstrap/helpers.dart

@@ -56,18 +56,18 @@ class ThemeColor {
   static ColorStyles get(BuildContext context, {String? themeId}) {
 
     Nylo nylo = Backpack.instance.read('nylo');
-    List<BaseThemeConfig> appThemes = nylo.appThemes;
+    List<BaseThemeConfig<ColorStyles>> appThemes = nylo.appThemes as List<BaseThemeConfig<ColorStyles>>;
 
     if (themeId == null) {
-      dynamic themeFound = appThemes
+      BaseThemeConfig<ColorStyles> 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);
+    BaseThemeConfig<ColorStyles> baseThemeConfig = appThemes.firstWhere((theme) => theme.id == themeId, orElse: () => appThemes.first);
     return baseThemeConfig.colors;
   }
 }

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

LabelStoreMax/lib/config/theme.dart

@@ -12,7 +12,7 @@ import 'package:nylo_framework/nylo_framework.dart';
 */
 
 // App Themes
-final List<BaseThemeConfig> appThemes = [
+final List<BaseThemeConfig<ColorStyles>> appThemes = [
   ThemeConfig.light(),
   ThemeConfig.dark(),
 ];
@@ -38,15 +38,15 @@ ColorStyles darkColors = DarkThemeColors();
 // Preset Themes
 class ThemeConfig {
   // LIGHT
-  static BaseThemeConfig light() => BaseThemeConfig(
+  static BaseThemeConfig<ColorStyles> light() => BaseThemeConfig<ColorStyles>(
         id: "default_light_theme",
         description: "Light theme",
         theme: lightTheme(lightColors),
         colors: lightColors,
       );
 
   // DARK
-  static BaseThemeConfig dark() => BaseThemeConfig(
+  static BaseThemeConfig<ColorStyles> dark() => BaseThemeConfig<ColorStyles>(
         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<ColorStyles> bright() => BaseThemeConfig<ColorStyles>(
   ///  id: "default_bright_theme",
   ///  description: "Bright theme",
   ///  theme: brightTheme(brightColors),

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';
 

LabelStoreMax/lib/resources/pages/account_delete_page.dart

@@ -51,7 +51,7 @@ class _AccountDeletePageState extends NyState<AccountDeletePage> {
                 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),