dependency-updates

This commit is contained in:
Anthony 2022-08-29 15:34:56 +08:00
parent 1e108c6c89
commit 0132c76569
37 changed files with 157 additions and 143 deletions

View File

@ -1,3 +1,10 @@
## [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 ## [6.1.0] - 2022-07-09
* Add RazorPay * Add RazorPay

View File

@ -4,7 +4,7 @@
# WooCommerce App: Label StoreMax # WooCommerce App: Label StoreMax
### Label StoreMax - v6.1.0 ### Label StoreMax - v6.2.0
[Official WooSignal WooCommerce App](https://woosignal.com) [Official WooSignal WooCommerce App](https://woosignal.com)

View File

@ -44,7 +44,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.woosignal.android" applicationId "com.woosignal.android"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 31
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
multiDexEnabled true multiDexEnabled true

View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/bootstrap/helpers.dart'; import 'package:flutter_app/bootstrap/helpers.dart';
import 'package:flutter_app/config/theme.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
import 'package:flutter_app/config/localization.dart'; import 'package:flutter_app/config/localization.dart';
import 'package:woosignal/models/response/woosignal_app.dart'; import 'package:woosignal/models/response/woosignal_app.dart';
@ -91,6 +92,8 @@ class AppProvider implements NyProvider {
assetsDirectory: assetsDirectory, assetsDirectory: assetsDirectory,
valuesAsMap: valuesAsMap); valuesAsMap: valuesAsMap);
nylo.appThemes = appThemes;
return nylo; return nylo;
} }
} }

View File

@ -80,16 +80,11 @@ stripePay(context,
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters( paymentSheetParameters: SetupPaymentSheetParameters(
applePay: false,
googlePay: false,
style: Theme.of(state.context).brightness == Brightness.light style: Theme.of(state.context).brightness == Brightness.light
? ThemeMode.light ? ThemeMode.light
: ThemeMode.dark, : ThemeMode.dark,
testEnv: liveMode,
merchantCountryCode: envVal('STRIPE_COUNTRY_CODE',
defaultValue: wooSignalApp!.stripeCountryCode),
merchantDisplayName: merchantDisplayName:
envVal('APP_NAME', defaultValue: wooSignalApp.appName), envVal('APP_NAME', defaultValue: wooSignalApp?.appName),
paymentIntentClientSecret: rsp['client_secret'], paymentIntentClientSecret: rsp['client_secret'],
)); ));

