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

Fix back button bypassing Done listener in account settings

Browse source
This commit is contained in:
Ming Ming 2021-10-26 00:17:10 +08:00
parent 6052d82047
commit 1fdf438956
1 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
lib/widget/settings.dart
View file

@ -423,43 +423,46 @@ class _AccountSettingsState extends State<AccountSettingsWidget> {
}
Widget _buildContent(BuildContext context) {
return CustomScrollView(
slivers: [
SliverAppBar(
pinned: true,
title: Text(L10n.global().settingsAccountPageTitle),
leading: _hasModified
? IconButton(
icon: const Icon(Icons.check),
tooltip: L10n.global().doneButtonTooltip,
onPressed: () => _onDonePressed(context),
)
: null,
),
SliverList(
delegate: SliverChildListDelegate(
[
ListTile(
title: Text(L10n.global().settingsIncludedFoldersTitle),
subtitle: Text(_account.roots.map((e) => "/$e").join("; ")),
onTap: _onIncludedFoldersPressed,
),
ListTile(
title: Text(L10n.global().settingsShareFolderTitle),
subtitle: Text("/$_shareFolder"),
onTap: () => _onShareFolderPressed(context),
),
_buildCaption(
context, L10n.global().settingsServerAppSectionTitle),
SwitchListTile(
title: const Text("Face Recognition"),
value: _isEnableFaceRecognitionApp,
onChanged: _onEnableFaceRecognitionAppChanged,
),
],
return WillPopScope(
onWillPop: () async => !_hasModified,
child: CustomScrollView(
slivers: [
SliverAppBar(
pinned: true,
title: Text(L10n.global().settingsAccountPageTitle),
leading: _hasModified
? IconButton(
icon: const Icon(Icons.check),
tooltip: L10n.global().doneButtonTooltip,
onPressed: () => _onDonePressed(context),
)
: null,
),
),
],
SliverList(
delegate: SliverChildListDelegate(
[
ListTile(
title: Text(L10n.global().settingsIncludedFoldersTitle),
subtitle: Text(_account.roots.map((e) => "/$e").join("; ")),
onTap: _onIncludedFoldersPressed,
),
ListTile(
title: Text(L10n.global().settingsShareFolderTitle),
subtitle: Text("/$_shareFolder"),
onTap: () => _onShareFolderPressed(context),
),
_buildCaption(
context, L10n.global().settingsServerAppSectionTitle),
SwitchListTile(
title: const Text("Face Recognition"),
value: _isEnableFaceRecognitionApp,
onChanged: _onEnableFaceRecognitionAppChanged,
),
],
),
),
],
),
);
}