Update

lib/gateways/v6/api_gateway_v6.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
-import 'package:pi_hole_client/functions/conversions.dart';
 import 'package:pi_hole_client/functions/logger.dart';
 import 'package:pi_hole_client/gateways/api_gateway_interface.dart';
 import 'package:pi_hole_client/models/api/v6/auth/auth.dart' show Session;

lib/providers/domains_list_provider.dart

@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:pi_hole_client/constants/enums.dart';
 import 'package:pi_hole_client/models/domain.dart';
@@ -141,4 +142,55 @@ class DomainsListProvider with ChangeNotifier {
     }
     notifyListeners();
   }
+
+  Domain? getDomainById(int id) {
+    final whitelistDomain = _whitelistDomains.firstWhereOrNull(
+      (item) => item.id == id,
+    );
+
+    if (whitelistDomain != null) {
+      return whitelistDomain;
+    }
+
+    final blacklistDomain = _blacklistDomains.firstWhereOrNull(
+      (item) => item.id == id,
+    );
+
+    return blacklistDomain;
+  }
+
+  /// Update domain
+  void updateDomain(Domain domain) {
+    // TODO: Handle changes when white and black lists are updated
+    // whitelist
+    if (domain.type == 0 || domain.type == 2) {
+      final index =
+          _whitelistDomains.indexWhere((item) => item.id == domain.id);
+      if (index != -1) {
+        _whitelistDomains[index] = domain;
+      }
+
+      final filteredIndex =
+          _filteredWhitelistDomains.indexWhere((item) => item.id == domain.id);
+      if (filteredIndex != -1) {
+        _filteredWhitelistDomains[filteredIndex] = domain;
+      }
+    }
+
+    // blacklist
+    if (domain.type == 1 || domain.type == 3) {
+      final index =
+          _blacklistDomains.indexWhere((item) => item.id == domain.id);
+      if (index != -1) {
+        _blacklistDomains[index] = domain;
+      }
+
+      final filteredIndex =
+          _filteredBlacklistDomains.indexWhere((item) => item.id == domain.id);
+      if (filteredIndex != -1) {
+        _filteredBlacklistDomains[filteredIndex] = domain;
+      }
+    }
+    notifyListeners();
+  }
 }

lib/screens/domains/domain_comment_modal.dart

@@ -1,42 +1,36 @@
 import 'package:flutter/material.dart';
 import 'package:pi_hole_client/l10n/generated/app_localizations.dart';
 import 'package:pi_hole_client/models/domain.dart';
