From 2585826a29cef82917b4c40229863e9bdb008bb9 Mon Sep 17 00:00:00 2001
From: Juan Gilsanz Polo <juangilsanz@gmail.com>
Date: Sat, 3 Feb 2024 01:58:45 +0100
Subject: [PATCH] Show client name on logs

---
 lib/screens/logs/filters/clients_modal.dart | 53 ++++++++-------------
 lib/services/db/database.dart               |  3 --
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/lib/screens/logs/filters/clients_modal.dart b/lib/screens/logs/filters/clients_modal.dart
index cf8a94f..6500717 100644
--- a/lib/screens/logs/filters/clients_modal.dart
+++ b/lib/screens/logs/filters/clients_modal.dart
@@ -7,6 +7,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:adguard_home_manager/widgets/custom_checkbox_list_tile.dart';
 import 'package:adguard_home_manager/widgets/list_bottom_sheet.dart';
 
+import 'package:adguard_home_manager/providers/status_provider.dart';
 import 'package:adguard_home_manager/providers/clients_provider.dart';
 import 'package:adguard_home_manager/providers/logs_provider.dart';
 
@@ -228,39 +229,25 @@ class _ListItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Material(
-      color: Colors.transparent,
-      child: InkWell(
-        onTap: () => onChanged(!checkboxActive),
-        child: Padding(
-          padding: const EdgeInsets.only(
-            left: 24,
-            top: 4,
-            right: 12,
-            bottom: 4
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Flexible(
-                child: Text(
-                  label,
-                  style: TextStyle(
-                    fontSize: 16,
-                    color: Theme.of(context).colorScheme.onSurface
-                  ),
-                ),
-              ),
-              Checkbox(
-                value: checkboxActive, 
-                onChanged: (v) => onChanged(!checkboxActive),
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(5)
-                ),
-              )
-            ],
-          ),
-        ),
+    final statusProvider = Provider.of<StatusProvider>(context);
+
+    String? name;
+    try {
+      name = statusProvider.serverStatus!.clients.firstWhere((c) => c.ids.contains(label)).name;
+    } catch (e) {
+      // ---- //
+    }
+
+    return CustomCheckboxListTile(
+      value: checkboxActive, 
+      onChanged: (v) => onChanged(v),
+      title: label,
+      subtitle: name,
+      padding: const EdgeInsets.only(
+        left: 24,
+        top: 8,
+        right: 12,
+        bottom: 8
       ),
     );
   }
diff --git a/lib/services/db/database.dart b/lib/services/db/database.dart
index fa82957..fe09d16 100644
--- a/lib/services/db/database.dart
+++ b/lib/services/db/database.dart
@@ -25,9 +25,6 @@ Future<Map<String, dynamic>> loadDb() async {
             )
         """
       );
-    },
-    onUpgrade: (Database db, int oldVersion, int newVersion) async {
-      
     },
     onOpen: (Database db) async {
       await db.transaction((txn) async{