igiqr/flutter-woocommerce-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some UI issues

Browse Source
This commit is contained in:
Jean-Matthieu DECHRISTE 2022-08-25 14:25:15 +02:00
parent faa62bb9ad
commit 8b218d45d4
6 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LabelStoreMax/lib/config/payment_gateways.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_app/app/providers/paypal_pay.dart';
import 'package:flutter_app/app/providers/razorpay_pay.dart'; import 'package:flutter_app/app/providers/razorpay_pay.dart';
import 'package:flutter_app/app/providers/stripe_pay.dart'; import 'package:flutter_app/app/providers/stripe_pay.dart';
import 'package:flutter_app/bootstrap/helpers.dart'; import 'package:flutter_app/bootstrap/helpers.dart';
import 'package:nylo_framework/nylo_framework.dart';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -22,7 +23,7 @@ List<PaymentType> paymentTypeList = [
addPayment( addPayment(
id: 1, id: 1,
name: "Stripe", name: "Stripe",
desc: "Debit or Credit Card", desc: trans("Debit or Credit Card"),
assetImage: "dark_powered_by_stripe.png", assetImage: "dark_powered_by_stripe.png",
pay: stripePay, pay: stripePay,
), ),
@ -30,7 +31,7 @@ List<PaymentType> paymentTypeList = [
addPayment( addPayment(
id: 2, id: 2,
name: "CashOnDelivery", name: "CashOnDelivery",
desc: "Cash on delivery", desc: trans("Cash on delivery"),
assetImage: "cash_on_delivery.jpeg", assetImage: "cash_on_delivery.jpeg",
pay: cashOnDeliveryPay, pay: cashOnDeliveryPay,
), ),
@ -38,7 +39,7 @@ List<PaymentType> paymentTypeList = [
addPayment( addPayment(
id: 4, id: 4,
name: "PayPal", name: "PayPal",
desc: "Debit or Credit Card", desc: trans("Debit or Credit Card"),
assetImage: "paypal_logo.png", assetImage: "paypal_logo.png",
pay: payPalPay, pay: payPalPay,
), ),
@ -46,7 +47,7 @@ List<PaymentType> paymentTypeList = [
addPayment( addPayment(
id: 5, id: 5,
name: "RazorPay", name: "RazorPay",
desc: "Debit or Credit Card", desc: trans("Debit or Credit Card"),
assetImage: "razorpay.png", assetImage: "razorpay.png",
pay: razorPay, pay: razorPay,
), ),

26
LabelStoreMax/lib/resources/pages/account_detail.dart
View File

@ -158,25 +158,15 @@ class _AccountDetailPageState extends State<AccountDetailPage>
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Column( Flexible(
crossAxisAlignment: child: Text(
CrossAxisAlignment.start, [userFirstName, userLastName].where((t) => (t != null || t != "")).toList().join(" "),
mainAxisAlignment: style: TextStyle(
MainAxisAlignment.spaceAround, fontSize: 20,
children: <Widget>[ fontWeight: FontWeight.w600,
Text(
[userFirstName, userLastName]
.where(
(t) => (t != null || t != ""))
.toList()
.join(" "),
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
),
), ),
], ),
) ),
], ],
), ),
padding: EdgeInsets.only(left: 16), padding: EdgeInsets.only(left: 16),

4
LabelStoreMax/lib/resources/pages/account_profile_update.dart
View File

@ -62,7 +62,7 @@ class _AccountProfileUpdatePageState extends State<AccountProfileUpdatePage> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text( title: Text(
trans("Update Details"), trans("Update details"),
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
), ),
@ -108,7 +108,7 @@ class _AccountProfileUpdatePageState extends State<AccountProfileUpdatePage> {
padding: EdgeInsets.only(top: 10), padding: EdgeInsets.only(top: 10),
), ),
PrimaryButton( PrimaryButton(
title: trans("Update details"), title: trans("Update Details"),
isLoading: isLoading, isLoading: isLoading,
action: _updateDetails, action: _updateDetails,
) )

17
LabelStoreMax/lib/resources/pages/home_search.dart
View File

@ -56,11 +56,8 @@ class _HomeSearchPageState extends State<HomeSearchPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container(
child: Icon(Icons.search, size: 36),
margin: EdgeInsets.only(bottom: 20),
),
TextField( TextField(
decoration: InputDecoration(prefixIcon: Icon(Icons.search)),
controller: _txtSearchController, controller: _txtSearchController,
style: Theme.of(context).textTheme.headline3, style: Theme.of(context).textTheme.headline3,
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
@ -68,13 +65,11 @@ class _HomeSearchPageState extends State<HomeSearchPage> {
autofocus: true, autofocus: true,
textCapitalization: TextCapitalization.sentences, textCapitalization: TextCapitalization.sentences,
), ),
Padding( const SizedBox(height: 10),
padding: const EdgeInsets.only(top: 10), PrimaryButton(
child: PrimaryButton( title: trans("Search"),
title: trans("Search"), action: _actionSearch,
action: _actionSearch, ),
),
)
], ],
), ),
), ),

2
LabelStoreMax/lib/resources/widgets/account_detail_settings_widget.dart
View File

@ -49,7 +49,7 @@ class AccountDetailSettingsWidget extends StatelessWidget {
Card( Card(
child: ListTile( child: ListTile(
leading: Icon(Icons.no_accounts_rounded), leading: Icon(Icons.no_accounts_rounded),
title: Text("Delete Account"), title: Text(trans("Delete Account")),
onTap: () => onTap: () =>
Navigator.pushNamed(context, "/account-delete"), Navigator.pushNamed(context, "/account-delete"),
), ),

18
LabelStoreMax/lib/resources/widgets/customer_address_input.dart
View File

@ -71,12 +71,6 @@ class CustomerAddressInput extends StatelessWidget {
controller: txtControllerAddressLine, controller: txtControllerAddressLine,
), ),
), ),
Flexible(
child: TextEditingRow(
heading: trans("City"),
controller: txtControllerCity,
),
),
], ],
), ),
Row( Row(
@ -87,6 +81,16 @@ class CustomerAddressInput extends StatelessWidget {
controller: txtControllerPostalCode, controller: txtControllerPostalCode,
), ),
), ),
Flexible(
child: TextEditingRow(
heading: trans("City"),
controller: txtControllerCity,
),
),
],
),
Row(
children: <Widget>[
Flexible( Flexible(
child: TextEditingRow( child: TextEditingRow(
heading: trans("Email address"), heading: trans("Email address"),
@ -100,7 +104,7 @@ class CustomerAddressInput extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Flexible( Flexible(
child: TextEditingRow( child: TextEditingRow(
heading: "Phone Number", heading: trans("Phone Number"),
controller: txtControllerPhoneNumber, controller: txtControllerPhoneNumber,
keyboardType: TextInputType.phone, keyboardType: TextInputType.phone,
), ),