View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_app/config/theme.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
@ -60,14 +59,11 @@ class AppBuild extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Nylo nylo = Backpack.instance.read('nylo');
List<AppTheme> appThemes = nylo.appThemes.map((appTheme) => appTheme.toAppTheme()).toList();
return LocalizedApp( return LocalizedApp(
child: ThemeProvider( child: ThemeProvider(
themes: appThemes themes: appThemes,
.map((appTheme) => appTheme.toAppTheme(
defaultTheme: appTheme.theme!.brightness == Brightness.light
? lightTheme
: darkTheme))
.toList(),
child: ThemeConsumer( child: ThemeConsumer(
child: Builder( child: Builder(
builder: (themeContext) => ValueListenableBuilder( builder: (themeContext) => ValueListenableBuilder(
@ -93,7 +89,7 @@ class AppBuild extends StatelessWidget {
title: title ?? "", title: title ?? "",
initialRoute: initialRoute, initialRoute: initialRoute,
onGenerateRoute: onGenerateRoute, 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, theme: themeData ?? ThemeProvider.themeOf(context).data,
localeResolutionCallback: localeResolutionCallback:
(Locale? locale, Iterable<Locale> supportedLocales) { (Locale? locale, Iterable<Locale> supportedLocales) {

View File

@ -1,24 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_app/resources/themes/styles/base_styles.dart';
import 'package:nylo_framework/nylo_framework.dart';
class BaseThemeConfig {
final String? id;
final String? description;
final ThemeData? theme;
final BaseColorStyles? colors;
final dynamic meta;
BaseThemeConfig(
{this.id,
this.description,
this.theme,
this.colors,
this.meta = const {}});
AppTheme toAppTheme({ThemeData? defaultTheme}) => AppTheme(
id: id!,
data: defaultTheme ?? theme!,
description: description!,
);
}

View File

@ -25,8 +25,6 @@ import 'package:flutter_app/config/currency.dart';
import 'package:flutter_app/config/decoders.dart'; import 'package:flutter_app/config/decoders.dart';
import 'package:flutter_app/config/events.dart'; import 'package:flutter_app/config/events.dart';
import 'package:flutter_app/config/payment_gateways.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/no_results_for_products_widget.dart';
import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.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/products.dart';
import 'package:woosignal/models/response/tax_rate.dart'; import 'package:woosignal/models/response/tax_rate.dart';
import 'package:woosignal/woosignal.dart'; import 'package:woosignal/woosignal.dart';
import '../resources/themes/styles/color_styles.dart';
Future<User?> getUser() async => Future<User?> getUser() async =>
(await (NyStorage.read<User>(SharedKey.authUser, model: User()))); (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]. /// helper to find correct color from the [context].
class ThemeColor { class ThemeColor {
static BaseColorStyles? get(BuildContext context) { static ColorStyles get(BuildContext context, {String? themeId}) {
return ((Theme.of(context).brightness == Brightness.light)
? ThemeConfig.light().colors Nylo nylo = Backpack.instance.read('nylo');
: ThemeConfig.dark().colors); 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;
} }
} }

View File

@ -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/dark_theme.dart';
import 'package:flutter_app/resources/themes/light_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/dark_theme_colors.dart';
import 'package:flutter_app/resources/themes/styles/light_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 // App Themes
final appThemes = [ final List<BaseThemeConfig> appThemes = [
ThemeConfig.light(), ThemeConfig.light(),
ThemeConfig.dark(), ThemeConfig.dark(),
]; ];
@ -24,10 +24,10 @@ final appThemes = [
*/ */
// Light Colors // Light Colors
BaseColorStyles lightColors = LightThemeColors(); ColorStyles lightColors = LightThemeColors();
// Dark Colors // Dark Colors
BaseColorStyles darkColors = DarkThemeColors(); ColorStyles darkColors = DarkThemeColors();
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

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

View File

@ -212,7 +212,7 @@ class _AccountDetailPageState extends State<AccountDetailPage>
(Theme.of(context).brightness == Brightness.light) (Theme.of(context).brightness == Brightness.light)
? wsBoxShadow() ? wsBoxShadow()
: null, : null,
color: ThemeColor.get(context)!.backgroundContainer, color: ThemeColor.get(context).backgroundContainer,
), ),
), ),
Expanded(child: activeBody), Expanded(child: activeBody),

View File

@ -79,7 +79,7 @@ class _AccountLandingPageState extends NyState<AccountLandingPage> {
(Theme.of(context).brightness == Brightness.light) (Theme.of(context).brightness == Brightness.light)
? wsBoxShadow() ? wsBoxShadow()
: null, : null,
color: ThemeColor.get(context)!.backgroundContainer, color: ThemeColor.get(context).backgroundContainer,
), ),
padding: EdgeInsets.symmetric(vertical: 18, horizontal: 8), padding: EdgeInsets.symmetric(vertical: 18, horizontal: 8),
margin: EdgeInsets.symmetric(horizontal: 16), margin: EdgeInsets.symmetric(horizontal: 16),

View File

@ -114,9 +114,7 @@ class _AccountRegistrationPageState extends NyState<AccountRegistrationPage> {
child: InkWell( child: InkWell(
child: RichText( child: RichText(
text: TextSpan( text: TextSpan(
text: trans("By tapping \"Register\" you agree to ") + text: '${trans("By tapping \"Register\" you agree to ")} ${AppHelper.instance.appConfig!.appName!}\'s',
AppHelper.instance.appConfig!.appName! +
'\'s ',
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: trans("terms and conditions"), text: trans("terms and conditions"),

View File

@ -172,7 +172,7 @@ class _AccountShippingDetailsPageState
], ],
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.surfaceBackground, color: ThemeColor.get(context).surfaceBackground,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
boxShadow: (Theme.of(context).brightness == boxShadow: (Theme.of(context).brightness ==
Brightness.light) Brightness.light)

View File

@ -199,7 +199,7 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
child: Container( child: Container(
padding: EdgeInsets.only(left: 10, right: 10), padding: EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.backgroundContainer, color: ThemeColor.get(context).backgroundContainer,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
boxShadow: (Theme.of(context).brightness == Brightness.light) boxShadow: (Theme.of(context).brightness == Brightness.light)
? wsBoxShadow() ? wsBoxShadow()

View File

@ -226,7 +226,7 @@ class _CheckoutDetailsPageState extends State<CheckoutDetailsPage> {
Expanded( Expanded(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.backgroundContainer, color: ThemeColor.get(context).backgroundContainer,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
boxShadow: (Theme.of(context).brightness == boxShadow: (Theme.of(context).brightness ==
Brightness.light) Brightness.light)

View File

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

View File

@ -330,10 +330,9 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
"min_amount"] != "min_amount"] !=
null) null)
TextSpan( TextSpan(
text: "\n${trans("Spend a minimum of")} " + text: "\n${trans("Spend a minimum of")} ${formatStringCurrency(
formatStringCurrency(
total: shippingOption[ total: shippingOption[
"min_amount"]), "min_amount"])}",
style: Theme.of( style: Theme.of(
context) context)
.textTheme .textTheme
@ -379,7 +378,7 @@ class _CheckoutShippingTypePageState extends State<CheckoutShippingTypePage> {
], ],
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.backgroundContainer, color: ThemeColor.get(context).backgroundContainer,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
boxShadow: boxShadow:
(Theme.of(context).brightness == Brightness.light) (Theme.of(context).brightness == Brightness.light)

View File

@ -98,7 +98,7 @@ class _CouponPageState extends State<CouponPage> {
Radius.circular(8.0), Radius.circular(8.0),
), ),
borderSide: BorderSide( borderSide: BorderSide(
color: ThemeColor.get(context)!.primaryAccent)), color: ThemeColor.get(context).primaryAccent)),
filled: true, filled: true,
hintStyle: TextStyle(color: Colors.grey[800]), hintStyle: TextStyle(color: Colors.grey[800]),
hintText: trans('Add coupon code'), hintText: trans('Add coupon code'),

View File

@ -64,7 +64,7 @@ class _CustomerCountriesPageState extends State<CustomerCountriesPage> {
offset: Offset(0, 2), offset: Offset(0, 2),
), ),
], ],
color: ThemeColor.get(context)!.background), color: ThemeColor.get(context).background),
height: 60, height: 60,
child: Row( child: Row(
children: [ children: [

View File

@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_app/app/controllers/product_image_viewer_controller.dart'; import 'package:flutter_app/app/controllers/product_image_viewer_controller.dart';
import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart';
import 'package:flutter_app/resources/widgets/safearea_widget.dart'; import 'package:flutter_app/resources/widgets/safearea_widget.dart';
import 'package:flutter_swiper_tv/flutter_swiper.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
class ProductImageViewerPage extends NyStatefulWidget { class ProductImageViewerPage extends NyStatefulWidget {

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/config/font.dart'; import 'package:flutter_app/config/font.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/text_theme/default_text_theme.dart'; import 'package:flutter_app/resources/themes/text_theme/default_text_theme.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
@ -15,7 +15,7 @@ import 'package:nylo_framework/nylo_framework.dart';
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
ThemeData darkTheme(BaseColorStyles darkColors) { ThemeData darkTheme(ColorStyles darkColors) {
try { try {
appFont = GoogleFonts.getFont( appFont = GoogleFonts.getFont(
AppHelper.instance.appConfig!.themeFont ?? "Poppins"); AppHelper.instance.appConfig!.themeFont ?? "Poppins");

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/config/font.dart'; import 'package:flutter_app/config/font.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/text_theme/default_text_theme.dart'; import 'package:flutter_app/resources/themes/text_theme/default_text_theme.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
@ -15,7 +15,7 @@ import 'package:nylo_framework/nylo_framework.dart';
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
ThemeData lightTheme(BaseColorStyles lightColors) { ThemeData lightTheme(ColorStyles lightColors) {
try { try {
appFont = GoogleFonts.getFont( appFont = GoogleFonts.getFont(
AppHelper.instance.appConfig!.themeFont ?? "Poppins"); AppHelper.instance.appConfig!.themeFont ?? "Poppins");

View File

@ -1,9 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:nylo_framework/nylo_framework.dart';
/// Interface for your base styles. /// Interface for your base styles.
/// Add more styles here and then implement in /// Add more styles here and then implement in
/// light_theme_colors.dart and dark_theme_colors.dart. /// light_theme_colors.dart and dark_theme_colors.dart.
abstract class BaseColorStyles { abstract class ColorStyles extends BaseColorStyles {
// general // general
Color get background; Color get background;
Color get backgroundContainer; Color get backgroundContainer;

View File

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/resources/themes/styles/base_styles.dart'; import 'package:flutter_app/resources/themes/styles/color_styles.dart';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -8,7 +8,7 @@ import 'package:flutter_app/resources/themes/styles/base_styles.dart';
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
class DarkThemeColors implements BaseColorStyles { class DarkThemeColors implements ColorStyles {
// general // general
@override @override
Color get background => Color(int.parse( Color get background => Color(int.parse(

View File

@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_app/bootstrap/app_helper.dart'; import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/resources/themes/styles/base_styles.dart'; import 'package:flutter_app/resources/themes/styles/color_styles.dart';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -8,7 +8,7 @@ import 'package:flutter_app/resources/themes/styles/base_styles.dart';
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
class LightThemeColors implements BaseColorStyles { class LightThemeColors implements ColorStyles {
// general // general
@override @override

View File

@ -31,8 +31,8 @@ class PrimaryButton extends StatelessWidget {
textStyle: Theme.of(context).textTheme.button!.copyWith( textStyle: Theme.of(context).textTheme.button!.copyWith(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: ThemeColor.get(context)!.buttonPrimaryContent), color: ThemeColor.get(context).buttonPrimaryContent),
bgColor: ThemeColor.get(context)!.buttonBackground, bgColor: ThemeColor.get(context).buttonBackground,
); );
} }

View File

@ -6,7 +6,7 @@ import 'package:flutter_app/resources/widgets/buttons.dart';
import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart';
import 'package:flutter_app/resources/widgets/home_drawer_widget.dart'; import 'package:flutter_app/resources/widgets/home_drawer_widget.dart';
import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
import 'package:flutter_swiper_tv/flutter_swiper.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
import 'package:woosignal/models/response/product_category.dart'; import 'package:woosignal/models/response/product_category.dart';
import 'package:woosignal/models/response/woosignal_app.dart'; import 'package:woosignal/models/response/woosignal_app.dart';

View File

@ -45,14 +45,14 @@ class _HomeDrawerWidgetState extends State<HomeDrawerWidget> {
bool isDark = (Theme.of(context).brightness == Brightness.dark); bool isDark = (Theme.of(context).brightness == Brightness.dark);
return Drawer( return Drawer(
child: Container( child: Container(
color: ThemeColor.get(context)!.background, color: ThemeColor.get(context).background,
child: ListView( child: ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: <Widget>[ children: <Widget>[
DrawerHeader( DrawerHeader(
child: Center(child: StoreLogo()), child: Center(child: StoreLogo()),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.background, color: ThemeColor.get(context).background,
), ),
), ),
if (["compo"].contains(_themeType) == false) if (["compo"].contains(_themeType) == false)

View File

@ -8,7 +8,7 @@ import 'package:flutter_app/resources/widgets/home_drawer_widget.dart';
import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart'; import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart';
import 'package:flutter_app/resources/widgets/safearea_widget.dart'; import 'package:flutter_app/resources/widgets/safearea_widget.dart';
import 'package:flutter_app/resources/widgets/woosignal_ui.dart'; import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
import 'package:flutter_swiper_tv/flutter_swiper.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart'; import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart';
import 'package:woosignal/models/response/woosignal_app.dart'; import 'package:woosignal/models/response/woosignal_app.dart';

View File

@ -38,7 +38,7 @@ class ProductDetailFooterActionsWidget extends StatelessWidget {
height: 140, height: 140,
padding: EdgeInsets.symmetric(horizontal: 16), padding: EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.background, color: ThemeColor.get(context).background,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black12, color: Colors.black12,

View File

@ -10,7 +10,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_app/resources/widgets/cached_image_widget.dart'; import 'package:flutter_app/resources/widgets/cached_image_widget.dart';
import 'package:flutter_swiper_tv/flutter_swiper.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
import 'package:woosignal/models/response/products.dart'; import 'package:woosignal/models/response/products.dart';

View File

@ -51,8 +51,8 @@ class _ProductDetailReviewsWidgetState
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: ExpansionTile( child: ExpansionTile(
textColor: ThemeColor.get(context)!.primaryAccent, textColor: ThemeColor.get(context).primaryAccent,
iconColor: ThemeColor.get(context)!.primaryAccent, iconColor: ThemeColor.get(context).primaryAccent,
tilePadding: EdgeInsets.symmetric(horizontal: 16), tilePadding: EdgeInsets.symmetric(horizontal: 16),
childrenPadding: EdgeInsets.all(0), childrenPadding: EdgeInsets.all(0),
title: AutoSizeText( title: AutoSizeText(

View File

@ -21,7 +21,7 @@ import 'package:flutter_app/resources/widgets/cached_image_widget.dart';
import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart'; import 'package:flutter_app/resources/widgets/no_results_for_products_widget.dart';
import 'package:flutter_app/resources/widgets/top_nav_widget.dart'; import 'package:flutter_app/resources/widgets/top_nav_widget.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:flutter_swiper_tv/flutter_swiper.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:nylo_framework/nylo_framework.dart'; import 'package:nylo_framework/nylo_framework.dart';
import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart'; import 'package:pull_to_refresh_flutter3/pull_to_refresh_flutter3.dart';
import 'package:woosignal/models/response/products.dart'; import 'package:woosignal/models/response/products.dart';
@ -234,7 +234,7 @@ class TextEditingRow extends StatelessWidget {
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
.bodyText1! .bodyText1!
.copyWith(color: ThemeColor.get(context)!.primaryContent), .copyWith(color: ThemeColor.get(context).primaryContent),
), ),
padding: EdgeInsets.only(bottom: 2), padding: EdgeInsets.only(bottom: 2),
), ),
@ -459,7 +459,7 @@ wsModalBottom(BuildContext context,
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: ThemeColor.get(context)!.background, color: ThemeColor.get(context).background,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: const Radius.circular(10.0), topLeft: const Radius.circular(10.0),
topRight: const Radius.circular(10.0), topRight: const Radius.circular(10.0),
@ -484,7 +484,7 @@ wsModalBottom(BuildContext context,
(Theme.of(context).brightness == Brightness.light) (Theme.of(context).brightness == Brightness.light)
? wsBoxShadow() ? wsBoxShadow()
: null, : null,
color: ThemeColor.get(context)!.background, color: ThemeColor.get(context).background,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
child: bodyWidget, child: bodyWidget,

View File

@ -161,42 +161,42 @@ packages:
name: device_info_plus name: device_info_plus
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.3" version: "4.1.2"
device_info_plus_linux: device_info_plus_linux:
dependency: transitive dependency: transitive
description: description:
name: device_info_plus_linux name: device_info_plus_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "3.0.0"
device_info_plus_macos: device_info_plus_macos:
dependency: transitive dependency: transitive
description: description:
name: device_info_plus_macos name: device_info_plus_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.3" version: "3.0.0"
device_info_plus_platform_interface: device_info_plus_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: device_info_plus_platform_interface name: device_info_plus_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.0+1" version: "3.0.0"
device_info_plus_web: device_info_plus_web:
dependency: transitive dependency: transitive
description: description:
name: device_info_plus_web name: device_info_plus_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "3.0.0"
device_info_plus_windows: device_info_plus_windows:
dependency: transitive dependency: transitive
description: description:
name: device_info_plus_windows name: device_info_plus_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "4.0.0"
dio: dio:
dependency: transitive dependency: transitive
description: description:
@ -224,7 +224,7 @@ packages:
name: ffi name: ffi
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "2.0.1"
file: file:
dependency: transitive dependency: transitive
description: description:
@ -277,13 +277,6 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_page_indicator_tv:
dependency: transitive
description:
name: flutter_page_indicator_tv
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.3-nullsafety"
flutter_rating_bar: flutter_rating_bar:
dependency: "direct main" dependency: "direct main"
description: description:
@ -297,21 +290,21 @@ packages:
name: flutter_secure_storage name: flutter_secure_storage
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.0.2" version: "6.0.0"
flutter_secure_storage_linux: flutter_secure_storage_linux:
dependency: transitive dependency: transitive
description: description:
name: flutter_secure_storage_linux name: flutter_secure_storage_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
flutter_secure_storage_macos: flutter_secure_storage_macos:
dependency: transitive dependency: transitive
description: description:
name: flutter_secure_storage_macos name: flutter_secure_storage_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
flutter_secure_storage_platform_interface: flutter_secure_storage_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -346,14 +339,14 @@ packages:
name: flutter_staggered_grid_view name: flutter_staggered_grid_view
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.1" version: "0.6.2"
flutter_stripe: flutter_stripe:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_stripe name: flutter_stripe
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.0" version: "4.0.0"
flutter_styled_toast: flutter_styled_toast:
dependency: "direct main" dependency: "direct main"
description: description:
@ -368,13 +361,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "1.0.3"
flutter_swiper_tv: flutter_swiper_view:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_swiper_tv name: flutter_swiper_view
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.6-nullsafety" version: "1.1.8"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@ -489,7 +482,7 @@ packages:
name: google_fonts name: google_fonts
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.3" version: "3.0.1"
html: html:
dependency: "direct main" dependency: "direct main"
description: description:
@ -622,14 +615,14 @@ packages:
name: nylo_framework name: nylo_framework
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.4" version: "3.3.0"
nylo_support: nylo_support:
dependency: transitive dependency: transitive
description: description:
name: nylo_support name: nylo_support
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.0" version: "3.4.0"
octo_image: octo_image:
dependency: transitive dependency: transitive
description: description:
@ -651,6 +644,48 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.2" version: "2.0.2"
package_info_plus:
dependency: transitive
description:
name: package_info_plus
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.3+1"
package_info_plus_linux:
dependency: transitive
description:
name: package_info_plus_linux
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
package_info_plus_macos:
dependency: transitive
description:
name: package_info_plus_macos
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
package_info_plus_web:
dependency: transitive
description:
name: package_info_plus_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
package_info_plus_windows:
dependency: transitive
description:
name: package_info_plus_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
page_transition: page_transition:
dependency: "direct main" dependency: "direct main"
description: description:
@ -706,7 +741,7 @@ packages:
name: path_provider_linux name: path_provider_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "2.1.7"
path_provider_macos: path_provider_macos:
dependency: transitive dependency: transitive
description: description:
@ -727,7 +762,7 @@ packages:
name: path_provider_windows name: path_provider_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.5" version: "2.1.2"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@ -790,7 +825,7 @@ packages:
name: razorpay_flutter name: razorpay_flutter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.2"
recase: recase:
dependency: transitive dependency: transitive
description: description:
@ -921,21 +956,21 @@ packages:
name: stripe_android name: stripe_android
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.0" version: "4.0.0"
stripe_ios: stripe_ios:
dependency: transitive dependency: transitive
description: description:
name: stripe_ios name: stripe_ios
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.0" version: "4.0.0"
stripe_platform_interface: stripe_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: stripe_platform_interface name: stripe_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.0" version: "4.0.0"
synchronized: synchronized:
dependency: transitive dependency: transitive
description: description:
@ -964,13 +999,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.0" version: "0.5.0"
transformer_page_view_tv:
dependency: transitive
description:
name: transformer_page_view_tv
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.7-nullsafety"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@ -984,7 +1012,7 @@ packages:
name: url_launcher name: url_launcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.1.4" version: "6.1.5"
url_launcher_android: url_launcher_android:
dependency: transitive dependency: transitive
description: description:
@ -1166,14 +1194,14 @@ packages:
name: win32 name: win32
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.11" version: "2.7.0"
woosignal: woosignal:
dependency: "direct main" dependency: "direct main"
description: description:
name: woosignal name: woosignal
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.0" version: "3.1.1"
wp_json_api: wp_json_api:
dependency: "direct main" dependency: "direct main"
description: description:

View File

@ -1,7 +1,7 @@
# Official WooSignal App Template for WooCommerce # Official WooSignal App Template for WooCommerce
# Label StoreMax # Label StoreMax
# Version: 6.1.0 # Version: 6.2.0
# Author: Anthony Gordon # Author: Anthony Gordon
# Homepage: https://woosignal.com # Homepage: https://woosignal.com
# Documentation: https://woosignal.com/docs/app/label-storemax # Documentation: https://woosignal.com/docs/app/label-storemax
@ -25,13 +25,13 @@ environment:
sdk: '>=2.17.0 <3.0.0' sdk: '>=2.17.0 <3.0.0'
dependencies: dependencies:
google_fonts: ^2.3.3 google_fonts: ^3.0.1
analyzer: ^4.2.0 analyzer: ^4.2.0
intl: ^0.17.0 intl: ^0.17.0
page_transition: ^2.0.9 page_transition: ^2.0.9
nylo_framework: ^3.1.4 nylo_framework: ^3.3.0
woosignal: ^3.1.0 woosignal: ^3.1.1
flutter_stripe: ^3.2.0 flutter_stripe: ^4.0.0
wp_json_api: ^3.2.0 wp_json_api: ^3.2.0
cached_network_image: ^3.2.1 cached_network_image: ^3.2.1
package_info: ^2.0.2 package_info: ^2.0.2
@ -39,11 +39,11 @@ dependencies:
flutter_web_browser: ^0.17.1 flutter_web_browser: ^0.17.1
webview_flutter: ^3.0.4 webview_flutter: ^3.0.4
pull_to_refresh_flutter3: 2.0.1 pull_to_refresh_flutter3: 2.0.1
url_launcher: ^6.1.4 url_launcher: ^6.1.5
flutter_styled_toast: ^2.1.3 flutter_styled_toast: ^2.1.3
animate_do: ^2.1.0 animate_do: ^2.1.0
bubble_tab_indicator: ^0.1.5 bubble_tab_indicator: ^0.1.5
razorpay_flutter: ^1.3.0 razorpay_flutter: ^1.3.2
status_alert: ^1.0.0 status_alert: ^1.0.0
math_expressions: ^2.3.1 math_expressions: ^2.3.1
validated: ^2.0.0 validated: ^2.0.0
@ -52,8 +52,8 @@ dependencies:
html: ^0.15.0 html: ^0.15.0
flutter_widget_from_html: ^0.8.5 flutter_widget_from_html: ^0.8.5
flutter_rating_bar: ^4.0.1 flutter_rating_bar: ^4.0.1
flutter_staggered_grid_view: ^0.6.1 flutter_staggered_grid_view: ^0.6.2
flutter_swiper_tv: ^1.1.6-nullsafety flutter_swiper_view: ^1.1.8
# firebase_messaging: ^11.2.3 # firebase_messaging: ^11.2.3
# firebase_core: ^1.10.5 # firebase_core: ^1.10.5
flutter: flutter:

View File

@ -4,7 +4,7 @@
# WooCommerce App: Label StoreMax # WooCommerce App: Label StoreMax
### Label StoreMax - v6.1.0 ### Label StoreMax - v6.2.0
[Official WooSignal WooCommerce App](https://woosignal.com) [Official WooSignal WooCommerce App](https://woosignal.com)