Compare commits

..

No commits in common. "6.x" and "v6.6.1" have entirely different histories.
6.x ... v6.6.1

56 changed files with 486 additions and 859 deletions

3
.idea/.gitignore generated vendored
View File

@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

6
.idea/vcs.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -1,9 +1,9 @@
# *<! ------ App ------!>*
APP_NAME="Raster"
APP_NAME="MyApp"
APP_ENV="local"
APP_DEBUG="true"
APP_URL="https://rasterdoo.com"
APP_URL="https://mywoocommercestore.com"
ASSET_PATH_PUBLIC="public/assets/"
ASSET_PATH_IMAGES="public/assets/images"
@ -14,12 +14,12 @@ DARK_THEME_ID="default_dark_theme"
# *<! ------ Language ------!>*
DEFAULT_LOCALE="en"
DEFAULT_LOCALE=null
# supports: "en" (English), "es" (Spanish), "fr" (French), "hi" (Hindi), "it" (Italian), "pt" (Portuguese) or "zh" (Simplified Chinese)
# *<! ------ WooSignal Config ------!>*
APP_KEY="app_50818d11780aaba6b545076dea5b90"
APP_KEY="your app key"
# App key from WooSignal link: https://woosignal.com/dashboard
# *<! ------ STRIPE (OPTIONAL) ------!>*
@ -52,7 +52,3 @@ PRODUCT_PLACEHOLDER_IMAGE="https://woosignal.com/images/woocommerce-placeholder.
# Sets the default placeholder image for products with no image
AUTH_USER_KEY="AUTH_USER"
FCM_ENABLED=null
ENCRYPT_KEY=null
ENCRYPT_SECRET=null

View File

@ -1,50 +1,3 @@
## [6.10.1] - 2023-08-28
* Refactor project for Nylo 5.x.
* Fix AndroidManifest splash screen
* Pubspec.yaml dependency updates
## [6.10.0] - 2023-08-21
* Small refactor to project
* Pubspec.yaml dependency updates
## [6.9.0] - 2023-07-13
* Pull firebase config via woosignal api
* New encrypt key and secret added to .env
* fix fetchRelated to return "publish" products
* Pubspec.yaml dependency updates
## [6.8.2] - 2023-07-04
* Update gradle + kotlin versions.
* Pubspec.yaml dependency updates.
## [6.8.1] - 2023-07-03
* Fix auth bug.
* Pubspec.yaml dependency updates.
## [6.8.0] - 2023-07-03
* UI fixes.
* Fix price on coupon page error alerts.
* Fix issue where IOS builds were not using the correct build version.
* Small refactor to the project.
* Pubspec.yaml dependency updates.
## [6.7.0] - 2023-06-20
* Refactor project for Nylo 5.x.
* New Firebase provider for FCM.
* Pubspec.yaml dependency updates.
## [6.6.2] - 2023-06-14
* Page bug fixes
* Pubspec.yaml dependency updates.
## [6.6.1] - 2023-05-28
* Refactor widgets + bug fixes
@ -75,7 +28,7 @@
* Fix the ThemeColor.get helper method to support ColorStyles.
* Pubspec.yaml dependency updates
## [6.4.0] - 2023-01-06
* ## [6.4.0] - 2023-01-06
* Upgrade to Nylo v4.0.0
* Update copyright

View File

