mirror of
https://github.com/immich-app/immich.git
synced 2024-12-26 10:50:29 +02:00
fix(mobile): back button while multiselecting showing the last selected image (#1521)
This commit is contained in:
parent
29c79ad1d8
commit
5d6559e839
@ -224,13 +224,28 @@ class ImmichAssetGridState extends State<ImmichAssetGrid> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Future<bool> onWillPop() async {
|
||||||
|
if (widget.selectionActive && _selectedAssets.isNotEmpty) {
|
||||||
|
_deselectAll();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Stack(
|
return WillPopScope(
|
||||||
|
onWillPop: onWillPop,
|
||||||
|
child: Stack(
|
||||||
children: [
|
children: [
|
||||||
_buildAssetGrid(),
|
_buildAssetGrid(),
|
||||||
if (widget.selectionActive) _buildMultiSelectIndicator(),
|
if (widget.selectionActive) _buildMultiSelectIndicator(),
|
||||||
],
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -200,18 +200,7 @@ class HomePage extends HookConsumerWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<bool> onWillPop() async {
|
return SafeArea(
|
||||||
if (multiselectEnabled.state) {
|
|
||||||
selectionEnabledHook.value = false;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return WillPopScope(
|
|
||||||
onWillPop: onWillPop,
|
|
||||||
child: SafeArea(
|
|
||||||
bottom: !multiselectEnabled.state,
|
bottom: !multiselectEnabled.state,
|
||||||
top: true,
|
top: true,
|
||||||
child: Stack(
|
child: Stack(
|
||||||
@ -240,7 +229,6 @@ class HomePage extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user