Merge pull request #42 from woosignal/dependency-updates

v6.2.0 - Dependency updates

Author: agordn52

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

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)

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

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

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'],
     ));
 

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<AppTheme> 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<Locale> supportedLocales) {

LabelStoreMax/lib/bootstrap/base_theme_config.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<User?> getUser() async =>
     (await (NyStorage.read<User>(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<BaseThemeConfig> 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;
   }
 }
 

LabelStoreMax/lib/bootstrap/helpers.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<BaseThemeConfig> 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();
 
 /*
 |--------------------------------------------------------------------------

LabelStoreMax/lib/config/theme.dart

@@ -155,7 +155,7 @@ class _AccountBillingDetailsPageState extends State<AccountBillingDetailsPage> {
                             ],
                           ),
                           decoration: BoxDecoration(
-                            color: ThemeColor.get(context)!.surfaceBackground,
+                            color: ThemeColor.get(context).surfaceBackground,
                             borderRadius: BorderRadius.circular(10),
                             boxShadow: (Theme.of(context).brightness ==
                                     Brightness.light)