mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-02-25 02:48:54 +01:00
Fix NPE pressing edit before album initialized
This commit is contained in:
parent
1c476be689
commit
7321c04dc1
3 changed files with 34 additions and 23 deletions
|
@ -97,6 +97,9 @@ class _AlbumViewerState extends State<AlbumViewer>
|
|||
);
|
||||
}
|
||||
|
||||
@protected
|
||||
get canEdit => _album != null;
|
||||
|
||||
@override
|
||||
enterEditMode() {
|
||||
super.enterEditMode();
|
||||
|
|
|
@ -56,9 +56,11 @@ mixin AlbumViewerMixin<T extends StatefulWidget>
|
|||
},
|
||||
),
|
||||
...(actions ?? []),
|
||||
if (menuItemBuilder != null || canEdit)
|
||||
PopupMenuButton<int>(
|
||||
tooltip: MaterialLocalizations.of(context).moreButtonTooltip,
|
||||
itemBuilder: (context) => [
|
||||
if (canEdit)
|
||||
PopupMenuItem(
|
||||
value: -1,
|
||||
child: Text(L10n.of(context).editAlbumMenuLabel),
|
||||
|
@ -127,6 +129,9 @@ mixin AlbumViewerMixin<T extends StatefulWidget>
|
|||
@protected
|
||||
bool get isEditMode => _isEditMode;
|
||||
|
||||
@protected
|
||||
bool get canEdit => true;
|
||||
|
||||
@protected
|
||||
@mustCallSuper
|
||||
void enterEditMode() {}
|
||||
|
|
|
@ -98,6 +98,9 @@ class _DynamicAlbumViewerState extends State<DynamicAlbumViewer>
|
|||
);
|
||||
}
|
||||
|
||||
@protected
|
||||
get canEdit => _album != null;
|
||||
|
||||
@override
|
||||
enterEditMode() {
|
||||
super.enterEditMode();
|
||||
|
|
Loading…
Reference in a new issue