@ -4,7 +4,8 @@
# WooCommerce App: Label StoreMax
### Label StoreMax
### Label StoreMax - v6.6.1
[Official WooSignal WooCommerce App](https://woosignal.com)
@ -43,7 +44,7 @@ Full documentation this available [here](https://woosignal.com/docs/app/label-st
- Browse products, make orders, customer login (via WordPress)
- Change app name, logo, customize default language, currency + more
- Light and dark mode
- Stripe, Cash On Delivery, PayPal, RazorPay
- Stripe, Cash On Delivery, PayPal
- Localized for en, es, pt, it, hi, fr, zh, tr, nl, de
- Orders show as normal in WooCommerce

View File

@ -12,7 +12,7 @@
<application
android:name="${applicationName}"
android:label="Raster Knjizara"
android:label="Label StoreMax"
android:icon="@mipmap/launcher_icon">
<activity
android:name=".MainActivity"
@ -31,7 +31,15 @@
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
<!-- Displays an Android View that continues showing the launch screen
Drawable until Flutter paints its first frame, then this splash
screen fades out. A splash screen is useful to avoid any visual
gap between the end of Android's launch screen and the painting of
Flutter's first frame. -->
<meta-data
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.6.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.android.tools.build:gradle:7.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}
tasks.register("clean", Delete) {
task clean(type: Delete) {
delete rootProject.buildDir
}

View File

@ -3,4 +3,4 @@ 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-7.0.2-all.zip

View File

@ -155,7 +155,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@ -373,7 +373,6 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -512,7 +511,6 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -545,7 +543,6 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>

View File

@ -19,7 +19,7 @@ class User extends Model {
toJson() => {"token": token, "user_id": userId};
User.fromJson(dynamic data) {
fromJson(dynamic data) {
token = data['token'];
userId = data['user_id'];
}

View File

@ -16,7 +16,7 @@ class BearerAuthInterceptor extends Interceptor {
}
@override
void onError(DioException err, ErrorInterceptorHandler handler) {
void onError(DioError err, ErrorInterceptorHandler handler) {
handler.next(err);
}
}

View File

@ -18,7 +18,7 @@ class LoggingInterceptor extends Interceptor {
}
@override
void onError(DioException err, ErrorInterceptorHandler handler) {
void onError(DioError err, ErrorInterceptorHandler handler) {
print(
'ERROR[${err.response?.statusCode}] => PATH: ${err.requestOptions.path}');
handler.next(err);

View File

@ -22,10 +22,31 @@ class AppProvider implements NyProvider {
]);
await WooSignal.instance
.init(appKey: getEnv('APP_KEY'), debugMode: getEnv('APP_DEBUG'),
encryptKey: getEnv('ENCRYPT_KEY', defaultValue: null),
encryptSecret: getEnv('ENCRYPT_SECRET', defaultValue: null)
);
.init(appKey: getEnv('APP_KEY'), debugMode: getEnv('APP_DEBUG'));
// Notifications
/// await Firebase.initializeApp(
/// options: DefaultFirebaseOptions.currentPlatform,
/// );
///
/// FirebaseMessaging messaging = FirebaseMessaging.instance;
///
/// NotificationSettings settings = await messaging.requestPermission(
/// alert: true,
/// announcement: false,
/// badge: true,
/// carPlay: false,
/// criticalAlert: false,
/// provisional: false,
/// sound: true,
/// );
///
/// if (settings.authorizationStatus == AuthorizationStatus.authorized) {
/// String? token = await messaging.getToken();
/// if (token != null) {
/// WooSignal.instance.setFcmToken(token);
/// }
/// }
AppHelper.instance.appConfig = WooSignalApp();
AppHelper.instance.appConfig!.themeFont = "Poppins";
@ -49,7 +70,7 @@ class AppProvider implements NyProvider {
};
// WooSignal Setup
WooSignalApp? wooSignalApp = await (appWooSignal((api) => api.getApp(encrypted: shouldEncrypt())));
WooSignalApp? wooSignalApp = await (appWooSignal((api) => api.getApp()));
Locale locale = Locale('en');
if (wooSignalApp != null) {
@ -95,7 +116,6 @@ class AppProvider implements NyProvider {
nylo.addModelDecoders(modelDecoders);
nylo.addValidationRules(validationRules);
nylo.toastNotification = getToastNotificationWidget;
return nylo;
}

View File

@ -1,49 +0,0 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/firebase_options.dart';
import 'package:nylo_framework/nylo_framework.dart';
import 'package:woosignal/woosignal.dart';
class FirebaseProvider implements NyProvider {
@override
boot(Nylo nylo) async {
return null;
}
@override
afterBoot(Nylo nylo) async {
bool? firebaseFcmIsEnabled = AppHelper.instance.appConfig?.firebaseFcmIsEnabled;
if (firebaseFcmIsEnabled == null) {
firebaseFcmIsEnabled = getEnv('FCM_ENABLED', defaultValue: false);
}
if (firebaseFcmIsEnabled != true) return;
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
FirebaseMessaging messaging = FirebaseMessaging.instance;
NotificationSettings settings = await messaging.requestPermission(
alert: true,
announcement: false,
badge: true,
carPlay: false,
criticalAlert: false,
provisional: false,
sound: true,
);
if (settings.authorizationStatus != AuthorizationStatus.authorized) {
return;
}
String? token = await messaging.getToken();
if (token != null) {
WooSignal.instance.setFcmToken(token);
}
}
}

View File

@ -33,16 +33,16 @@ razorPay(context,
Order? order = await appWooSignal((api) => api.createOrder(orderWC));
if (order != null) {
Cart.getInstance.clear();
Navigator.pushNamed(context, "/checkout-status", arguments: order);
} else {
showToastNotification(
context,
title: "Error".tr(),
description: trans("Something went wrong, please contact our store"),
);
state.reloadState(showLoader: false);
return;
}
Cart.getInstance.clear();
Navigator.pushNamed(context, "/checkout-status", arguments: order);
});
razorpay.on(Razorpay.EVENT_PAYMENT_ERROR, (PaymentFailureResponse response) {

View File

@ -118,7 +118,7 @@ stripePay(context,
return;
}
routeTo('/checkout-status', navigationType: NavigationType.pushAndForgetAll, data: order);
Navigator.pushNamed(context, "/checkout-status", arguments: order);
} on StripeException catch (e) {
if (getEnv('APP_DEBUG', defaultValue: true)) {
NyLogger.error(e.error.message!);

View File

@ -15,7 +15,6 @@ import 'package:flutter_app/app/models/cart.dart';
import 'package:flutter_app/app/models/cart_line_item.dart';
import 'package:flutter_app/app/models/checkout_session.dart';
import 'package:flutter_app/bootstrap/app_helper.dart';
import 'package:flutter_app/bootstrap/helpers.dart';
import 'package:flutter_app/bootstrap/shared_pref/sp_auth.dart';
import 'package:woosignal/models/payload/order_wc.dart';
import 'package:woosignal/models/response/tax_rate.dart';
@ -52,7 +51,7 @@ Future<OrderWC> buildOrderWC({TaxRate? taxRate, bool markPaid = true}) async {
tmpLineItem.variationId = cartItem.variationId;
}
tmpLineItem.subtotal = (parseWcPrice(cartItem.subtotal) * parseWcPrice(cartItem.quantity.toString())).toString();
tmpLineItem.subtotal = cartItem.subtotal;
lineItems.add(tmpLineItem);
}

View File

@ -48,7 +48,7 @@ import 'package:flutter/services.dart' show rootBundle;
Future<User?> getUser() async =>
(await (NyStorage.read<User>(SharedKey.authUser)));
Future appWooSignal(Function(WooSignal api) api) async {
Future appWooSignal(Function(WooSignal) api) async {
return await api(WooSignal.instance);
}
@ -668,15 +668,3 @@ bool isProductNew(Product? product) {
}
return false;
}
bool shouldEncrypt() {
String? encryptKey = getEnv('ENCRYPT_KEY', defaultValue: "");
if (encryptKey == null || encryptKey == "") {
return false;
}
String? encryptSecret = getEnv('ENCRYPT_KEY', defaultValue: "");
if (encryptSecret == null || encryptSecret == "") {
return false;
}
return true;
}

View File

@ -1,4 +1,3 @@
import 'package:flutter_app/app/models/user.dart';
import 'package:flutter_app/app/networking/api_service.dart';
import 'package:flutter_app/app/networking/dio/base_api_service.dart';
@ -13,7 +12,6 @@ import 'package:flutter_app/app/networking/dio/base_api_service.dart';
final Map<Type, dynamic> modelDecoders = {
// ...
User: (data) => User.fromJson(data)
};
/*

View File

@ -1,9 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter_app/config/toast_notification.dart';
import 'package:flutter_app/resources/widgets/app_loader_widget.dart';
import 'package:flutter_app/resources/widgets/toast_notification_widget.dart';
import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
import 'package:nylo_framework/nylo_framework.dart';
/*
|--------------------------------------------------------------------------
@ -19,14 +16,3 @@ Widget logo = StoreLogo();
Widget loader = AppLoaderWidget();
// resources/widgets/app_loader_widget.dart
Widget getToastNotificationWidget({
required ToastNotificationStyleType style,
Function(ToastNotificationStyleMetaHelper helper)? toastNotificationStyleMeta, Function? onDismiss}) {
if (toastNotificationStyleMeta == null) return SizedBox.shrink();
ToastMeta toastMeta = toastNotificationStyleMeta(NyToastNotificationStyleMetaHelper(style));
return ToastNotification(toastMeta, onDismiss: onDismiss);
// resources/widgets/toast_notification.dart
}

View File

@ -15,5 +15,4 @@ import 'package:nylo_framework/nylo_framework.dart';
final Map<Type, NyEvent> events = {
LoginEvent: LoginEvent(),
LogoutEvent: LogoutEvent(),
AuthUserEvent: AuthUserEvent(),
};

View File

@ -15,7 +15,7 @@ import 'package:nylo_framework/nylo_framework.dart';
|--------------------------------------------------------------------------
*/
const appPaymentGateways = ["CashOnDelivery"];
const appPaymentGateways = [];
// Available: "Stripe", "CashOnDelivery", "PayPal", "RazorPay"
// e.g. app_payment_gateways = ["Stripe", "CashOnDelivery"]; will only use Stripe and Cash on Delivery.

View File

@ -1,4 +1,3 @@
import '/app/providers/firebase_provider.dart';
import 'package:flutter_app/app/providers/app_provider.dart';
import 'package:flutter_app/app/providers/event_provider.dart';
import 'package:flutter_app/app/providers/route_provider.dart';
@ -18,7 +17,4 @@ final Map<Type, NyProvider> providers = {
AppProvider: AppProvider(),
RouteProvider: RouteProvider(),
EventProvider: EventProvider(),
FirebaseProvider: FirebaseProvider(),
};

View File

@ -1,34 +0,0 @@
import 'package:nylo_framework/nylo_framework.dart';
/// ToastNotificationStyleMetaHelper is used to return
/// the correct value for the [ToastNotificationStyleType] toast style.
class NyToastNotificationStyleMetaHelper extends ToastNotificationStyleMetaHelper {
NyToastNotificationStyleMetaHelper(ToastNotificationStyleType? style) : super(style);
onSuccess() {
return ToastMeta.success();
}
onWarning() {
return ToastMeta.warning();
}
onInfo() {
return ToastMeta.info();
}
onDanger() {
return ToastMeta.danger();
}
// Example customizing a notification
// onSuccess() {
// return ToastMeta.success(
// title: "Hello",
// description: "World",
// action: () {},
// backgroundColor: Colors.Yellow
// );
// }
}

View File

@ -8,9 +8,9 @@
|--------------------------------------------------------------------------
*/
final Map<String, dynamic> validationRules = {
final Map<Type, dynamic> validationRules = {
/// Example
// "simple_password": (attribute) => SimplePassword(attribute)
// SimplePassword: (attribute) => SimplePassword(attribute)
};
/// Example validation class

View File

@ -1,66 +0,0 @@
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
import 'package:flutter_app/bootstrap/app_helper.dart';
/// Default [FirebaseOptions] for use with your Firebase apps.
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for web - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
}
switch (defaultTargetPlatform) {
case TargetPlatform.android:
if (AppHelper.instance.appConfig?.firebaseOptionsAndroid == null) {
throw UnsupportedError(
'Add a valid Firebase json config on https://woosignal.com for your WooCommerce store',
);
}
return FirebaseOptions(
apiKey: AppHelper.instance.appConfig!.firebaseOptionsAndroid!['apiKey'],
appId: AppHelper.instance.appConfig!.firebaseOptionsAndroid!['appId'],
messagingSenderId: AppHelper.instance.appConfig!.firebaseOptionsAndroid!['messagingSenderId'],
projectId: AppHelper.instance.appConfig!.firebaseOptionsAndroid!['projectId'],
storageBucket: AppHelper.instance.appConfig!.firebaseOptionsAndroid!['storageBucket'],
);
case TargetPlatform.iOS:
if (AppHelper.instance.appConfig?.firebaseOptionsIos == null) {
throw UnsupportedError(
'Add a valid Firebase plist config on https://woosignal.com for your WooCommerce store',
);
}
return FirebaseOptions(
apiKey: AppHelper.instance.appConfig!.firebaseOptionsIos!['apiKey'],
appId: AppHelper.instance.appConfig!.firebaseOptionsIos!['appId'],
messagingSenderId: AppHelper.instance.appConfig!.firebaseOptionsIos!['messagingSenderId'],
projectId: AppHelper.instance.appConfig!.firebaseOptionsIos!['projectId'],
storageBucket: AppHelper.instance.appConfig!.firebaseOptionsIos!['storageBucket'],
iosClientId: AppHelper.instance.appConfig!.firebaseOptionsIos!['iosClientId'],
iosBundleId: AppHelper.instance.appConfig!.firebaseOptionsIos!['iosBundleId'],
);
case TargetPlatform.macOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.windows:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for windows - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.linux:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for linux - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
default:
throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}
}
}

View File

@ -67,8 +67,7 @@ class _AccountDeletePageState extends NyState<AccountDeletePage> {
PrimaryButton(
title: trans("Yes, delete my account"),
isLoading: isLocked('delete_account'),
action: _deleteAccount,
),
action: _deleteAccount),
LinkButton(title: trans("Back"), action: pop)
],
)

View File

@ -226,7 +226,7 @@ class _AccountLandingPageState extends NyState<AccountLandingPage> {
String? token = wpUserLoginResponse.data!.userToken;
String userId = wpUserLoginResponse.data!.userId.toString();
User user = User.fromUserAuthResponse(token: token, userId: userId);
await user.save(SharedKey.authUser);
await Auth.set(user, key: SharedKey.authUser);
showToastNotification(context,
title: trans("Hello"),

View File

@ -8,10 +8,10 @@
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app/app/controllers/account_order_detail_controller.dart';
import 'package:flutter_app/bootstrap/helpers.dart';
import 'package:flutter_app/resources/widgets/app_loader_widget.dart';
import 'package:flutter_app/resources/widgets/safearea_widget.dart';
import 'package:flutter_app/resources/widgets/woosignal_ui.dart';
import 'package:nylo_framework/nylo_framework.dart';
@ -29,14 +29,10 @@ class AccountOrderDetailPage extends NyStatefulWidget {
class _AccountOrderDetailPageState extends NyState<AccountOrderDetailPage> {
int? _orderId;
Order? _order;
bool _isLoading = true;
@override
init() async {
super.init();
}
@override
boot() async {
_orderId = widget.controller.data();
await _fetchOrder();
}
@ -52,160 +48,150 @@ class _AccountOrderDetailPageState extends NyState<AccountOrderDetailPage> {
),
margin: EdgeInsets.only(left: 0),
),
title: afterNotNull(_orderId, child: () => Text("${trans("Order").capitalize()} #${_orderId.toString()}"), loading: CupertinoActivityIndicator()),
title: Text("${trans("Order").capitalize()} #${_orderId.toString()}"),
centerTitle: true,
),
resizeToAvoidBottomInset: false,
body: SafeAreaWidget(
child: afterLoad(child: () => Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Padding(
padding: EdgeInsets.only(top: 8),
child: Text(
"${trans("Date Ordered").capitalize()}: ${dateFormatted(
date: _order?.dateCreated ?? "",
formatType: formatForDateTime(FormatType.date),
)}",
),
),
Container(
margin: EdgeInsets.only(top: 10, bottom: 10),
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: _isLoading
? AppLoaderWidget()
: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Flexible(
child: Text("${trans("Ships to").capitalize()}:"),
),
Flexible(
Padding(
padding: EdgeInsets.only(top: 8),
child: Text(
[
[
_order!.shipping!.firstName,
_order!.shipping!.lastName
].where((t) => t != null).toList().join(" "),
_order!.shipping!.address1,
_order!.shipping!.address2,
_order!.shipping!.city,
_order!.shipping!.state,
_order!.shipping!.postcode,
_order!.shipping!.country,
]
.where((t) => (t != "" && t != null))
.toList()
.join("\n"),
textAlign: TextAlign.right,
"${trans("Date Ordered").capitalize()}: " +
dateFormatted(
date: _order!.dateCreated!,
formatType: formatForDateTime(FormatType.date),
),
),
),
Container(
margin: EdgeInsets.only(top: 10, bottom: 10),
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Flexible(
child: Text("${trans("Ships to").capitalize()}:"),
),
Flexible(
child: Text(
[
[
_order!.shipping!.firstName,
_order!.shipping!.lastName
].where((t) => t != null).toList().join(" "),
_order!.shipping!.address1,
_order!.shipping!.address2,
_order!.shipping!.city,
_order!.shipping!.state,
_order!.shipping!.postcode,
_order!.shipping!.country,
]
.where((t) => (t != "" && t != null))
.toList()
.join("\n"),
textAlign: TextAlign.right,
),
),
],
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
boxShadow:
(Theme.of(context).brightness == Brightness.light)
? wsBoxShadow()
: null,
color: (Theme.of(context).brightness == Brightness.light)
? Colors.white
: Color(0xFF2C2C2C),
),
),
Expanded(
child: ListView.builder(
itemBuilder: (cxt, i) {
LineItems lineItem = _order!.lineItems![i];
return Card(
child: ListTile(
contentPadding: EdgeInsets.only(
top: 5, bottom: 5, left: 8, right: 6),
title: Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Color(0xFFFCFCFC), width: 1),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
Flexible(
child: Text(
lineItem.name!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
Text(
formatStringCurrency(total: lineItem.price)
.capitalize(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
),
),
subtitle: Padding(
padding: const EdgeInsets.only(top: 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
formatStringCurrency(
total: lineItem.total,
),
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(
fontWeight: FontWeight.w600,
),
textAlign: TextAlign.left,
),
Text(
"x${lineItem.quantity.toString()}",
style: Theme.of(context)
.textTheme
.bodyLarge,
textAlign: TextAlign.left,
),
],
),
],
),
),
),
);
},
itemCount: _order!.lineItems!.length,
),
),
],
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
boxShadow:
(Theme.of(context).brightness == Brightness.light)
? wsBoxShadow()
: null,
color: (Theme.of(context).brightness == Brightness.light)
? Colors.white
: Color(0xFF2C2C2C),
),
),
Expanded(
child: ListView.builder(
itemBuilder: (cxt, i) {
LineItems lineItem = _order!.lineItems![i];
return Card(
child: ListTile(
contentPadding: EdgeInsets.only(
top: 5, bottom: 5, left: 8, right: 6),
title: Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Color(0xFFFCFCFC), width: 1),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
Flexible(
child: Text(
lineItem.name!,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
Container(
width: 70,
alignment: Alignment.topRight,
child: Text(
formatStringCurrency(total: lineItem.total)
.capitalize(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: FontWeight.bold
),
),
),
],
),
),
subtitle: Container(
decoration: BoxDecoration(
border: Border(
top: BorderSide(color: Colors.grey[100]!)
)
),
padding: const EdgeInsets.only(top: 10),
margin: EdgeInsets.only(top: 4),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: <Widget>[
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
formatStringCurrency(
total: lineItem.price,
),
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(
fontWeight: FontWeight.w600,
),
textAlign: TextAlign.left,
),
Text(
"x ${lineItem.quantity.toString()}",
style: Theme.of(context)
.textTheme
.bodyLarge,
textAlign: TextAlign.left,
),
],
),
],
),
),
),
);
},
itemCount: _order?.lineItems?.length ?? 0,
),
),
],
)),
),
);
}
@ -216,6 +202,13 @@ class _AccountOrderDetailPageState extends NyState<AccountOrderDetailPage> {
}
_fetchOrder() async {
_order = await (appWooSignal((api) => api.retrieveOrder(_orderId!)));
_order = await (appWooSignal((api) {
return api.retrieveOrder(_orderId!);
}));
if (_order != null) {
setState(() {
_isLoading = false;
});
}
}
}

