sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update customer list

Browse Source
This commit is contained in:
tzw
2024-01-29 17:18:23 +06:30
parent bb5a162a2b
commit c9680ca3ca
6 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/carton/carton_cargo_table.dart
View File

@@ -44,7 +44,7 @@ class _CargoTableState extends State<CargoTable> {
child: DataTable( child: DataTable(
showCheckboxColumn: false, showCheckboxColumn: false,
headingRowHeight: 40, headingRowHeight: 40,
columnSpacing: 40, // columnSpacing: 40,
decoration: BoxDecoration(border: Border.all(color: Colors.white)), decoration: BoxDecoration(border: Border.all(color: Colors.white)),
border: TableBorder(horizontalInside: BorderSide(color: Colors.white)), border: TableBorder(horizontalInside: BorderSide(color: Colors.white)),
columns: [ columns: [

66
lib/pages/customer/customer_list.dart
View File

@@ -93,7 +93,7 @@ class _CustomerListState extends State<CustomerList> {
BorderRadius.all(Radius.circular(35.0))), BorderRadius.all(Radius.circular(35.0))),
child: Text( child: Text(
customer.initial, customer.initial,
style: TextStyle(fontSize: 30, color: Colors.white), style: TextStyle(fontSize: 20, color: Colors.white),
), ),
), ),
), ),
@@ -109,7 +109,7 @@ class _CustomerListState extends State<CustomerList> {
child: new Text( child: new Text(
customer.name ?? "", customer.name ?? "",
style: new TextStyle( style: new TextStyle(
fontSize: 18.0, color: primaryColor), fontSize: 15.0, color: Colors.black),
), ),
), ),
Padding( Padding(
@@ -130,38 +130,44 @@ class _CustomerListState extends State<CustomerList> {
), ),
customer.status == user_invited_status customer.status == user_invited_status
? Padding( ? Padding(
padding: const EdgeInsets.only(right: 8.0), padding: const EdgeInsets.only(right: 10.0),
child: TextButton( child: SizedBox(
onPressed: () => _share(customer), height: 30,
style: TextButton.styleFrom( child: TextButton(
shape: RoundedRectangleBorder( onPressed: () => _share(customer),
borderRadius: BorderRadius.circular(20.0), style: TextButton.styleFrom(
side: BorderSide(color: primaryColor))), padding: EdgeInsets.all(0),
child: Row( shape: RoundedRectangleBorder(
children: [ borderRadius: BorderRadius.circular(20.0),
Text( side: BorderSide(
"Share", color: primaryColor.withOpacity(0.2)))),
style: TextStyle(fontSize: 12, color: primaryColor), child: Row(
), children: [
Icon(Icons.share, color: primaryColor), Text(
], "Share",
style:
TextStyle(fontSize: 12, color: primaryColor),
),
Icon(Icons.share, color: primaryColor, size: 17),
],
),
), ),
), ),
) )
: Container(), : Container(),
Column( Padding(
crossAxisAlignment: CrossAxisAlignment.end, padding: const EdgeInsets.only(right: 5),
children: [ child: Column(
Padding( crossAxisAlignment: CrossAxisAlignment.end,
padding: const EdgeInsets.only(right: 5), children: [
child: _status(customer.status ?? ""), _status(customer.status ?? ""),
), Text(
Padding( customer.getLastMessageTime,
padding: const EdgeInsets.only(right: 5), style: TextStyle(color: Colors.grey, fontSize: 12),
child: Text(customer.getLastMessageTime), ),
), getCount(customer),
getCount(customer), ],
], ),
), ),
], ],
), ),

6
lib/pages/customer/invitation_create.dart
View File

