Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-02-25 10:58:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE pressing edit before album initialized

Browse source
This commit is contained in:
Ming Ming 2021-07-26 04:25:16 +08:00
parent 1c476be689
commit 7321c04dc1
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/widget/album_viewer.dart
View file

@ -97,6 +97,9 @@ class _AlbumViewerState extends State<AlbumViewer>
); );
} }
@protected
get canEdit => _album != null;
@override @override
enterEditMode() { enterEditMode() {
super.enterEditMode(); super.enterEditMode();

51
lib/widget/album_viewer_mixin.dart
View file

@ -56,31 +56,33 @@ mixin AlbumViewerMixin<T extends StatefulWidget>
}, },
), ),
...(actions ?? []), ...(actions ?? []),
PopupMenuButton<int>( if (menuItemBuilder != null || canEdit)
tooltip: MaterialLocalizations.of(context).moreButtonTooltip, PopupMenuButton<int>(
itemBuilder: (context) => [ tooltip: MaterialLocalizations.of(context).moreButtonTooltip,
PopupMenuItem( itemBuilder: (context) => [
value: -1, if (canEdit)
child: Text(L10n.of(context).editAlbumMenuLabel), PopupMenuItem(
), value: -1,
...(menuItemBuilder?.call(context) ?? []), child: Text(L10n.of(context).editAlbumMenuLabel),
], ),
onSelected: (option) { ...(menuItemBuilder?.call(context) ?? []),
if (option >= 0) { ],
onSelectedMenuItem?.call(option); onSelected: (option) {
} else { if (option >= 0) {
switch (option) { onSelectedMenuItem?.call(option);
case _menuValueEdit: } else {
_onAppBarEditPressed(context, album); switch (option) {
break; case _menuValueEdit:
_onAppBarEditPressed(context, album);
break;
default: default:
_log.shout("[buildNormalAppBar] Unknown value: $option"); _log.shout("[buildNormalAppBar] Unknown value: $option");
break; break;
}
} }
} },
}, ),
),
], ],
); );
} }
@ -127,6 +129,9 @@ mixin AlbumViewerMixin<T extends StatefulWidget>
@protected @protected
bool get isEditMode => _isEditMode; bool get isEditMode => _isEditMode;
@protected
bool get canEdit => true;
@protected @protected
@mustCallSuper @mustCallSuper
void enterEditMode() {} void enterEditMode() {}

3
lib/widget/dynamic_album_viewer.dart
View file

@ -98,6 +98,9 @@ class _DynamicAlbumViewerState extends State<DynamicAlbumViewer>
); );
} }
@protected
get canEdit => _album != null;
@override @override
enterEditMode() { enterEditMode() {
super.enterEditMode(); super.enterEditMode();