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

Merge remote-tracking branch 'ptd/master'

Browse Source
This commit is contained in:
tzw
2021-09-10 17:02:28 +06:30
parent 7cb692c07e 4f7aa1b252
commit f3744fdbcf
69 changed files with 601 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pages/widgets/local_popup_menu_button.dart
View File

@@ -78,7 +78,7 @@ class _LocalPopupMenuButtonState extends State<LocalPopupMenuButton> {
children: <Widget>[
Icon(
widget.buttonIcon ?? Icons.filter_list,
color: widget.buttonColor ?? primaryColor,
color: widget.buttonColor,
),
hightlight
? Positioned(
@@ -98,14 +98,12 @@ class _LocalPopupMenuButtonState extends State<LocalPopupMenuButton> {
)),
itemBuilder: (BuildContext context) {
return popmenus.map((LocalPopupMenu choice) {
if (choice == null) return null;
return PopupMenuItem<LocalPopupMenu>(
value: choice,
child: Row(
children: <Widget>[
LocalText(context, choice.textKey,
color:
choice?.enabled ?? true ? primaryColor : Colors.grey),
LocalText(context, choice.textKey ?? "",
color: choice.enabled ? primaryColor : Colors.grey),
SizedBox(
width: 10,
),
@@ -124,8 +122,8 @@ class _LocalPopupMenuButtonState extends State<LocalPopupMenuButton> {
bool _needHighlight() {
popmenus.forEach((e) {
if (e == null) return false;
if (e.selected && e.highlight) return true;
if (e == null) return;
if (e.selected && e.highlight) return;
});
return false;
}

2
lib/pages/widgets/multi_img_controller.dart
View File

@@ -80,7 +80,7 @@ class MultiImgController {
List<File?> get getUpdatedFile {
List<File?> _addfiles = getAddedFile;
this.imageFiles.addAll(_addfiles);
this.imageFiles!.addAll(_addfiles);
return this.imageFiles;
}