View File

@ -236,7 +236,7 @@ class _AccountRegistrationPageState extends NyState<AccountRegistrationPage> {
String? token = wpUserRegisterResponse.data!.userToken;
String userId = wpUserRegisterResponse.data!.userId.toString();
User user = User.fromUserAuthResponse(token: token, userId: userId);
await user.save(SharedKey.authUser);
await Auth.set(user, key: SharedKey.authUser);
await WPJsonAPI.instance.api((request) => request.wpUpdateUserInfo(token,
firstName: firstName, lastName: lastName));

View File

@ -8,7 +8,6 @@
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app/app/controllers/product_category_search_loader_controller.dart';
import 'package:flutter_app/app/controllers/browse_category_controller.dart';
@ -65,7 +64,7 @@ class _BrowseCategoryPageState extends NyState<BrowseCategoryPage> {
children: <Widget>[
Text(trans("Browse"),
style: Theme.of(context).textTheme.titleMedium),
afterNotNull(productCategory, child: () => Text(parseHtmlString(productCategory!.name)), loading: CupertinoActivityIndicator())
Text(parseHtmlString(productCategory!.name))
],
),
centerTitle: true,

View File

@ -8,7 +8,6 @@
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app/app/controllers/browse_search_controller.dart';
import 'package:flutter_app/app/controllers/product_search_loader_controller.dart';
@ -57,7 +56,7 @@ class _BrowseSearchState extends NyState<BrowseSearchPage> {
children: <Widget>[
Text(trans("Search results for"),
style: Theme.of(context).textTheme.titleMedium),
afterNotNull(_search, child: () => Text("\"" + _search! + "\""), loading: CupertinoActivityIndicator())
Text("\"" + _search! + "\"")
],
),
centerTitle: true,

View File

@ -58,6 +58,7 @@ class CheckoutConfirmationPageState extends NyState<CheckoutConfirmationPage> {
CheckoutSession.getInstance.paymentType = paymentTypes.firstWhere(
(paymentType) => paymentType?.id == 20,
orElse: () => paymentTypes.first);
print(CheckoutSession.getInstance.paymentType?.name);
}
_getTaxes();
}
@ -202,124 +203,126 @@ class CheckoutConfirmationPageState extends NyState<CheckoutConfirmationPage> {
resizeToAvoidBottomInset: false,
body: SafeAreaWidget(
child: Container(
child: ListView(
shrinkWrap: true,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
ListView(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
children: [
CheckoutStoreHeadingWidget(),
CheckoutUserDetailsWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () {
setState(() {
_showFullLoader = true;
});
_getTaxes();
},
),
CheckoutPaymentTypeWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () => setState(() {}),
),
CheckoutShippingTypeWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () => setState(() {}),
wooSignalApp: _wooSignalApp,
),
if (_wooSignalApp!.couponEnabled == true)
CheckoutSelectCouponWidget(
Expanded(
child: ListView(
shrinkWrap: true,
children: [
CheckoutStoreHeadingWidget(),
CheckoutUserDetailsWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () {
setState(() {
_showFullLoader = true;
});
_getTaxes();
},
),
CheckoutPaymentTypeWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () => setState(() {}),
),
Container(
decoration: BoxDecoration(
boxShadow: wsBoxShadow(),
color: Colors.white,
// borderRadius: BorderRadius.circular(16)
CheckoutShippingTypeWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () => setState(() {}),
wooSignalApp: _wooSignalApp,
),
padding: EdgeInsets.symmetric(vertical: 16),
margin: EdgeInsets.only(top: 20),
child: Column(
children: [
Container(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Row(
if (_wooSignalApp!.couponEnabled == true)
CheckoutSelectCouponWidget(
context: context,
checkoutSession: checkoutSession,
resetState: () => setState(() {}),
),
Container(
decoration: BoxDecoration(
boxShadow: wsBoxShadow(),
color: Colors.white,
// borderRadius: BorderRadius.circular(16)
),
padding: EdgeInsets.symmetric(vertical: 16),
margin: EdgeInsets.only(top: 20),
child: Column(
children: [
Container(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Row(
children: [
Icon(Icons.receipt),
Padding(padding: EdgeInsets.only(right: 8),),
Text(trans("Order Summary")).fontWeightBold()
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Icon(Icons.receipt),
Padding(padding: EdgeInsets.only(right: 8),),
Text(trans("Order Summary")).fontWeightBold()
Padding(padding: EdgeInsets.only(top: 16)),
CheckoutSubtotal(
title: trans("Subtotal"),
),
CheckoutCouponAmountWidget(
checkoutSession: checkoutSession),
if (_wooSignalApp!.disableShipping != 1)
CheckoutMetaLine(
title: trans("Shipping fee"),
amount: CheckoutSession
.getInstance.shippingType ==
null
? trans("Select shipping")
: CheckoutSession
.getInstance.shippingType!
.getTotal(withFormatting: true)),
if (_taxRate != null)
CheckoutTaxTotal(taxRate: _taxRate),
Padding(padding: EdgeInsets.only(top: 8, left: 8, right: 8)),
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: RichText(
textAlign: TextAlign.left,
text: TextSpan(
text:
'${trans('By completing this order, I agree to all')} ',
style: Theme.of(context).textTheme.bodySmall!.copyWith(
fontSize: 12,
),
children: <TextSpan>[
TextSpan(
recognizer: TapGestureRecognizer()..onTap = _openTermsLink,
text: trans("Terms and conditions").toLowerCase(),
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: ThemeColor.get(context)
.primaryAccent,
fontSize: 12,
),
),
TextSpan(
text: ".",
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Colors.black87,
fontSize: 12,
),
),
],
),
)),
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(padding: EdgeInsets.only(top: 16)),
CheckoutSubtotal(
title: trans("Subtotal"),
),
CheckoutCouponAmountWidget(
checkoutSession: checkoutSession),
if (_wooSignalApp!.disableShipping != 1)
CheckoutMetaLine(
title: trans("Shipping fee"),
amount: CheckoutSession
.getInstance.shippingType ==
null
? trans("Select shipping")
: CheckoutSession
.getInstance.shippingType!
.getTotal(withFormatting: true)),
if (_taxRate != null)
CheckoutTaxTotal(taxRate: _taxRate),
Padding(padding: EdgeInsets.only(top: 8, left: 8, right: 8)),
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: RichText(
textAlign: TextAlign.left,
text: TextSpan(
text:
'${trans('By completing this order, I agree to all')} ',
style: Theme.of(context).textTheme.bodySmall!.copyWith(
fontSize: 12,
),
children: <TextSpan>[
TextSpan(
recognizer: TapGestureRecognizer()..onTap = _openTermsLink,
text: trans("Terms and conditions").toLowerCase(),
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: ThemeColor.get(context)
.primaryAccent,
fontSize: 12,
),
),
TextSpan(
text: ".",
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Colors.black87,
fontSize: 12,
),
),
],
),
)),
],
),
],
),
)
],
],
),
)
],
),
),
Container(
decoration: BoxDecoration(

View File

@ -34,7 +34,6 @@ class _CheckoutStatusState extends NyState<CheckoutStatusPage> {
_order = widget.controller.data();
await Cart.getInstance.clear();
CheckoutSession.getInstance.clear();
setState(() { });
}
@override
@ -122,7 +121,7 @@ class _CheckoutStatusState extends NyState<CheckoutStatusPage> {
child: ListView.builder(
itemCount: _order?.lineItems == null
? 0
: _order?.lineItems?.length ?? 0,
: _order?.lineItems?.length,
itemBuilder: (BuildContext context, int index) {
ws_order.LineItems lineItem = _order!.lineItems![index];
return Container(
@ -162,7 +161,7 @@ class _CheckoutStatusState extends NyState<CheckoutStatusPage> {
),
Text(
formatStringCurrency(
total: lineItem.subtotal.toString(),
total: lineItem.total.toString(),
),
style: Theme.of(context).textTheme.bodyLarge,
)

View File

@ -179,7 +179,7 @@ class _CouponPageState extends State<CouponPage> {
if (minimumAmount != 0 && doubleSubtotal < minimumAmount) {
_showAlert(
message: trans("Spend a minimum of minimumAmount to redeem",
arguments: {"minimumAmount": formatStringCurrency(total: minimumAmount.toString())}),
arguments: {"minimumAmount": minimumAmount.toString()}),
style: ToastNotificationStyleType.DANGER);
return;
}
@ -189,7 +189,7 @@ class _CouponPageState extends State<CouponPage> {
if (maximumAmount != 0 && doubleSubtotal > maximumAmount) {
_showAlert(
message: trans("Spend less than maximumAmount to redeem",
arguments: {"maximumAmount": formatStringCurrency(total: maximumAmount.toString())}),
arguments: {"maximumAmount": maximumAmount.toString()}),
style: ToastNotificationStyleType.DANGER);
return;
}

View File

@ -84,7 +84,7 @@ class _ProductDetailState extends NyState<ProductDetailPage> {
"${trans("Select a")} ${_product!.attributes[attributeIndex].name}",
bodyWidget: ListView.separated(
itemCount: _product!.attributes[attributeIndex].options!.length,
separatorBuilder: (BuildContext context, int index) => Divider(color: Colors.black12),
separatorBuilder: (BuildContext context, int index) => Divider(),
itemBuilder: (BuildContext context, int index) {
return ListTile(
title: Text(

View File

@ -6,45 +6,31 @@ import 'package:nylo_framework/nylo_framework.dart';
/// light_theme_colors.dart and dark_theme_colors.dart.
abstract class ColorStyles extends BaseColorStyles {
// general
@override
Color get background;
Color get backgroundContainer;
@override
Color get primaryContent;
@override
Color get primaryAccent;
@override
Color get surfaceBackground;
@override
Color get surfaceContent;
// app bar
@override
Color get appBarBackground;
@override
Color get appBarPrimaryContent;
// buttons
@override
Color get buttonBackground;
@override
Color get buttonPrimaryContent;
// bottom tab bar
@override
Color get bottomTabBarBackground;
// bottom tab bar - icons
@override
Color get bottomTabBarIconSelected;
@override
Color get bottomTabBarIconUnselected;
// bottom tab bar - label
@override
Color get bottomTabBarLabelUnselected;
@override
Color get bottomTabBarLabelSelected;
Color get inputPrimaryContent;

View File

@ -20,7 +20,7 @@ class AppVersionWidget extends StatelessWidget {
return NyFutureBuilder<PackageInfo>(
future: PackageInfo.fromPlatform(),
child: (BuildContext context, data) => Padding(
child: Text("${trans("Version")}: ${data?.version}",
child: Text("${trans("Version")}: ${data.version}",
style: Theme.of(context)
.textTheme
.bodyMedium!

View File

@ -41,8 +41,6 @@ class _CartIconWidgetState extends State<CartIconWidget> {
future: Cart.getInstance.getCart(),
child: (BuildContext context,
data) {
if (data == null) return SizedBox.shrink();
List<int?> cartItems =
data.map((e) => e.quantity).toList();
String cartValue = "0";

View File

@ -27,11 +27,10 @@ class CheckoutSelectCouponWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
bool hasCoupon = checkoutSession.coupon != null;
return Container(
height: 50,
padding: EdgeInsets.symmetric(vertical: 5),
child: InkWell(
onTap: _actionCoupon,
return InkWell(
onTap: _actionCoupon,
child: Container(
padding: EdgeInsets.symmetric(vertical: 5),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,

View File

@ -55,8 +55,6 @@ class ProductDetailRelatedProductsWidget extends StatelessWidget {
child: NyFutureBuilder<List<Product>>(
future: fetchRelated(),
child: (context, relatedProducts) {
if (relatedProducts == null) return SizedBox.shrink();
if (relatedProducts.isEmpty) {
return SizedBox.shrink();
}
@ -77,6 +75,6 @@ class ProductDetailRelatedProductsWidget extends StatelessWidget {
}
Future<List<Product>> fetchRelated() async => await (appWooSignal(
(api) => api.getProducts(perPage: 100, include: product!.relatedIds, status: "publish"),
(api) => api.getProducts(perPage: 100, include: product!.relatedIds),
));
}

View File

@ -93,15 +93,6 @@ class _ProductDetailReviewsWidgetState
NyFutureBuilder<List<ProductReview>>(
future: fetchReviews(),
child: (context, reviews) {
if (reviews == null) {
return Container(
child: ListTile(
title: Text(
trans('There are no reviews yet.'),
),
),
);
}
int reviewsCount = reviews.length;
List<Widget> childrenWidgets = [];
List<ProductDetailReviewTileWidget> children = reviews

View File

@ -1,90 +0,0 @@
import 'package:animate_do/animate_do.dart';
import 'package:flutter/material.dart';
import 'package:nylo_framework/nylo_framework.dart';
class ToastNotification extends StatelessWidget {
const ToastNotification(ToastMeta toastMeta, {Function? onDismiss, Key? key}) : _toastMeta = toastMeta, _dismiss = onDismiss, super(key: key);
final Function? _dismiss;
final ToastMeta _toastMeta;
@override
Widget build(BuildContext context) {
return Stack(children: [
InkWell(
onTap: () {
if (_toastMeta.action != null) {
_toastMeta.action!();
}
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 18.0),
margin: EdgeInsets.symmetric(horizontal: 8.0),
height: 100,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(4),
),
color: _toastMeta.color,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Pulse(
child: Container(
child: Center(
child: IconButton(
onPressed: () {},
icon: _toastMeta.icon ?? SizedBox.shrink(),
padding: EdgeInsets.only(right: 16),
),
),
),
infinite: true,
duration: Duration(milliseconds: 1500),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
_toastMeta.title.tr(),
style: Theme.of(context)
.textTheme
.headlineSmall!
.copyWith(color: Colors.white),
),
Text(
_toastMeta.description.tr(),
style: Theme.of(context)
.textTheme
.bodyLarge!
.copyWith(color: Colors.white),
),
],
),
),
],
),
),
),
Positioned(
top: 0,
right: 0,
child: IconButton(
onPressed: () {
if (_dismiss != null) {
_dismiss!();
}
},
icon: Icon(
Icons.close,
color: Colors.white,
)),
)
]);
}
}

View File

@ -138,69 +138,72 @@ class CheckoutRowLine extends StatelessWidget {
final bool showBorderBottom;
@override
Widget build(BuildContext context) => Container(
height: 125,
padding: EdgeInsets.all(8),
decoration: showBorderBottom == true
? BoxDecoration(
border: Border(
bottom: BorderSide(color: Colors.black12, width: 1),
),
)
: BoxDecoration(),
child: InkWell(
onTap: action,
borderRadius: BorderRadius.circular(8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Padding(
child: Text(
heading,
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(fontSize: 16, fontWeight: FontWeight.bold),
),
padding: EdgeInsets.only(bottom: 8),
),
Flexible(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
Widget build(BuildContext context) => Flexible(
child: InkWell(
child: Container(
height: 125,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Padding(
child: Text(
heading,
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(fontSize: 16, fontWeight: FontWeight.bold),
),
padding: EdgeInsets.only(bottom: 8),
),
Flexible(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
leadImage,
Expanded(
child: Container(
child: Text(
leadTitle!,
style:
Theme.of(context).textTheme.titleMedium,
maxLines: 2,
overflow: TextOverflow.ellipsis,
softWrap: false,
),
padding: EdgeInsets.only(left: 15),
margin: EdgeInsets.only(right: 10),
Flexible(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
leadImage,
Expanded(
child: Container(
child: Text(
leadTitle!,
style:
Theme.of(context).textTheme.titleMedium,
maxLines: 2,
overflow: TextOverflow.ellipsis,
softWrap: false,
),
padding: EdgeInsets.only(left: 15),
margin: EdgeInsets.only(right: 10),
),
),
],
),
),
Icon(Icons.arrow_forward_ios),
],
),
),
Icon(Icons.arrow_forward_ios),
)
],
),
)
],
),
),
);
padding: EdgeInsets.all(8),
decoration: showBorderBottom == true
? BoxDecoration(
border: Border(
bottom: BorderSide(color: Colors.black12, width: 1),
),
)
: BoxDecoration(),
),
onTap: action,
borderRadius: BorderRadius.circular(8),
),
flex: 3,
);
}
class TextEditingRow extends StatelessWidget {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 141 KiB

View File

@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c"
sha256: "8eb354cb8ebed8a9fdf63699d15deff533bc133128898afaf754926b57d611b6"
url: "https://pub.dev"
source: hosted
version: "1.3.5"
version: "1.3.1"
analyzer:
dependency: "direct main"
description:
@ -26,7 +26,7 @@ packages:
source: hosted
version: "5.12.0"
animate_do:
dependency: "direct main"
dependency: transitive
description:
name: animate_do
sha256: "9aeacc1a7238f971c039bdf45d13c628be554a242e0251c4ddda09d19a1a923f"
@ -45,18 +45,10 @@ packages:
dependency: transitive
description:
name: args
sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a
url: "https://pub.dev"
source: hosted
version: "2.4.2"
asn1lib:
dependency: transitive
description:
name: asn1lib
sha256: b74e3842a52c61f8819a1ec8444b4de5419b41a7465e69d4aa681445377398b0
url: "https://pub.dev"
source: hosted
version: "1.4.1"
version: "2.4.1"
async:
dependency: transitive
description:
@ -149,10 +141,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.17.1"
convert:
dependency: transitive
description:
@ -185,14 +177,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.5"
dart_style:
dependency: transitive
description:
name: dart_style
sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
url: "https://pub.dev"
source: hosted
version: "2.3.1"
device_info_plus:
dependency: transitive
description:
name: device_info_plus
sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
sha256: "499c61743e13909c13374a8c209075385858c614b9c0f2487b5f9995eeaf7369"
url: "https://pub.dev"
source: hosted
version: "9.0.2"
version: "9.0.1"
device_info_plus_platform_interface:
dependency: transitive
description:
@ -205,34 +205,10 @@ packages:
dependency: transitive
description:
name: dio
sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8
sha256: "347d56c26d63519552ef9a569f2a593dda99a81fdbdff13c584b7197cfe05059"
url: "https://pub.dev"
source: hosted
version: "5.2.1+1"
encrypt:
dependency: transitive
description:
name: encrypt
sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
url: "https://pub.dev"
source: hosted
version: "5.0.1"
equatable:
dependency: transitive
description:
name: equatable
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
url: "https://pub.dev"
source: hosted
version: "2.0.5"
event_bus_plus:
dependency: transitive
description:
name: event_bus_plus
sha256: cbd27754d4c567f78fc88e7875e26c31d866d919f220523f34b29bf008f8fb1a
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "5.1.2"
eventify:
dependency: transitive
description:
@ -269,10 +245,10 @@ packages:
dependency: "direct main"
description:
name: firebase_core
sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389
sha256: "250678b816279b3240c3a33e1f76bf712c00718f1fbeffc85873a5da8c077379"
url: "https://pub.dev"
source: hosted
version: "2.15.1"
version: "2.13.0"
firebase_core_platform_interface:
dependency: transitive
description:
@ -285,34 +261,34 @@ packages:
dependency: transitive
description:
name: firebase_core_web
sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973"
sha256: "8c0f4c87d20e2d001a5915df238c1f9c88704231f591324205f5a5d2a7740a45"
url: "https://pub.dev"
source: hosted
version: "2.7.0"
version: "2.5.0"
firebase_messaging:
dependency: "direct main"
description:
name: firebase_messaging
sha256: "6c1a2a047d6f165b7c5f947467ac5138731a2af82c7af1c12d691dbb834f6b73"
sha256: "9cfe5c4560fb83393511ca7620f8fb3f22c9a80303052f10290e732fcfb801bd"
url: "https://pub.dev"
source: hosted
version: "14.6.7"
version: "14.6.1"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
sha256: bcba58d28f8cda607a323240c6d314c2c62b62ebfbb0f2d704ebefef07b52b5f
sha256: "7e25cb71019ccef8b1fd7b37969af79f04c467974cce4dfc291fa36974edd7ba"
url: "https://pub.dev"
source: hosted
version: "4.5.6"
version: "4.5.1"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
sha256: "962d09ec9dfa486cbbc218258ad41e8ec7997a2eba46919049496e1cafd960c5"
sha256: "5d9840cc8126ea723b1bda901389cb542902f664f2653c16d4f8114e95f13cec"
url: "https://pub.dev"
source: hosted
version: "3.5.6"
version: "3.5.1"
flare_flutter:
dependency: transitive
description:
@ -346,10 +322,10 @@ packages:
dependency: transitive
description:
name: flutter_dotenv
sha256: "9357883bdd153ab78cbf9ffa07656e336b8bbb2b5a3ca596b0b27e119f7c7d77"
sha256: d9283d92059a22e9834bc0a31336658ffba77089fb6f3cc36751f1fc7c6661a3
url: "https://pub.dev"
source: hosted
version: "5.1.0"
version: "5.0.2"
flutter_launcher_icons:
dependency: "direct dev"
description:
@ -439,10 +415,10 @@ packages:
dependency: "direct main"
description:
name: flutter_stripe
sha256: "2acc4a31f9fed946a1fb230d708169ff0448f2a356fc728780ced52eb0df7712"
sha256: "51c3ab5f7a705d864d719eb13882abbb3964c4f61983a13af6dc56607537b1e4"
url: "https://pub.dev"
source: hosted
version: "9.3.0"
version: "9.2.0"
flutter_styled_toast:
dependency: transitive
description:
@ -481,10 +457,10 @@ packages:
dependency: "direct main"
description:
name: flutter_widget_from_html_core
sha256: "60485f3c562c46783ea3e6cd344dc3fc2d51444bda42ffc4b8e11abdc10837e1"
sha256: "77f05cd7a738078dcdbe07741140d58b2fe7509197f3855a91269fb5a90f4bee"
url: "https://pub.dev"
source: hosted
version: "0.10.2"
version: "0.10.1"
fluttertoast:
dependency: transitive
description:
@ -561,10 +537,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.18.1"
version: "0.18.0"
js:
dependency: transitive
description:
@ -581,38 +557,38 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.8.1"
json_dart_generator:
dependency: transitive
description:
name: json_dart_generator
sha256: "88c710a9278e1f8a9ad65a695350153f517d7deeca293ea45c6f997c066437a5"
url: "https://pub.dev"
source: hosted
version: "1.1.0+1"
lints:
dependency: "direct dev"
description:
name: lints
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
logger:
dependency: transitive
description:
name: logger
sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "2.1.0"
matcher:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.2.0"
math_expressions:
dependency: "direct main"
description:
@ -641,18 +617,18 @@ packages:
dependency: "direct main"
description:
name: nylo_framework
sha256: "535684c9fd422f7a45ad83b1228ea42a87782a0655aa227c44fe75b9d3bcb8c5"
sha256: f9960dce938d1046166cc97f7ab613638d7e4f45e6e2a9b30e7d2b004d1d833d
url: "https://pub.dev"
source: hosted
version: "5.3.2"
version: "5.0.2"
nylo_support:
dependency: transitive
description:
name: nylo_support
sha256: "903f510366ca1af7982ec69d45fd8b9bd25c9cdbf6380f8736cd50fa37eed8cd"
sha256: "011a1614b2440ffcbac821e6624ca25355e304af6c8b5c298203bbbe547da00e"
url: "https://pub.dev"
source: hosted
version: "5.7.0"
version: "5.1.2"
octo_image:
dependency: transitive
description:
@ -673,10 +649,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
sha256: "28386bbe89ab5a7919a47cea99cdd1128e5a6e0bbd7eaafe20440ead84a15de3"
url: "https://pub.dev"
source: hosted
version: "4.1.0"
version: "4.0.1"
package_info_plus_platform_interface:
dependency: transitive
description:
@ -841,10 +817,10 @@ packages:
dependency: transitive
description:
name: shared_preferences
sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
sha256: "16d3fb6b3692ad244a695c0183fca18cf81fd4b821664394a781de42386bf022"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.1.1"
shared_preferences_android:
dependency: transitive
description:
@ -873,10 +849,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.2.0"
shared_preferences_web:
dependency: transitive
description:
@ -902,10 +878,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
sqflite:
dependency: transitive
description:
@ -958,26 +934,26 @@ packages:
dependency: transitive
description:
name: stripe_android
sha256: "0396c877823e84f0053f7d57fed506798635a9d48f0f044859c85216db6194fd"
sha256: "89c6c9a9e6fbe6eea4b15b6c0eb012490155c37a6b4298851f77987fde4fee43"
url: "https://pub.dev"
source: hosted
version: "9.3.0"
version: "9.2.0"
stripe_ios:
dependency: transitive
description:
name: stripe_ios
sha256: "81092043f0ae86ba6f5c16f76b16bbc97c4579eee58130e84cf4b30e36b4b649"
sha256: e397609a5083b79706814342b40a2a58f1b97ecab2b9d6cae8d8e9f59646fc8c
url: "https://pub.dev"
source: hosted
version: "9.3.1"
version: "9.2.1"
stripe_platform_interface:
dependency: transitive
description:
name: stripe_platform_interface
sha256: "554380d197004cff235ae0327f1c3b596a3d22575af83e07c15ed07b6b62c45e"
sha256: c1e90deb6e9939181f0fbc39b4f81c2e640b1b9fe4b3586ff84af7e8c46df2e4
url: "https://pub.dev"
source: hosted
version: "9.3.0"
version: "9.2.0"
synchronized:
dependency: transitive
description:
@ -998,10 +974,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.5.1"
theme_provider:
dependency: transitive
description:
@ -1022,10 +998,10 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3
url: "https://pub.dev"
source: hosted
version: "6.1.12"
version: "6.1.11"
url_launcher_android:
dependency: transitive
description:
@ -1114,14 +1090,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
webview_flutter:
dependency: "direct main"
description:
@ -1174,10 +1142,10 @@ packages:
dependency: "direct main"
description:
name: woosignal
sha256: "089a373122ae0e202e64e214ce4a549af29e589128bdc8c8a54f3da68a2355aa"
sha256: "985313603ad26dbb48420ce1b9029ebec7b6681861bab094c5f89d1710281ac3"
url: "https://pub.dev"
source: hosted
version: "3.8.0"
version: "3.5.0"
wp_json_api:
dependency: "direct main"
description:
@ -1211,5 +1179,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=3.10.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.7.0-0"

View File

@ -1,14 +1,14 @@
# Official WooSignal App Template for WooCommerce
# Label StoreMax
# Version: 6.10.1
# Version: 6.6.1
# Author: Anthony Gordon
# Homepage: https://woosignal.com
# Documentation: https://woosignal.com/docs/app/label-storemax
### Change App Icon
# 1 Replace: public/assets/icon/appicon.png (1024px1024px icon size)
# 2 Run this command from the terminal: "dart pub run flutter_launcher_icons:main"
# 2 Run this command from the terminal: "flutter pub run flutter_launcher_icons:main"
### Uploading the IOS/Android app
# IOS https://flutter.dev/docs/deployment/ios
@ -29,16 +29,16 @@ dependencies:
google_fonts: ^4.0.5
analyzer: ^5.12.0
intl: ^0.18.0
nylo_framework: ^5.3.2
woosignal: ^3.8.0
nylo_framework: ^5.0.2
woosignal: ^3.5.0
wp_json_api: ^3.3.2
cached_network_image: ^3.2.3
package_info_plus: ^4.1.0
package_info_plus: ^4.0.1
money_formatter: ^0.0.3
flutter_web_browser: ^0.17.1
webview_flutter: 3.0.4
webview_flutter: ^3.0.4
pull_to_refresh_flutter3: 2.0.1
url_launcher: ^6.1.12
url_launcher: ^6.1.6
bubble_tab_indicator: ^0.1.5
status_alert: ^1.0.1
math_expressions: ^2.4.0
@ -46,12 +46,12 @@ dependencies:
flutter_spinkit: ^5.1.0
auto_size_text: ^3.0.0
html: ^0.15.1
flutter_widget_from_html_core: ^0.10.2
flutter_widget_from_html_core: ^0.10.0
flutter_rating_bar: ^4.0.1
flutter_staggered_grid_view: ^0.6.2
flutter_swiper_view: ^1.1.8
firebase_messaging: ^14.6.7
firebase_core: ^2.15.1
firebase_messaging: ^14.4.1
firebase_core: ^2.10.0
flutter:
sdk: flutter
flutter_localizations:
@ -60,17 +60,16 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.5
collection: ^1.17.1
flutter_stripe: ^9.3.0
collection: ^1.15.0
flutter_stripe: ^9.2.0
razorpay_flutter: ^1.3.5
animate_do: ^3.0.2
dependency_overrides:
http: ^1.0.0
dev_dependencies:
flutter_launcher_icons: ^0.13.1
lints: ^2.1.1
lints: ^2.0.0
flutter_test:
sdk: flutter

View File

@ -4,7 +4,7 @@
# WooCommerce App: Label StoreMax
### Label StoreMax
### Label StoreMax - v6.6.1
[Official WooSignal WooCommerce App](https://woosignal.com)
@ -45,7 +45,7 @@ Full documentation this available [here](https://woosignal.com/docs/app/ios/labe
- Change app name, logo, customize default language, currency + more
- Light and dark mode
- Theme customization
- Stripe, Cash On Delivery, PayPal, RazorPay
- Stripe, Cash On Delivery, PayPal
- Localized for en, es, pt, it, hi, fr, zh, tr, nl
- Orders show as normal in WooCommerce