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

null safety

Browse Source
This commit is contained in:
phyothandar
2021-09-10 12:00:08 +06:30
parent a144c945b6
commit 5e672937b5
67 changed files with 901 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/pages/payment_methods/payment_method_editor.dart
View File

@@ -8,20 +8,20 @@ import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
class PaymentMethodEditor extends StatefulWidget {
final PaymentMethod paymentMethod;
final PaymentMethod? paymentMethod;
const PaymentMethodEditor({Key key, this.paymentMethod}) : super(key: key);
const PaymentMethodEditor({Key? key, this.paymentMethod}) : super(key: key);
@override
_PaymentMethodEditorState createState() => _PaymentMethodEditorState();
}
class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
bool _isLoading = false;
PaymentMethod _paymentMethod;
PaymentMethod? _paymentMethod;
TextEditingController _nameController = new TextEditingController();
TextEditingController _accountNameController = new TextEditingController();
TextEditingController _accountNumberController = new TextEditingController();
@@ -29,7 +29,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
TextEditingController _phoneController = new TextEditingController();
TextEditingController _linkController = new TextEditingController();
bool isNew;
late bool isNew;
@override
void initState() {
@@ -38,12 +38,12 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
if (widget.paymentMethod != null) {
_paymentMethod = widget.paymentMethod;
_nameController.text = _paymentMethod.name;
_accountNameController.text = _paymentMethod.accountName;
_accountNumberController.text = _paymentMethod.account;
_mailController.text = _paymentMethod.email;
_phoneController.text = _paymentMethod.phone;
_linkController.text = _paymentMethod.link;
_nameController.text = _paymentMethod!.name;
_accountNameController.text = _paymentMethod!.accountName;
_accountNumberController.text = _paymentMethod!.account;
_mailController.text = _paymentMethod!.email;
_phoneController.text = _paymentMethod!.phone;
_linkController.text = _paymentMethod!.link;
} else {
_paymentMethod = new PaymentMethod();
_nameController.text = '';
@@ -179,7 +179,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
});
try {
PaymentMethod pm = PaymentMethod(
id: _paymentMethod.id,
id: _paymentMethod!.id,
name: _nameController.text,
accountName: _accountNameController.text,
account: _accountNumberController.text,
@@ -208,7 +208,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
});
try {
await Provider.of<PaymentMethodModel>(context, listen: false)
.deletePaymentMethod(_paymentMethod.id);
.deletePaymentMethod(_paymentMethod!.id);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());

6
lib/pages/payment_methods/payment_method_page.dart
View File

@@ -12,7 +12,7 @@ import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
class PaymentMethodPage extends StatefulWidget {
@@ -127,7 +127,7 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
);
}
_itemRow(String text, String labelKey, {IconData iconData}) {
_itemRow(String text, String labelKey, {IconData? iconData}) {
return text == null || text == ""
? Container()
: Row(
@@ -153,7 +153,7 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
}
void _showToast(String title) {
final ScaffoldState scaffold = key.currentState;
final ScaffoldState scaffold = key.currentState as ScaffoldState;
scaffold.showSnackBar(
SnackBar(
content: Text('copied "$title" data to clipboard'),