-import 'package:pi_hole_client/providers/servers_provider.dart';
-import 'package:provider/provider.dart';
 
 class DomainCommentModal extends StatefulWidget {
-  const DomainCommentModal({required this.domain, super.key});
+  const DomainCommentModal({
+    required this.domain,
+    required this.readonly,
+    super.key,
+  });
 
   final Domain domain;
+  final bool readonly;
 
   @override
   State<DomainCommentModal> createState() => _DomainCommentModalState();
 }
 
 class _DomainCommentModalState extends State<DomainCommentModal> {
   late TextEditingController _commentController;
+  late bool readonly = widget.readonly;
+
   bool isSaveEnabled = false;
-  bool isEditable = false;
 
   @override
   void initState() {
     super.initState();
-
-    final serversProvider =
-        Provider.of<ServersProvider>(context, listen: false);
-    final apiGateway = serversProvider.selectedApiGateway;
-
-    isEditable = apiGateway?.server.apiVersion != 'v5';
-
     _commentController = TextEditingController(text: widget.domain.comment);
-
-    if (isEditable) {
-      _commentController.addListener(() {
-        setState(() {
-          isSaveEnabled = _commentController.text.isNotEmpty;
-        });
+    _commentController.addListener(() {
+      setState(() {
+        isSaveEnabled = _commentController.text.isNotEmpty;
       });
-    }
+    });
   }
 
   @override
@@ -47,9 +41,6 @@ class _DomainCommentModalState extends State<DomainCommentModal> {
 
   @override
   Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
-    final apiGateway = serversProvider.selectedApiGateway;
-
     return AlertDialog(
       scrollable: true,
       title: Column(
@@ -68,37 +59,34 @@ class _DomainCommentModalState extends State<DomainCommentModal> {
           ),
         ],
       ),
-      content: isEditable
+      content: readonly
+          // v5: read only, because the API does not support updating comments
+          ? Text(
+              widget.domain.comment == ''
+                  ? AppLocalizations.of(context)!.noComment
+                  : widget.domain.comment!,
+              style: TextStyle(fontSize: 16, color: Colors.grey[700]),
+            )
           // v6: editable
-          ? TextField(
+          : TextField(
               controller: _commentController,
               onChanged: (value) {
                 setState(() {});
               },
               decoration: InputDecoration(
                 hintText: AppLocalizations.of(context)!.enterComment,
               ),
-            )
-          // v5: read only, because the API does not support updating comments
-          : Text(
-              widget.domain.comment == ''
-                  ? AppLocalizations.of(context)!.noComment
-                  : widget.domain.comment!,
-              style: TextStyle(fontSize: 16, color: Colors.grey[700]),
             ),
       actions: [
         TextButton(
           onPressed: () => Navigator.maybePop(context, widget.domain.comment),
           child: Text(AppLocalizations.of(context)!.cancel),
         ),
         const SizedBox(width: 14),
-        if (isEditable)
+        if (!readonly)
           TextButton(
             onPressed: isSaveEnabled
                 ? () async {
-                    final newDomain = widget.domain
-                        .copyWith(comment: _commentController.text);
-                    await apiGateway?.updateDomain(newDomain);
                     await Navigator.maybePop(context, _commentController.text);
                   }
                 : null,

lib/screens/domains/domain_details_screen.dart

@@ -5,35 +5,26 @@ import 'package:pi_hole_client/functions/conversions.dart';
 import 'package:pi_hole_client/functions/format.dart';
 import 'package:pi_hole_client/l10n/generated/app_localizations.dart';
 import 'package:pi_hole_client/models/domain.dart';
+import 'package:pi_hole_client/models/gateways.dart';
+import 'package:pi_hole_client/providers/domains_list_provider.dart';
+import 'package:pi_hole_client/providers/servers_provider.dart';
 import 'package:pi_hole_client/screens/domains/delete_domain_modal.dart';
 import 'package:pi_hole_client/screens/domains/domain_comment_modal.dart';
 import 'package:pi_hole_client/widgets/custom_list_tile.dart';
+import 'package:provider/provider.dart';
 
-class DomainDetailsScreen extends StatefulWidget {
+class DomainDetailsScreen extends StatelessWidget {
   const DomainDetailsScreen({
     required this.domain,
     required this.remove,
     super.key,
     this.colors,
   });
 
-  final Domain domain;
+  final Domain domain; // useonly id
   final void Function(Domain) remove;
   final AppColors? colors;
 
-  @override
-  State<DomainDetailsScreen> createState() => _DomainDetailsScreenState();
-}
-
-class _DomainDetailsScreenState extends State<DomainDetailsScreen> {
-  late Domain domain; // 更新可能な domain を保持
-
-  @override
-  void initState() {
-    super.initState();
-    domain = widget.domain; // 初期値をセット
-  }
-
   Widget actionCustomListTile({
     required IconData leadingIcon,
     required String label,
@@ -59,6 +50,40 @@ class _DomainDetailsScreenState extends State<DomainDetailsScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final domainProvider = Provider.of<DomainsListProvider>(context);
+    final serverProvider = Provider.of<ServersProvider>(context, listen: false);
+    final apiGateway = serverProvider.selectedApiGateway;
+    var newDomain = domainProvider.getDomainById(domain.id);
+
+    if (newDomain == null) {
+      return Scaffold(
+        appBar: AppBar(
+          title: Text(AppLocalizations.of(context)!.domainDetails),
+        ),
+        body: Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Icon(
+                Icons.error,
+                size: 50,
+                color: Colors.red,
+              ),
+              const SizedBox(height: 50),
+              Text(
+                AppLocalizations.of(context)!.domainNotExists,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  fontSize: 22,
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.domainDetails),
@@ -69,7 +94,7 @@ class _DomainDetailsScreenState extends State<DomainDetailsScreen> {
               builder: (context) => DeleteDomainModal(
                 onConfirm: () {
                   Navigator.maybePop(context);
-                  widget.remove(domain);
+                  remove(domain);
                 },
               ),
             ),
@@ -84,52 +109,59 @@ class _DomainDetailsScreenState extends State<DomainDetailsScreen> {
             CustomListTile(
               leadingIcon: Icons.domain,
               label: AppLocalizations.of(context)!.domain,
-              description: domain.domain,
+              description: newDomain.domain,
             ),
             CustomListTile(
               leadingIcon: Icons.category_rounded,
               label: AppLocalizations.of(context)!.type,
-              description: getDomainType(domain.type),
-              color: widget.colors != null
-                  ? convertColorFromNumber(widget.colors!, domain.type)
+              description: getDomainType(newDomain.type),
+              color: colors != null
+                  ? convertColorFromNumber(colors!, newDomain.type)
                   : null,
             ),
             CustomListTile(
               leadingIcon: Icons.schedule_rounded,
               label: AppLocalizations.of(context)!.dateAdded,
-              description: formatTimestamp(domain.dateAdded, 'yyyy-MM-dd'),
+              description: formatTimestamp(newDomain.dateAdded, 'yyyy-MM-dd'),
             ),
             CustomListTile(
               leadingIcon: Icons.update_rounded,
               label: AppLocalizations.of(context)!.dateModified,
-              description: formatTimestamp(domain.dateModified, 'yyyy-MM-dd'),
+              description:
+                  formatTimestamp(newDomain.dateModified, 'yyyy-MM-dd'),
             ),
             CustomListTile(
               leadingIcon: Icons.check,
               label: AppLocalizations.of(context)!.status,
-              description: domain.enabled == 1
+              description: newDomain.enabled == 1
                   ? AppLocalizations.of(context)!.enabled
                   : AppLocalizations.of(context)!.disabled,
             ),
             // Comment
             actionCustomListTile(
               leadingIcon: Icons.comment_rounded,
               label: AppLocalizations.of(context)!.comment,
-              description: domain.comment == '' || domain.comment == null
+              description: newDomain.comment == '' || newDomain.comment == null
                   ? AppLocalizations.of(context)!.noComment
-                  : domain.comment,
+                  : newDomain.comment,
               onTap: () async {
-                final updatedComment = await showModal<String>(
+                final newComment = await showModal<String>(
                   context: context,
-                  builder: (context) => DomainCommentModal(domain: domain),
+                  builder: (context) => DomainCommentModal(
+                    domain: newDomain!,
+                    readonly:
+                        apiGateway!.server.apiVersion == 'v5' ? true : false,
+                  ),
                 );
 
-                if (updatedComment != null &&
-                    updatedComment != domain.comment) {
-                  setState(() {
-                    domain =
-                        domain.copyWith(comment: updatedComment); // コメントを更新
-                  });
+                if (newComment != null && newComment != newDomain!.comment) {
+                  if (context.mounted) {
+                    newDomain = newDomain!.copyWith(comment: newComment);
+                    final resp = await apiGateway!.updateDomain(newDomain!);
+                    if (resp.result == APiResponseType.success) {
+                      domainProvider.updateDomain(newDomain!);
+                    }
+                  }
                 }
               },
               trailing: Icon(

lib/screens/domains/domains.dart

@@ -231,7 +231,7 @@ class _DomainListsWidgetState extends State<DomainListsWidget>
             flex: 3,
             child: selectedDomain != null
                 ? DomainDetailsScreen(
-                    domain: selectedDomain!,
+                    domain: selectedDomain!.copyWith(),
                     remove: (domain) {
                       setState(() => selectedDomain = null);
                       removeDomain(domain);

lib/screens/domains/domains_list.dart

@@ -208,7 +208,7 @@ class _DomainsListState extends State<DomainsList> {
                       context,
                       MaterialPageRoute(
                         builder: (context) => DomainDetailsScreen(
-                          domain: d,
+                          domain: d.copyWith(),
                           remove: removeDomain,
                           colors: serversProvider.colors,
                         ),