@@ -517,24 +517,31 @@ class DefaultAssetPickerViewerBuilderDelegate
517
517
/// 资源选择器将识别并一同返回。
518
518
@override
519
519
Widget confirmButton (BuildContext context) {
520
- return ChangeNotifierProvider <AssetPickerViewerProvider <AssetEntity >>.value (
521
- value: provider! ,
522
- child: Consumer <AssetPickerViewerProvider <AssetEntity >>(
523
- builder: (_, AssetPickerViewerProvider <AssetEntity > provider, __) {
520
+ return ChangeNotifierProvider <
521
+ AssetPickerViewerProvider <AssetEntity >?>.value (
522
+ value: provider,
523
+ child: Consumer <AssetPickerViewerProvider <AssetEntity >?>(
524
+ builder: (_, AssetPickerViewerProvider <AssetEntity >? provider, __) {
525
+ assert (
526
+ specialPickerType == SpecialPickerType .wechatMoment ||
527
+ provider != null ,
528
+ 'Viewer provider must not be null'
529
+ 'when the special type is not WeChat moment.' ,
530
+ );
524
531
return MaterialButton (
525
532
minWidth: () {
526
533
if (specialPickerType == SpecialPickerType .wechatMoment) {
527
534
return 48.0 ;
528
535
}
529
- return provider.isSelectedNotEmpty ? 48.0 : 20.0 ;
536
+ return provider! .isSelectedNotEmpty ? 48.0 : 20.0 ;
530
537
}(),
531
538
height: 32.0 ,
532
539
padding: const EdgeInsets .symmetric (horizontal: 12.0 ),
533
540
color: () {
534
541
if (specialPickerType == SpecialPickerType .wechatMoment) {
535
542
return themeData.colorScheme.secondary;
536
543
}
537
- return provider.isSelectedNotEmpty
544
+ return provider! .isSelectedNotEmpty
538
545
? themeData.colorScheme.secondary
539
546
: themeData.dividerColor;
540
547
}(),
@@ -546,7 +553,7 @@ class DefaultAssetPickerViewerBuilderDelegate
546
553
if (specialPickerType == SpecialPickerType .wechatMoment) {
547
554
return Constants .textDelegate.confirm;
548
555
}
549
- if (provider.isSelectedNotEmpty) {
556
+ if (provider! .isSelectedNotEmpty) {
550
557
return '${Constants .textDelegate .confirm }'
551
558
'(${provider .currentlySelectedAssets .length }'
552
559
'/'
@@ -559,7 +566,7 @@ class DefaultAssetPickerViewerBuilderDelegate
559
566
if (specialPickerType == SpecialPickerType .wechatMoment) {
560
567
return themeData.textTheme.bodyText1? .color;
561
568
}
562
- return provider.isSelectedNotEmpty
569
+ return provider! .isSelectedNotEmpty
563
570
? themeData.textTheme.bodyText1? .color
564
571
: themeData.textTheme.caption? .color;
565
572
}(),
@@ -572,7 +579,7 @@ class DefaultAssetPickerViewerBuilderDelegate
572
579
Navigator .of (context).pop (< AssetEntity > [currentAsset]);
573
580
return ;
574
581
}
575
- if (provider.isSelectedNotEmpty) {
582
+ if (provider! .isSelectedNotEmpty) {
576
583
Navigator .of (context).pop (provider.currentlySelectedAssets);
577
584
}
578
585
},
0 commit comments