hermes-agent/flutter_wisetronic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated new flutter version

Browse Source
This commit is contained in:
peima
2022-06-30 03:47:47 -04:00
parent f504e213a0
commit bcf21d90ac
50 changed files with 360 additions and 2638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/widgets/mobile/mobile_attribute_selection.dart
View File

@@ -35,8 +35,8 @@ class MobileAttributeSelection extends StatefulWidget {
class MobileAttributeSelectionState extends State<MobileAttributeSelection> {
Product product;
int index;
FlatButton previousButton;
FlatButton nextButton;
TextButton previousButton;
TextButton nextButton;
bool previousButtonEnable;
bool nextButtonEnable;
@@ -159,12 +159,12 @@ class MobileAttributeSelectionState extends State<MobileAttributeSelection> {
}
Widget _getProductContent() {
previousButton = new FlatButton(
previousButton = TextButton(
onPressed: previousButtonEnable ? _goPrevious : null,
child: new Text(S.of(context).previous),
);
nextButton = new FlatButton(
nextButton = TextButton(
onPressed: nextButtonEnable ? _goNext : null,
child: new Text(
product.productAttributes.length > index + 1 ? nextText : finishText

6
lib/widgets/mobile/mobile_change_mobile_or_email.dart
View File

@@ -221,8 +221,10 @@ class MobileChangeMobileOrEmailState extends State<MobileChangeMobileOrEmail> {
margin: EdgeInsets.only(top: 0.0, right: 16.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).submit_to_change,
style: TextStyle(

8
lib/widgets/mobile/mobile_change_password.dart
View File

@@ -230,8 +230,10 @@ class MobileChangePasswordState extends State<MobileChangePassword> {
padding: EdgeInsets.only(right: 16.0, top: 16.0, bottom: 20.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).submit,
style: TextStyle(
@@ -257,7 +259,7 @@ class MobileChangePasswordState extends State<MobileChangePassword> {
title: Text(S.of(context).success),
content: Text(S.of(context).password_has_been_changed),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).ok),
onPressed: () {
Navigator.of(context).pop();

26
lib/widgets/mobile/mobile_checkout.dart
View File

@@ -112,8 +112,10 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
Text(
S.of(context).no_delivery_method,
),
RaisedButton(
color: Theme.of(context).primaryColor,
ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).ok,
style: TextStyle(
@@ -1195,7 +1197,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();
@@ -1260,7 +1262,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();
@@ -1365,7 +1367,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).close),
onPressed: () {
panelController.close();
@@ -1411,7 +1413,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();
@@ -1585,7 +1587,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();
@@ -1637,7 +1639,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
margin: EdgeInsets.only(left: 5.0),
child: RaisedButton(
child: ElevatedButton(
child: Text(
S.of(context).get_coupon,
),
@@ -1931,7 +1933,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
));
for (int i = 0; i < cartInfo.businessInfo.quickInputs.length; i++) {
String qi = cartInfo.businessInfo.quickInputs[i].value;
w.children.add(FlatButton(
w.children.add(TextButton(
child: Text(
qi,
style: TextStyle(
@@ -1973,7 +1975,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();
@@ -1982,7 +1984,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).save),
onPressed: () {
if (mounted) {
@@ -2049,7 +2051,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
),
Container(
padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
child: FlatButton(
child: TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
panelController.close();

12
lib/widgets/mobile/mobile_coupons.dart
View File

@@ -246,17 +246,19 @@ class MobileCouponsState extends State<MobileCoupons> {
),
),
Container(
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
),
child: Text(
S.of(context).redeem_coupon,
style: TextStyle(
color: Colors.white,
),
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20.0),
),
onPressed: () {
if (coupon.store != null) {
Routes.router.navigateTo(context, '/shop/${coupon.store.id}/na/na/na');

8
lib/widgets/mobile/mobile_edit_address.dart
View File

@@ -410,7 +410,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
FlatButton(
TextButton(
child: Text(
S
.of(context)
@@ -428,7 +428,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
.of(context)
.are_you_sure_to_delete_the_address),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S
.of(context)
.cancel),
@@ -436,7 +436,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
Navigator.of(context).pop();
},
),
FlatButton(
TextButton(
child: Text(S
.of(context)
.yes_i_am_sure),
@@ -451,7 +451,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
);
},
),
FlatButton(
TextButton(
child: Text(
S
.of(context)

6
lib/widgets/mobile/mobile_forgot_password.dart
View File

@@ -204,8 +204,10 @@ class MobileForgotPasswordState extends State<MobileForgotPassword> {
margin: EdgeInsets.only(top: 0.0, right: 16.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).verify,
style: TextStyle(

10
lib/widgets/mobile/mobile_login.dart
View File

@@ -160,7 +160,7 @@ class MobileLoginState extends State<MobileLogin> {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
FlatButton(
TextButton(
child: Text(
S.of(context).new_user_question,
style: TextStyle(
@@ -175,7 +175,7 @@ class MobileLoginState extends State<MobileLogin> {
child: Text(''),
),
Container(
child: FlatButton(
child: TextButton(
child: Text(
S.of(context).forgot_password_question,
style: TextStyle(
@@ -194,8 +194,10 @@ class MobileLoginState extends State<MobileLogin> {
alignment: Alignment.centerRight,
child: Container(
padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).login,
style: TextStyle(

14
lib/widgets/mobile/mobile_me.dart
View File

@@ -405,7 +405,7 @@ class MobileMeState extends State<MobileMe> {
S.of(context).feature_not_available_web,
),
actions: [
FlatButton(
TextButton(
onPressed: () {
Routes.router.pop(context);
},
@@ -679,15 +679,19 @@ class MobileMeState extends State<MobileMe> {
title: Text(S.of(context).warning),
content: Text(S.of(context).email_needed),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
Navigator.of(context).pop();
},
),
RaisedButton(
color: Theme.of(context).primaryColor,
textColor: Colors.white,
ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
textStyle: TextStyle(
color: Colors.white,
),
),
child: Text(S.of(context).ok),
onPressed: () {
Navigator.of(context).pop();

8
lib/widgets/mobile/mobile_my_cards.dart
View File

@@ -113,14 +113,16 @@ class MyCardsState extends State<MobileMyCards> {
S.of(context).are_you_sure_to_remove_the_card,
),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).cancel),
color: Theme.of(context).primaryColor,
style: TextButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
},
),
FlatButton(
TextButton(
child: Text(S.of(context).yes_i_am_sure),
onPressed: () {
Navigator.of(context).pop();

2
lib/widgets/mobile/mobile_new_address.dart
View File

@@ -329,7 +329,7 @@ class MobileNewAddressState extends State<MobileNewAddress> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
SizedBox(),
FlatButton(
TextButton(
child: Text(
S.of(context).save
),

8
lib/widgets/mobile/mobile_new_comment.dart
View File

@@ -204,14 +204,16 @@ class MobileNewCommentState extends State<MobileNewComment> {
title: Text(S.of(context).warning),
content: Text(S.of(context).are_you_sure_to_remove_the_picture),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
Navigator.of(context).pop();
},
color: Theme.of(context).primaryColor,
style: TextButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
),
FlatButton(
TextButton(
child: Text(S.of(context).yes_i_am_sure),
onPressed: () {
Navigator.of(context).pop();

16
lib/widgets/mobile/mobile_new_ticket.dart
View File

@@ -160,8 +160,10 @@ class MobileNewTicketState extends State<MobileNewTicket> {
alignment: Alignment.centerRight,
child: Container(
padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).submit,
style: TextStyle(
@@ -233,7 +235,7 @@ class MobileNewTicketState extends State<MobileNewTicket> {
title: Text(S.of(context).success),
content: Text(S.of(context).ticket_created_success),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).ok),
onPressed: () {
Routes.router.navigateTo(context, '/my-support/${widget.businessId}', replace: true);
@@ -363,15 +365,17 @@ class MobileNewTicketState extends State<MobileNewTicket> {
title: Text(S.of(context).warning),
content: Text(S.of(context).are_you_sure_to_remove_the_picture),
actions: [
FlatButton(
TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
Navigator.of(context).pop();
},
),
RaisedButton(
ElevatedButton(
child: Text(S.of(context).yes_i_am_sure),
color: Theme.of(context).primaryColor,
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
setState(() {

6
lib/widgets/mobile/mobile_new_user.dart
View File

@@ -201,8 +201,10 @@ class MobileNewUserState extends State<MobileNewUser> {
margin: EdgeInsets.only(top: 0.0, right: 16.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).register,
style: TextStyle(

16
lib/widgets/mobile/mobile_order_detail.dart
View File

@@ -984,7 +984,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
Container(
padding: EdgeInsets.only(right: 10.0),
child: order.status == Constants.STATUS_PENDING && order.paymentStatus == Constants.PAYMENT_STATUS_UNPAID ?
FlatButton(
TextButton(
child: Text(
S.of(context).cancel_order,
),
@@ -994,7 +994,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
) : SizedBox.shrink(),
),
Container(
child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? RaisedButton(
child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? ElevatedButton(
child: Text(
S.of(context).comment,
),
@@ -1009,14 +1009,14 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
child: order.paymentStatus != Constants.PAYMENT_STATUS_PAID
&& order.status != Constants.STATUS_CANCELLED
&& order.status != Constants.STATUS_COMPLETE ?
FlatButton(
TextButton(
child: Text(
S.of(context).pay_now,
),
onPressed: () {
Routes.router.navigateTo(context, '/paynow/${order.id}');
},
) : FlatButton(
) : TextButton(
child: Text(
S.of(context).order_again,
),
@@ -1140,16 +1140,18 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
title: Text(S.of(context).warning),
content: Text(S.of(context).are_you_sure_to_cancel_the_order),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(
S.of(context).no,
),
color: Theme.of(context).primaryColor,
style: TextButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
},
),
FlatButton(
TextButton(
child: Text(
S.of(context).yes_i_am_sure,
),

22
lib/widgets/mobile/mobile_orders.dart
View File

@@ -187,7 +187,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
Row row3 = Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
RaisedButton(
ElevatedButton(
child: Text(
S.of(context).detail,
),
@@ -203,7 +203,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
row3.children.add(
Padding(
padding: EdgeInsets.only(left: 10.0),
child: RaisedButton(
child: ElevatedButton(
child: Text(
S.of(context).comment,
),
@@ -225,7 +225,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
if (order.paymentStatus != Constants.PAYMENT_STATUS_PAID
&& order.status != Constants.STATUS_CANCELLED
&& order.status != Constants.STATUS_COMPLETE) {
row2.children.add(RaisedButton(
row2.children.add(ElevatedButton(
child: Text(
S.of(context)
.pay_now,
@@ -233,20 +233,24 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
color: Colors.white,
),
),
color: Colors.redAccent,
style: ElevatedButton.styleFrom(
primary: Colors.redAccent,
),
onPressed: () {
Routes.router.navigateTo(context, '/paynow/${order.id}');
},
));
} else {
row2.children.add(RaisedButton(
row2.children.add(ElevatedButton(
child: Text(
S.of(context).order_again,
style: TextStyle(
color: Colors.white,
),
),
color: Theme.of(context).primaryColor,
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Utils.orderAgain(context, order.cartInfo);
},
@@ -254,14 +258,16 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
}
} else {
row2.children.add(row3);
row2.children.add(RaisedButton(
row2.children.add(ElevatedButton(
child: Text(
S.of(context).order_again,
style: TextStyle(
color: Colors.white,
),
),
color: Theme.of(context).primaryColor,
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Utils.orderAgain(context, order.cartInfo);
},

8
lib/widgets/mobile/mobile_reset_password.dart
View File

@@ -193,8 +193,10 @@ class MobileResetPasswordState extends State<MobileResetPassword> {
padding: EdgeInsets.only(right: 16.0, top: 16.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).submit,
style: TextStyle(
@@ -220,7 +222,7 @@ class MobileResetPasswordState extends State<MobileResetPassword> {
title: Text(S.of(context).success),
content: Text(S.of(context).reset_password_success),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).ok),
onPressed: () {
Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

8
lib/widgets/mobile/mobile_set_password.dart
View File

@@ -194,8 +194,10 @@ class MobileSetPasswordState extends State<MobileSetPassword> {
padding: EdgeInsets.only(right: 16.0, top: 16.0),
child: Align(
alignment: Alignment.centerRight,
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).submit,
style: TextStyle(
@@ -221,7 +223,7 @@ class MobileSetPasswordState extends State<MobileSetPassword> {
title: Text(S.of(context).success),
content: Text(S.of(context).user_account_created_success),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).ok),
onPressed: () {
Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

4
lib/widgets/mobile/mobile_user_profile.dart
View File

@@ -402,7 +402,7 @@ class MobileUserProfileState extends State<MobileUserProfile> {
),
),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(
S.of(context).cancel
),
@@ -410,7 +410,7 @@ class MobileUserProfileState extends State<MobileUserProfile> {
Navigator.of(context).pop();
},
),
FlatButton(
TextButton(
child: Text(
S.of(context).submit_to_change,
),

16
lib/widgets/mobile/mobile_view_ticket.dart
View File

@@ -337,8 +337,10 @@ class MobileViewTicketState extends State<MobileViewTicket> {
alignment: Alignment.centerRight,
child: Container(
padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
child: RaisedButton(
color: Theme.of(context).primaryColor,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
child: Text(
S.of(context).reply,
style: TextStyle(
@@ -631,15 +633,17 @@ class MobileViewTicketState extends State<MobileViewTicket> {
title: Text(S.of(context).warning),
content: Text(S.of(context).are_you_sure_to_remove_the_picture),
actions: [
FlatButton(
TextButton(
child: Text(S.of(context).cancel),
onPressed: () {
Navigator.of(context).pop();
},
),
RaisedButton(
ElevatedButton(
child: Text(S.of(context).yes_i_am_sure),
color: Theme.of(context).primaryColor,
style: ElevatedButton.styleFrom(
primary: Theme.of(context).primaryColor,
),
onPressed: () {
Navigator.of(context).pop();
setState(() {
@@ -683,7 +687,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
title: Text(S.of(context).success),
content: Text(S.of(context).ticket_created_success),
actions: <Widget>[
FlatButton(
TextButton(
child: Text(S.of(context).ok),
onPressed: () {
Routes.router.navigateTo(context,

2
lib/widgets/mobile/shop.dart
View File

@@ -534,7 +534,7 @@ class ShopState extends State<Shop>
action: SnackBarAction(
label: S.of(context).close,
onPressed: () {
_scaffoldKey.currentState.hideCurrentSnackBar();
ScaffoldMessenger.of(context).hideCurrentSnackBar();
},
),
content: Container(