Skip to content

Commit 6dd9b73

Browse files
committed
ui tweaks
1 parent f94a3e2 commit 6dd9b73

File tree

11 files changed

+28
-42
lines changed

11 files changed

+28
-42
lines changed

LabelStoreMax/lib/app/providers/app_provider.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import 'package:woosignal/woosignal.dart';
1010
import 'package:wp_json_api/wp_json_api.dart';
1111

1212
class AppProvider implements NyProvider {
13+
@override
1314
boot(Nylo nylo) async {
1415
await SystemChrome.setPreferredOrientations([
1516
DeviceOrientation.portraitUp,

LabelStoreMax/lib/app/providers/route_provider.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter_app/routes/router.dart';
22
import 'package:nylo_framework/nylo_framework.dart';
33

44
class RouteProvider implements NyProvider {
5+
@override
56
boot(Nylo nylo) async {
67
nylo.addRouter(appRouter());
78

LabelStoreMax/lib/bootstrap/helpers.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ dynamic envVal(String envVal, {dynamic defaultValue}) =>
115115
PaymentType addPayment(
116116
{required int id,
117117
required String name,
118-
required String desc,
118+
required String description,
119119
required String assetImage,
120120
required Function pay}) =>
121121
PaymentType(
122122
id: id,
123123
name: name,
124-
desc: desc,
124+
desc: description,
125125
assetImage: assetImage,
126126
pay: pay,
127127
);

LabelStoreMax/lib/config/payment_gateways.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_app/app/providers/paypal_pay.dart';
44
import 'package:flutter_app/app/providers/razorpay_pay.dart';
55
import 'package:flutter_app/app/providers/stripe_pay.dart';
66
import 'package:flutter_app/bootstrap/helpers.dart';
7+
import 'package:nylo_framework/nylo_framework.dart';
78

89
/*
910
|--------------------------------------------------------------------------
@@ -22,31 +23,31 @@ List<PaymentType> paymentTypeList = [
2223
addPayment(
2324
id: 1,
2425
name: "Stripe",
25-
desc: "Debit or Credit Card",
26+
description: trans("Debit or Credit Card"),
2627
assetImage: "dark_powered_by_stripe.png",
2728
pay: stripePay,
2829
),
2930

3031
addPayment(
3132
id: 2,
3233
name: "CashOnDelivery",
33-
desc: "Cash on delivery",
34+
description: trans("Cash on delivery"),
3435
assetImage: "cash_on_delivery.jpeg",
3536
pay: cashOnDeliveryPay,
3637
),
3738

3839
addPayment(
3940
id: 4,
4041
name: "PayPal",
41-
desc: "Debit or Credit Card",
42+
description: trans("Debit or Credit Card"),
4243
assetImage: "paypal_logo.png",
4344
pay: payPalPay,
4445
),
4546

4647
addPayment(
4748
id: 5,
4849
name: "RazorPay",
49-
desc: "Debit or Credit Card",
50+
description: trans("Debit or Credit Card"),
5051
assetImage: "razorpay.png",
5152
pay: razorPay,
5253
),
@@ -56,7 +57,7 @@ List<PaymentType> paymentTypeList = [
5657
// addPayment(
5758
// id: 6,
5859
// name: "MyNewPaymentMethod",
59-
// desc: "Debit or Credit Card",
60+
// description: "Debit or Credit Card",
6061
// assetImage: "add icon image to public/assets/images/myimage.png",
6162
// pay: "myCustomPaymentFunction",
6263
// ),

LabelStoreMax/lib/resources/pages/account_detail.dart

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -154,30 +154,16 @@ class _AccountDetailPageState extends State<AccountDetailPage>
154154
),
155155
Expanded(
156156
child: Padding(
157-
child: Row(
158-
crossAxisAlignment: CrossAxisAlignment.center,
159-
mainAxisAlignment: MainAxisAlignment.start,
160-
children: <Widget>[
161-
Column(
162-
crossAxisAlignment:
163-
CrossAxisAlignment.start,
164-
mainAxisAlignment:
165-
MainAxisAlignment.spaceAround,
166-
children: <Widget>[
167-
Text(
168-
[userFirstName, userLastName]
169-
.where(
170-
(t) => (t != null || t != ""))
171-
.toList()
172-
.join(" "),
173-
style: TextStyle(
174-
fontSize: 20,
175-
fontWeight: FontWeight.w600,
176-
),
177-
),
178-
],
179-
)
180-
],
157+
child: Text(
158+
[userFirstName, userLastName]
159+
.where(
160+
(t) => (t != null || t != ""))
161+
.toList()
162+
.join(" "),
163+
style: TextStyle(
164+
fontSize: 20,
165+
fontWeight: FontWeight.w600,
166+
),
181167
),
182168
padding: EdgeInsets.only(left: 16),
183169
),

LabelStoreMax/lib/resources/pages/account_profile_update.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class _AccountProfileUpdatePageState extends State<AccountProfileUpdatePage> {
108108
padding: EdgeInsets.only(top: 10),
109109
),
110110
PrimaryButton(
111-
title: trans("Update details"),
111+
title: trans("Update Details"),
112112
isLoading: isLoading,
113113
action: _updateDetails,
114114
)

LabelStoreMax/lib/resources/pages/account_register.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class _AccountRegistrationPageState extends NyState<AccountRegistrationPage> {
114114
child: InkWell(
115115
child: RichText(
116116
text: TextSpan(
117-
text: '${trans("By tapping \"Register\" you agree to ")} ${AppHelper.instance.appConfig!.appName!}\'s',
117+
text: '${trans("By tapping \"Register\" you agree to ")} ${AppHelper.instance.appConfig!.appName!}\'s ',
118118
children: <TextSpan>[
119119
TextSpan(
120120
text: trans("terms and conditions"),

LabelStoreMax/lib/resources/pages/home_search.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,17 @@ class _HomeSearchPageState extends State<HomeSearchPage> {
5656
mainAxisAlignment: MainAxisAlignment.center,
5757
crossAxisAlignment: CrossAxisAlignment.start,
5858
children: <Widget>[
59-
Container(
60-
child: Icon(Icons.search, size: 36),
61-
margin: EdgeInsets.only(bottom: 20),
62-
),
6359
TextField(
60+
decoration: InputDecoration(prefixIcon: Icon(Icons.search)),
6461
controller: _txtSearchController,
6562
style: Theme.of(context).textTheme.headline3,
6663
keyboardType: TextInputType.text,
6764
autocorrect: false,
6865
autofocus: true,
6966
textCapitalization: TextCapitalization.sentences,
7067
),
71-
Padding(
72-
padding: const EdgeInsets.only(top: 10),
68+
Container(
69+
margin: EdgeInsets.only(top: 10),
7370
child: PrimaryButton(
7471
title: trans("Search"),
7572
action: _actionSearch,

LabelStoreMax/lib/resources/widgets/account_detail_settings_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AccountDetailSettingsWidget extends StatelessWidget {
4949
Card(
5050
child: ListTile(
5151
leading: Icon(Icons.no_accounts_rounded),
52-
title: Text("Delete Account"),
52+
title: Text(trans("Delete Account")),
5353
onTap: () =>
5454
Navigator.pushNamed(context, "/account-delete"),
5555
),

LabelStoreMax/lib/resources/widgets/customer_address_input.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class CustomerAddressInput extends StatelessWidget {
100100
children: <Widget>[
101101
Flexible(
102102
child: TextEditingRow(
103-
heading: "Phone Number",
103+
heading: trans("Phone Number"),
104104
controller: txtControllerPhoneNumber,
105105
keyboardType: TextInputType.phone,
106106
),

0 commit comments

Comments
 (0)