Skip to content

Commit 29b744f

Browse files
agordn52agordn52
committed
v1.3.0
1 parent 03a3d43 commit 29b744f

File tree

14 files changed

+29
-62
lines changed

14 files changed

+29
-62
lines changed

‎ShopMax/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [1.3.0] - 2024-03-28
2+
3+
* Small refactor
4+
15
## [1.2.1] - 2024-03-27
26

37
* Update signing team for IOS

‎ShopMax/lib/app/providers/app_provider.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AppProvider implements NyProvider {
5858
wooSignalApp.locale != null) {
5959
locale = Locale(wooSignalApp.locale!);
6060
} else {
61-
locale = Locale(envVal('DEFAULT_LOCALE', defaultValue: 'en'));
61+
locale = Locale(getEnv('DEFAULT_LOCALE', defaultValue: 'en'));
6262
}
6363
}
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ stripePay(context) async {
7575
? ThemeMode.light
7676
: ThemeMode.dark,
7777
merchantDisplayName:
78-
envVal('APP_NAME', defaultValue: wooSignalApp?.appName),
78+
getEnv('APP_NAME', defaultValue: wooSignalApp?.appName),
7979
customerId: rsp!['customer'],
8080
paymentIntentClientSecret: rsp!['client_secret'],
8181
customerEphemeralKeySecret: rsp!['ephemeral_key'],

‎ShopMax/lib/bootstrap/helpers.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ Future<List<PaymentType?>> getShopifyPaymentTypes() async {
100100
return paymentTypes.where((v) => v != null).toList();
101101
}
102102

103-
dynamic envVal(String envVal, {dynamic defaultValue}) =>
104-
(getEnv(envVal) ?? defaultValue);
105-
106103
PaymentType addPayment(
107104
{required int id,
108105
required String name,

‎ShopMax/lib/config/design.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import '/resources/widgets/toast_notification_widget.dart';
55
import '/resources/widgets/woosignal_ui.dart';
66
import 'package:nylo_framework/nylo_framework.dart';
77

8-
/*
8+
/* Design
99
|--------------------------------------------------------------------------
10-
| Design
1110
| Contains widgets used in the Nylo framework.
1211
|
1312
| Learn more: https://nylo.dev/docs/5.20.0/themes
14-
|--------------------------------------------------------------------------
15-
*/
13+
|-------------------------------------------------------------------------- */
1614

1715
Widget logo = StoreLogo();
1816
// resources/widgets/woosignal_ui.dart

‎ShopMax/lib/config/font.dart‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
import 'package:flutter/material.dart';
22
import 'package:google_fonts/google_fonts.dart';
33

4-
/*
4+
/* Font
55
|--------------------------------------------------------------------------
6-
| Font
7-
|
86
| Uses Google Fonts - https://pub.dev/packages/google_fonts
97
|
108
| e.g. updating the font from "montserrat" to "lato"
119
| before: final TextStyle appThemeFont = GoogleFonts.montserrat();
1210
| after: final TextStyle appThemeFont = GoogleFonts.lato();
13-
|--------------------------------------------------------------------------
14-
*/
11+
|-------------------------------------------------------------------------- */
1512

1613
TextStyle appFont = GoogleFonts.poppins();
1714

‎ShopMax/lib/config/localization.dart‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,23 @@
11
import 'package:nylo_framework/nylo_framework.dart';
22

3-
/*
3+
/* Locale Type
44
|--------------------------------------------------------------------------
5-
| localeType
6-
| -------------------------------------------------------------------------
75
| Define if you want the application to read the locale from the users
86
| device settings or as you've defined in the [languageCode].
9-
|--------------------------------------------------------------------------
10-
*/
7+
|-------------------------------------------------------------------------- */
118
final LocaleType localeType = LocaleType.asDefined; // device, asDefined
129

13-
/*
10+
/* Language Code
1411
|--------------------------------------------------------------------------
15-
| languageCode
16-
| -------------------------------------------------------------------------
1712
| Define the language code you want to use. E.g. en, es, ar.
1813
| The language code should match the name of the file i.e /lang/es.json
19-
|--------------------------------------------------------------------------
20-
*/
14+
|-------------------------------------------------------------------------- */
2115
final String? languageCode = getEnv('DEFAULT_LOCALE', defaultValue: "en");
2216

23-
/*
17+
/* Languages List
2418
|--------------------------------------------------------------------------
25-
| languagesList
26-
| -------------------------------------------------------------------------
2719
| Add a list of supported languages.
28-
|--------------------------------------------------------------------------
29-
*/
20+
|-------------------------------------------------------------------------- */
3021
final List<String> languagesList = const [
3122
'en',
3223
'es',
@@ -37,21 +28,8 @@ final List<String> languagesList = const [
3728
'zh'
3829
];
3930

40-
/*
31+
/* Assets Directory
4132
|--------------------------------------------------------------------------
42-
| assetsDirectory
43-
| -------------------------------------------------------------------------
4433
| Asset directory for your languages.
45-
|--------------------------------------------------------------------------
46-
*/
34+
|-------------------------------------------------------------------------- */
4735
final String assetsDirectory = 'lang/';
48-
49-
/*
50-
|--------------------------------------------------------------------------
51-
| valuesAsMap
52-
| -------------------------------------------------------------------------
53-
| If you want to define your own language map in code rather than using
54-
| the asset json files.
55-
|--------------------------------------------------------------------------
56-
*/
57-
final Map<String, String> valuesAsMap = {};

‎ShopMax/lib/config/payment_gateways.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import 'package:nylo_framework/nylo_framework.dart';
1111
| Docs here: https://woosignal.com/docs/app/shopmax
1212
|-------------------------------------------------------------------------- */
1313

14-
const appPaymentGateways = ["Stripe", "PayPal"];
14+
const appPaymentGateways = [];
1515
// Available: "Stripe", "PayPal", "RazorPay"
16-
// e.g. app_payment_gateways = ["Stripe"]; will only use Stripe.
16+
// e.g. appPaymentGateways = ["Stripe"]; will only use Stripe.
1717

1818
List<PaymentType> paymentTypeList = [
1919
addPayment(

‎ShopMax/lib/config/providers.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import '/app/providers/event_provider.dart';
44
import '/app/providers/route_provider.dart';
55
import 'package:nylo_framework/nylo_framework.dart';
66

7-
/*
7+
/* Providers
88
|--------------------------------------------------------------------------
9-
| Providers
109
| Add your "app/providers" here.
1110
| Providers are booted when your application start.
1211
|
1312
| Learn more: https://nylo.dev/docs/5.20.0/providers
14-
|--------------------------------------------------------------------------
15-
*/
13+
|-------------------------------------------------------------------------- */
1614

1715
final Map<Type, NyProvider> providers = {
1816
AppProvider: AppProvider(),

‎ShopMax/lib/config/theme.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ import '/resources/themes/styles/color_styles.dart';
66
import '/resources/themes/styles/dark_theme_colors.dart';
77
import '/resources/themes/styles/light_theme_colors.dart';
88

9-
/*
9+
/* Flutter Themes
1010
|--------------------------------------------------------------------------
11-
| Flutter Themes
1211
| Run the below in the terminal to add a new theme.
1312
| "dart run nylo_framework:main make:theme bright_theme"
1413
|
1514
| Learn more: https://nylo.dev/docs/5.20.0/themes-and-styling
16-
|--------------------------------------------------------------------------
17-
*/
15+
|-------------------------------------------------------------------------- */
1816

1917
// App Themes
2018
final List<BaseThemeConfig<ColorStyles>> appThemes = [

0 commit comments

Comments
 (0)