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

update

Browse Source
This commit is contained in:
Phaung Phaung
2021-09-10 12:02:08 +06:30
parent a144c945b6
commit c06ae00b68
35 changed files with 190 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pages/delivery_address/delivery_address_editor.dart
View File

@@ -7,13 +7,12 @@ import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class DeliveryAddressEditor extends StatefulWidget {
final DeliveryAddress deliveryAddress;
final User user;
final DeliveryAddress? deliveryAddress;
final User? user;
DeliveryAddressEditor({this.deliveryAddress, this.user});
@override
@@ -38,7 +37,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
super.initState();
if (widget.deliveryAddress != null) {
_isNew = false;
_deliveryAddress = widget.deliveryAddress;
_deliveryAddress = widget.deliveryAddress!;
_nameController.text = _deliveryAddress.fullName;
_address1Controller.text = _deliveryAddress.addressLine1;
_address2Controller.text = _deliveryAddress.addressLine2;
@@ -198,7 +197,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
return;
}
if (widget.user != null) {
deliveryAddress.userID = widget.user.id;
deliveryAddress.userID = widget.user!.id;
}
setState(() {
_isLoading = true;
@@ -224,7 +223,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
return;
}
if (widget.user != null) {
deliveryAddress.userID = widget.user.id;
deliveryAddress.userID = widget.user!.id;
}
setState(() {
_isLoading = true;
@@ -255,7 +254,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
DeliveryAddressModel deliveryAddressModel =
Provider.of<DeliveryAddressModel>(context, listen: false);
if (widget.user != null) {
_deliveryAddress.userID = widget.user.id;
_deliveryAddress.userID = widget.user!.id;
}
await deliveryAddressModel.deleteDeliveryAddress(_deliveryAddress);
Navigator.pop(context, true);
@@ -278,7 +277,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
_stateController.text != "Yangon";
} else {
DeliveryAddress deliveryAddress = _getPayload();
return widget.deliveryAddress.isChangedForEdit(deliveryAddress);
return this._deliveryAddress.isChangedForEdit(deliveryAddress);
}
}
}

6
lib/pages/delivery_address/delivery_address_list.dart
View File

@@ -13,9 +13,9 @@ import 'model/delivery_address_model.dart';
class DeliveryAddressList extends StatefulWidget {
final bool isAdminCreation;
final DeliveryAddress deliveryAddress;
final DeliveryAddress? deliveryAddress;
const DeliveryAddressList(
{Key key, this.isAdminCreation = false, this.deliveryAddress})
{Key? key, this.isAdminCreation = false, this.deliveryAddress})
: super(key: key);
@override
_DeliveryAddressListState createState() => _DeliveryAddressListState();
@@ -85,7 +85,7 @@ class _DeliveryAddressListState extends State<DeliveryAddressList> {
padding: const EdgeInsets.all(10.0),
child: Icon(Icons.check,
color: widget.isAdminCreation
? widget.deliveryAddress.id == deliveryAddress.id
? widget.deliveryAddress?.id == deliveryAddress.id
? primaryColor
: Colors.black26
: deliveryAddress.isDefault

13
lib/pages/delivery_address/delivery_address_row.dart
View File

@@ -3,15 +3,14 @@ import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
typedef SelectionCallback(DeliveryAddress deliveryAddress);
class DeliveryAddressRow extends StatelessWidget {
final DeliveryAddress deliveryAddress;
final SelectionCallback selectionCallback;
final SelectionCallback? selectionCallback;
const DeliveryAddressRow(
{Key key, this.deliveryAddress, this.selectionCallback})
{Key? key, required this.deliveryAddress, this.selectionCallback})
: super(key: key);
@override
@@ -19,7 +18,7 @@ class DeliveryAddressRow extends StatelessWidget {
return InkWell(
onTap: selectionCallback == null
? null
: () => this.selectionCallback(deliveryAddress),
: () => this.selectionCallback!(deliveryAddress),
child: Row(
children: <Widget>[
Expanded(
@@ -54,8 +53,8 @@ class DeliveryAddressRow extends StatelessWidget {
);
}
Widget line(BuildContext context, String text,
{IconData iconData, Color color, double fontSize}) {
Widget line(BuildContext context, String? text,
{IconData? iconData, Color? color, double? fontSize}) {
return Row(
children: [
iconData == null
@@ -69,7 +68,7 @@ class DeliveryAddressRow extends StatelessWidget {
context,
text ?? "",
fontSize: fontSize ?? 14,
color: color,
color: color ?? Colors.grey,
),
),
],