@@ -1,3 +1,5 @@
import 'dart:ui';
import 'package:country_code_picker/country_code_picker.dart'; import 'package:country_code_picker/country_code_picker.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/customer/model/customer_model.dart'; import 'package:fcs/pages/customer/model/customer_model.dart';
@@ -84,6 +86,10 @@ class _InvitationCreateState extends State<InvitationCreate> {
showOnlyCountryWhenClosed: false, showOnlyCountryWhenClosed: false,
alignLeft: false, alignLeft: false,
textStyle: TextStyle(fontSize: 16, color: Colors.black87), textStyle: TextStyle(fontSize: 16, color: Colors.black87),
searchDecoration: InputDecoration(
focusedBorder: UnderlineInputBorder(
borderSide:
BorderSide(color: Colors.black, width: 1.0))),
), ),
), ),
SizedBox( SizedBox(

19
lib/pages/signin/signin_page.dart
View File

@@ -74,14 +74,17 @@ class _SigninPageState extends State<SigninPage> {
border: Border.all(color: Colors.grey.shade400, width: 1), border: Border.all(color: Colors.grey.shade400, width: 1),
borderRadius: BorderRadius.all(Radius.circular(12.0))), borderRadius: BorderRadius.all(Radius.circular(12.0))),
child: CountryCodePicker( child: CountryCodePicker(
onChanged: _countryChange, onChanged: _countryChange,
initialSelection: dialCode, initialSelection: dialCode,
countryFilter: ['mm', 'us'], countryFilter: ['mm', 'us'],
showCountryOnly: false, showCountryOnly: false,
showOnlyCountryWhenClosed: false, showOnlyCountryWhenClosed: false,
alignLeft: false, alignLeft: false,
textStyle: TextStyle(fontSize: 16, color: Colors.black87), textStyle: TextStyle(fontSize: 16, color: Colors.black87),
), searchDecoration: InputDecoration(
focusedBorder: UnderlineInputBorder(
borderSide:
BorderSide(color: Colors.black, width: 1.0)))),
), ),
SizedBox( SizedBox(
width: 10, width: 10,

1
lib/pages/widgets/dialog_input.dart
View File

@@ -51,6 +51,7 @@ class _DialogInputState extends State<DialogInput> {
controller: _controller, controller: _controller,
focusNode: _focusNode, focusNode: _focusNode,
autofocus: true, autofocus: true,
cursorColor: primaryColor,
keyboardType: TextInputType.numberWithOptions(decimal: true), keyboardType: TextInputType.numberWithOptions(decimal: true),
decoration: new InputDecoration( decoration: new InputDecoration(
focusedBorder: UnderlineInputBorder( focusedBorder: UnderlineInputBorder(

6
lib/pages/widgets/length_picker.dart
View File

@@ -133,6 +133,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
onChanged: _updateInputInch, onChanged: _updateInputInch,
textAlign: TextAlign.center, textAlign: TextAlign.center,
controller: inchInputController, controller: inchInputController,
cursorColor: primaryColor,
keyboardType: TextInputType.numberWithOptions( keyboardType: TextInputType.numberWithOptions(
signed: false, decimal: true), signed: false, decimal: true),
decoration: new InputDecoration( decoration: new InputDecoration(
@@ -176,7 +177,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
) )
], ],
); );
final feetBox = Column( final feetBox = Column(
children: [ children: [
Text("Feet"), Text("Feet"),
Row( Row(
@@ -188,6 +189,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
controller: feetInputController, controller: feetInputController,
keyboardType: TextInputType.numberWithOptions( keyboardType: TextInputType.numberWithOptions(
signed: false, decimal: true), signed: false, decimal: true),
cursorColor: primaryColor,
decoration: new InputDecoration( decoration: new InputDecoration(
contentPadding: EdgeInsets.all(10), contentPadding: EdgeInsets.all(10),
isDense: true, isDense: true,
@@ -286,7 +288,7 @@ class _LengthPickerDialogState extends State<LengthPickerDialog> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(top: 8.0, left: 8), padding: const EdgeInsets.only(top: 8.0, left: 15),
child: LocalText( child: LocalText(
context, context,
"inch", "inch",