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

check null safety

Browse Source
This commit is contained in:
tzw
2021-09-10 16:33:52 +06:30
parent 3eacbef117
commit d8c86a512b
46 changed files with 275 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/carton_size/carton_size_editor.dart
View File

@@ -36,7 +36,7 @@ class _CartonSizeEditorState extends State<CartonSizeEditor> {
if (widget.cartonSize != null) {
_cartonSize = widget.cartonSize;
_isNew = false;
_nameController.text = _cartonSize!.name;
_nameController.text = _cartonSize!.name ?? "";
_widthController.text = _cartonSize!.width.toString();
_heightController.text = _cartonSize!.height.toString();
_lengthController.text = _cartonSize!.length.toString();

4
lib/pages/carton_size/carton_size_list.dart
View File

@@ -40,7 +40,7 @@ class _CartonSizeListState extends State<CartonSizeList> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
new Text(
p.name,
p.name ?? "",
style: TextStyle(fontSize: 15.0),
),
Padding(
@@ -135,7 +135,7 @@ class _CartonSizeListState extends State<CartonSizeList> {
CartonSizeModel cartonSizeModel =
Provider.of<CartonSizeModel>(context, listen: false);
try {
await cartonSizeModel.deleteCartonSize(cartonSize.id);
await cartonSizeModel.deleteCartonSize(cartonSize.id!);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {

13
lib/pages/carton_size/model/carton_size_model.dart
View File

@@ -13,7 +13,7 @@ class CartonSizeModel extends BaseModel {
List<CartonSize> cartonSizes = [];
final log = Logger('CartonSizeModel');
StreamSubscription<QuerySnapshot> listener;
StreamSubscription<QuerySnapshot>? listener;
List<CartonSize> get getCartonSizes {
var _cartonSizes = new List<CartonSize>.from(cartonSizes);
@@ -27,17 +27,18 @@ class CartonSizeModel extends BaseModel {
Future<void> _loadCartonSizes() async {
try {
if (listener != null) listener.cancel();
if (listener != null) listener!.cancel();
listener = Firestore.instance
listener = FirebaseFirestore.instance
.collection(
"/$config_collection/$setting_doc_id/$carton_sizes_collection")
.snapshots()
.listen((QuerySnapshot snapshot) {
cartonSizes.clear();
cartonSizes = snapshot.documents.map((documentSnapshot) {
cartonSizes = snapshot.docs.map((documentSnapshot) {
var c = CartonSize.fromMap(
documentSnapshot.data, documentSnapshot.documentID);
documentSnapshot.data() as Map<String, dynamic>,
documentSnapshot.id);
return c;
}).toList();
notifyListeners();
@@ -49,7 +50,7 @@ class CartonSizeModel extends BaseModel {
@override
logout() async {
if (listener != null) await listener.cancel();
if (listener != null) await listener!.cancel();
cartonSizes = [];
}