mirror of
https://github.com/rzuasti/oott.git
synced 2026-07-08 19:21:54 +02:00
Extract device forget/register dialogs into shared device_actions utility
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
1b470fc28f
commit
b15cb46c43
@@ -14,7 +14,9 @@
|
|||||||
- [x] Register a device
|
- [x] Register a device
|
||||||
- [x] Forget a device
|
- [x] Forget a device
|
||||||
- [x] Extract the snack bar confirmations as a utility widget so it can be reused
|
- [x] Extract the snack bar confirmations as a utility widget so it can be reused
|
||||||
- [ ] In the notifications list add an action to register the device if new
|
- [x] Add a detail device page with access from notifications and devices lists
|
||||||
|
- [x] Extract the device type as an enum (idem Notification) and with Icon getter too
|
||||||
|
- [x] Extract the confirmForget and showRegisterDialog methods from both device pages
|
||||||
- [ ] In the devices list add filters by owner and device type
|
- [ ] In the devices list add filters by owner and device type
|
||||||
- [ ] View detailed log of device activity (based on event log in the backend)
|
- [ ] View detailed log of device activity (based on event log in the backend)
|
||||||
- [ ] Scan process monitor and summary page
|
- [ ] Scan process monitor and summary page
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../model/device.dart';
|
||||||
|
import '../model/device_type.dart';
|
||||||
|
import '../utils/oott_api.dart';
|
||||||
|
import '../utils/ui_snackbars.dart';
|
||||||
|
|
||||||
|
Future<void> confirmForgetDevice(
|
||||||
|
BuildContext context,
|
||||||
|
Device device,
|
||||||
|
VoidCallback onRefresh,
|
||||||
|
) async {
|
||||||
|
final colorScheme = Theme.of(context).colorScheme;
|
||||||
|
|
||||||
|
final confirmed = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Forget Device'),
|
||||||
|
content: Text(
|
||||||
|
'This device will be unregistered and will no longer be linked to '
|
||||||
|
'${device.owner}. Are you sure?',
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.of(context).pop(false),
|
||||||
|
child: const Text('Cancel'),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.of(context).pop(true),
|
||||||
|
child: Text('Forget', style: TextStyle(color: colorScheme.error)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (confirmed != true || !context.mounted) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await BackendAPI.instance.forgetDevice(device.macAddress);
|
||||||
|
if (!context.mounted) return;
|
||||||
|
UISnackbars.showSuccess(context, 'Device forgotten');
|
||||||
|
onRefresh();
|
||||||
|
} catch (e) {
|
||||||
|
if (!context.mounted) return;
|
||||||
|
UISnackbars.showError(context, 'Failed to forget device: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> showRegisterDeviceDialog(
|
||||||
|
BuildContext context,
|
||||||
|
Device device,
|
||||||
|
VoidCallback onRefresh,
|
||||||
|
) async {
|
||||||
|
final formKey = GlobalKey<FormState>();
|
||||||
|
String owner = '';
|
||||||
|
DeviceType deviceType = device.deviceType;
|
||||||
|
|
||||||
|
final saved = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => StatefulBuilder(
|
||||||
|
builder: (context, setDialogState) => AlertDialog(
|
||||||
|
title: const Text('Register Device'),
|
||||||
|
content: Form(
|
||||||
|
key: formKey,
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
TextFormField(
|
||||||
|
decoration: const InputDecoration(labelText: 'Owner'),
|
||||||
|
validator: (value) => value == null || value.trim().isEmpty
|
||||||
|
? 'Owner is required'
|
||||||
|
: null,
|
||||||
|
onSaved: (value) => owner = value?.trim() ?? '',
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
InputDecorator(
|
||||||
|
decoration: const InputDecoration(labelText: 'Device Type'),
|
||||||
|
child: DropdownButton<DeviceType>(
|
||||||
|
value: deviceType,
|
||||||
|
isExpanded: true,
|
||||||
|
underline: const SizedBox(),
|
||||||
|
items: DeviceType.values
|
||||||
|
.map(
|
||||||
|
(t) =>
|
||||||
|
DropdownMenuItem(value: t, child: Text(t.label)),
|
||||||
|
)
|
||||||
|
.toList(),
|
||||||
|
onChanged: (value) =>
|
||||||
|
setDialogState(() => deviceType = value ?? deviceType),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.of(context).pop(false),
|
||||||
|
child: const Text('Cancel'),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () {
|
||||||
|
if (formKey.currentState?.validate() ?? false) {
|
||||||
|
formKey.currentState?.save();
|
||||||
|
Navigator.of(context).pop(true);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: const Text('Save'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (saved != true || !context.mounted) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await BackendAPI.instance.registerDevice(
|
||||||
|
device.macAddress,
|
||||||
|
owner,
|
||||||
|
deviceType.name,
|
||||||
|
);
|
||||||
|
if (!context.mounted) return;
|
||||||
|
UISnackbars.showSuccess(context, 'Device registered');
|
||||||
|
onRefresh();
|
||||||
|
} catch (e) {
|
||||||
|
if (!context.mounted) return;
|
||||||
|
UISnackbars.showError(context, 'Failed to register device: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
import '../model/device.dart';
|
import '../model/device.dart';
|
||||||
import '../model/device_type.dart';
|
|
||||||
import '../utils/friendly_date_formatter.dart';
|
import '../utils/friendly_date_formatter.dart';
|
||||||
import '../utils/oott_api.dart';
|
import '../utils/oott_api.dart';
|
||||||
import '../utils/ui_snackbars.dart';
|
|
||||||
import '../widgets/status_badge.dart';
|
import '../widgets/status_badge.dart';
|
||||||
|
import 'device_actions.dart';
|
||||||
|
|
||||||
class DeviceDetail extends StatefulWidget {
|
class DeviceDetail extends StatefulWidget {
|
||||||
final String macAddress;
|
final String macAddress;
|
||||||
@@ -49,121 +48,6 @@ class _DeviceDetailState extends State<DeviceDetail> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _confirmForget(Device device) async {
|
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
|
||||||
|
|
||||||
final confirmed = await showDialog<bool>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => AlertDialog(
|
|
||||||
title: const Text('Forget Device'),
|
|
||||||
content: Text(
|
|
||||||
'This device will be unregistered and will no longer be linked to '
|
|
||||||
'${device.owner}. Are you sure?',
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(false),
|
|
||||||
child: const Text('Cancel'),
|
|
||||||
),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(true),
|
|
||||||
child: Text('Forget', style: TextStyle(color: colorScheme.error)),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (confirmed != true || !mounted) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await BackendAPI.instance.forgetDevice(device.macAddress);
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showSuccess(context, 'Device forgotten');
|
|
||||||
_loadDevice();
|
|
||||||
} catch (e) {
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showError(context, 'Failed to forget device: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _showRegisterDialog(Device device) async {
|
|
||||||
final formKey = GlobalKey<FormState>();
|
|
||||||
String owner = '';
|
|
||||||
DeviceType deviceType = device.deviceType;
|
|
||||||
|
|
||||||
final saved = await showDialog<bool>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => StatefulBuilder(
|
|
||||||
builder: (context, setDialogState) => AlertDialog(
|
|
||||||
title: const Text('Register Device'),
|
|
||||||
content: Form(
|
|
||||||
key: formKey,
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
TextFormField(
|
|
||||||
decoration: const InputDecoration(labelText: 'Owner'),
|
|
||||||
validator: (value) => value == null || value.trim().isEmpty
|
|
||||||
? 'Owner is required'
|
|
||||||
: null,
|
|
||||||
onSaved: (value) => owner = value?.trim() ?? '',
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
InputDecorator(
|
|
||||||
decoration: const InputDecoration(labelText: 'Device Type'),
|
|
||||||
child: DropdownButton<DeviceType>(
|
|
||||||
value: deviceType,
|
|
||||||
isExpanded: true,
|
|
||||||
underline: const SizedBox(),
|
|
||||||
items: DeviceType.values
|
|
||||||
.map(
|
|
||||||
(t) =>
|
|
||||||
DropdownMenuItem(value: t, child: Text(t.label)),
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
onChanged: (value) =>
|
|
||||||
setDialogState(() => deviceType = value ?? deviceType),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(false),
|
|
||||||
child: const Text('Cancel'),
|
|
||||||
),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
if (formKey.currentState?.validate() ?? false) {
|
|
||||||
formKey.currentState?.save();
|
|
||||||
Navigator.of(context).pop(true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
child: const Text('Save'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (saved != true || !mounted) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await BackendAPI.instance.registerDevice(
|
|
||||||
device.macAddress,
|
|
||||||
owner,
|
|
||||||
deviceType.name,
|
|
||||||
);
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showSuccess(context, 'Device registered');
|
|
||||||
_loadDevice();
|
|
||||||
} catch (e) {
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showError(context, 'Failed to register device: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final device = _device;
|
final device = _device;
|
||||||
@@ -178,9 +62,9 @@ class _DeviceDetailState extends State<DeviceDetail> {
|
|||||||
icon: const Icon(Icons.more_vert),
|
icon: const Icon(Icons.more_vert),
|
||||||
onSelected: (value) async {
|
onSelected: (value) async {
|
||||||
if (value == 'forget') {
|
if (value == 'forget') {
|
||||||
await _confirmForget(device);
|
await confirmForgetDevice(context, device, _loadDevice);
|
||||||
} else if (value == 'register') {
|
} else if (value == 'register') {
|
||||||
await _showRegisterDialog(device);
|
await showRegisterDeviceDialog(context, device, _loadDevice);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
itemBuilder: (context) => [
|
itemBuilder: (context) => [
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import '../model/device.dart';
|
|||||||
import '../model/device_type.dart';
|
import '../model/device_type.dart';
|
||||||
import '../utils/friendly_date_formatter.dart';
|
import '../utils/friendly_date_formatter.dart';
|
||||||
import '../utils/oott_api.dart';
|
import '../utils/oott_api.dart';
|
||||||
import '../utils/ui_snackbars.dart';
|
|
||||||
import '../widgets/status_badge.dart';
|
import '../widgets/status_badge.dart';
|
||||||
|
import 'device_actions.dart';
|
||||||
|
|
||||||
enum _DeviceFilter { newDevices, registered, all }
|
enum _DeviceFilter { newDevices, registered, all }
|
||||||
|
|
||||||
@@ -61,121 +61,6 @@ class _DeviceListState extends State<DeviceList> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _confirmForget(Device device) async {
|
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
|
||||||
|
|
||||||
final confirmed = await showDialog<bool>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => AlertDialog(
|
|
||||||
title: const Text('Forget Device'),
|
|
||||||
content: Text(
|
|
||||||
'This device will be unregistered and will no longer be linked to '
|
|
||||||
'${device.owner}. Are you sure?',
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(false),
|
|
||||||
child: const Text('Cancel'),
|
|
||||||
),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(true),
|
|
||||||
child: Text('Forget', style: TextStyle(color: colorScheme.error)),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (confirmed != true || !mounted) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await BackendAPI.instance.forgetDevice(device.macAddress);
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showSuccess(context, 'Device forgotten');
|
|
||||||
_loadDevices();
|
|
||||||
} catch (e) {
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showError(context, 'Failed to forget device: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _showRegisterDialog(Device device) async {
|
|
||||||
final formKey = GlobalKey<FormState>();
|
|
||||||
String owner = '';
|
|
||||||
DeviceType deviceType = device.deviceType;
|
|
||||||
|
|
||||||
final saved = await showDialog<bool>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => StatefulBuilder(
|
|
||||||
builder: (context, setDialogState) => AlertDialog(
|
|
||||||
title: const Text('Register Device'),
|
|
||||||
content: Form(
|
|
||||||
key: formKey,
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
TextFormField(
|
|
||||||
decoration: const InputDecoration(labelText: 'Owner'),
|
|
||||||
validator: (value) => value == null || value.trim().isEmpty
|
|
||||||
? 'Owner is required'
|
|
||||||
: null,
|
|
||||||
onSaved: (value) => owner = value?.trim() ?? '',
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
InputDecorator(
|
|
||||||
decoration: const InputDecoration(labelText: 'Device Type'),
|
|
||||||
child: DropdownButton<DeviceType>(
|
|
||||||
value: deviceType,
|
|
||||||
isExpanded: true,
|
|
||||||
underline: const SizedBox(),
|
|
||||||
items: DeviceType.values
|
|
||||||
.map(
|
|
||||||
(t) =>
|
|
||||||
DropdownMenuItem(value: t, child: Text(t.label)),
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
onChanged: (value) =>
|
|
||||||
setDialogState(() => deviceType = value ?? deviceType),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () => Navigator.of(context).pop(false),
|
|
||||||
child: const Text('Cancel'),
|
|
||||||
),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
if (formKey.currentState?.validate() ?? false) {
|
|
||||||
formKey.currentState?.save();
|
|
||||||
Navigator.of(context).pop(true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
child: const Text('Save'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (saved != true || !mounted) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await BackendAPI.instance.registerDevice(
|
|
||||||
device.macAddress,
|
|
||||||
owner,
|
|
||||||
deviceType.name,
|
|
||||||
);
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showSuccess(context, 'Device registered');
|
|
||||||
_loadDevices();
|
|
||||||
} catch (e) {
|
|
||||||
if (!mounted) return;
|
|
||||||
UISnackbars.showError(context, 'Failed to register device: $e');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String _emptyMessage() {
|
String _emptyMessage() {
|
||||||
switch (_filter) {
|
switch (_filter) {
|
||||||
case _DeviceFilter.newDevices:
|
case _DeviceFilter.newDevices:
|
||||||
@@ -285,9 +170,9 @@ class _DeviceListState extends State<DeviceList> {
|
|||||||
'/devices/${device.macAddress}',
|
'/devices/${device.macAddress}',
|
||||||
);
|
);
|
||||||
} else if (value == 'forget') {
|
} else if (value == 'forget') {
|
||||||
await _confirmForget(device);
|
await confirmForgetDevice(context, device, _loadDevices);
|
||||||
} else if (value == 'register') {
|
} else if (value == 'register') {
|
||||||
await _showRegisterDialog(device);
|
await showRegisterDeviceDialog(context, device, _loadDevices);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
itemBuilder: (context) => [
|
itemBuilder: (context) => [
|
||||||
|
|||||||
Reference in New Issue
Block a user