Fixes for Settings Page

This commit is contained in:
Arseni
2025-12-22 21:09:58 +03:00
parent 41abf723e6
commit 47ada0691c
25 changed files with 1126 additions and 270 deletions

View File

@@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_settings_ui/flutter_settings_ui.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:pweb/models/edit_state.dart';
import 'package:pweb/utils/error/snackbar.dart';
enum _EditState { view, edit, saving }
import 'package:pweb/generated/i18n/app_localizations.dart';
/// Базовый класс, управляющий состояниями (view/edit/saving),
/// показом snackbar ошибок и успешного сохранения.
abstract class BaseEditTile<T> extends AbstractSettingsTile {
const BaseEditTile({
super.key,
@@ -16,6 +17,7 @@ abstract class BaseEditTile<T> extends AbstractSettingsTile {
required this.valueGetter,
required this.valueSetter,
required this.errorSituation,
this.editStateNotifier,
});
final IconData icon;
@@ -23,12 +25,10 @@ abstract class BaseEditTile<T> extends AbstractSettingsTile {
final ValueGetter<T?> valueGetter;
final Future<void> Function(T) valueSetter;
final String errorSituation;
final ValueNotifier<EditState>? editStateNotifier;
/// Рисует в режиме просмотра (read-only).
Widget buildView(BuildContext context, T? value);
/// Рисует UI редактора.
/// Если [useDialogEditor]==true, его обернут в диалог.
Widget buildEditor(
BuildContext context,
T? initial,
@@ -37,7 +37,6 @@ abstract class BaseEditTile<T> extends AbstractSettingsTile {
bool isSaving,
);
/// true → показывать редактор в диалоге, false → inline под заголовком.
bool get useDialogEditor => false;
@override
@@ -52,16 +51,35 @@ class _BaseEditTileBody<T> extends StatefulWidget {
}
class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
_EditState _state = _EditState.view;
bool get _isSaving => _state == _EditState.saving;
late final ValueNotifier<EditState> _stateNotifier;
late final bool _ownsNotifier;
bool get _isSaving => _stateNotifier.value == EditState.saving;
@override
void initState() {
super.initState();
final providedNotifier = widget.delegate.editStateNotifier ??
Provider.of<ValueNotifier<EditState>?>(context, listen: false);
_ownsNotifier = providedNotifier == null;
_stateNotifier = providedNotifier ?? ValueNotifier(EditState.view);
}
@override
void dispose() {
if (_ownsNotifier) {
_stateNotifier.dispose();
}
super.dispose();
}
Future<void> _performSave(T newValue) async {
final current = widget.delegate.valueGetter();
if (newValue == current) {
setState(() => _state = _EditState.view);
_stateNotifier.value = EditState.view;
return;
}
setState(() => _state = _EditState.saving);
_stateNotifier.value = EditState.saving;
final sms = ScaffoldMessenger.of(context);
final locs = AppLocalizations.of(context)!;
try {
@@ -78,7 +96,7 @@ class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
exception: e,
);
} finally {
if (mounted) setState(() => _state = _EditState.view);
if (mounted) _stateNotifier.value = EditState.view;
}
}
@@ -110,33 +128,45 @@ class _BaseEditTileBodyState<T> extends State<_BaseEditTileBody<T>> {
@override
Widget build(BuildContext context) {
final delegate = widget.delegate;
final current = delegate.valueGetter();
// Диалоговый режим
if (delegate.useDialogEditor) {
return SettingsTile.navigation(
leading: Icon(delegate.icon),
title: Text(delegate.title),
value: delegate.buildView(context, current),
onPressed: (_) => _openDialogEditor(),
return ValueListenableBuilder<EditState>(
valueListenable: _stateNotifier,
builder: (context, state, _) {
final current = delegate.valueGetter();
return SettingsTile.navigation(
leading: Icon(delegate.icon),
title: Text(delegate.title),
value: delegate.buildView(context, current),
onPressed: state == EditState.saving ? null : (_) => _openDialogEditor(),
);
},
);
}
// Inline-режим (под заголовком будет редактор прямо в tile)
return SettingsTile.navigation(
leading: Icon(delegate.icon),
title: Text(delegate.title),
value: _state == _EditState.view
? delegate.buildView(context, current)
: delegate.buildEditor(
context,
current,
_performSave,
() => setState(() => _state = _EditState.view),
_isSaving,
),
onPressed: (_) {
if (_state == _EditState.view) setState(() => _state = _EditState.edit);
return ValueListenableBuilder<EditState>(
valueListenable: _stateNotifier,
builder: (context, state, _) {
final current = delegate.valueGetter();
final isView = state == EditState.view;
final isSaving = state == EditState.saving;
return SettingsTile.navigation(
leading: Icon(delegate.icon),
title: Text(delegate.title),
value: isView
? delegate.buildView(context, current)
: delegate.buildEditor(
context,
current,
_performSave,
() => _stateNotifier.value = EditState.view,
isSaving,
),
onPressed: (_) {
if (isView) _stateNotifier.value = EditState.edit;
},
);
},
);
}