7 files changed, 43 insertions, 16 deletions
diff --git a/lib/control/universal_ble_scanner_controller.dart b/lib/control/universal_ble_scanner_controller.dart
index 7785088..07608fa 100644
--- a/lib/control/universal_ble_scanner_controller.dart
+++ b/lib/control/universal_ble_scanner_controller.dart
@@ -19,6 +19,7 @@ import 'package:logger/logger.dart';
 import 'package:universal_ble/universal_ble.dart';
 import 'package:uvok_epaper_badge/control/scanner_controller.dart';
 import 'package:uvok_epaper_badge/control/scanner_controller_impl.dart';
+import 'package:uvok_epaper_badge/extensions/list_ext.dart';
 import 'package:uvok_epaper_badge/model/device/universal_ble_device.dart';
 
 Logger logger = Logger();
@@ -91,15 +92,3 @@ class UniversalBleScannerController extends ScannerControllerImpl {
     _subAvail?.cancel().ignore();
   }
 }
-
-extension ListAddExt<T> on List<T> {
-  /// An element if the predicate is true only for all elements.
-  /// predicate is passed all existing elements.
-  bool addIf(T dev, bool Function(T exDev) predicate) {
-    if (every(predicate)) {
-      add(dev);
-      return true;
-    }
-    return false;
-  }
-}
diff --git a/lib/first_where_ext.dart b/lib/extensions/iterable_ext.dart
index cb421e3..2d0d6e2 100644
--- a/lib/first_where_ext.dart
+++ b/lib/extensions/iterable_ext.dart
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-extension FirstWhereExt<T> on Iterable<T> {
+extension IterableExt<T> on Iterable<T> {
   /// The first element satisfying [test], or `null` if there are none.
   // firstWhereOrElse doesn't want to return null.
   T? firstWhereOrNull(bool Function(T element) test) {
diff --git a/lib/extensions/list_ext.dart b/lib/extensions/list_ext.dart
new file mode 100644
index 0000000..8ef2713
--- /dev/null
+++ b/lib/extensions/list_ext.dart
@@ -0,0 +1,39 @@
+// Copyright (C) 2025, uvok cheetah
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+extension ListExt<T> on List<T> {
+  /// If predicate is true for any element on the list, replace first element on that position.
+  /// Otherwise, add element.
+  void addOrReplaceWhere(T dev, bool Function(T exDev) predicate) {
+    int idx = indexWhere(predicate);
+
+    if (idx == -1) {
+      add(dev);
+    } else {
+      removeAt(idx);
+      insert(idx, dev);
+    }
+  }
+
+  /// An element if the predicate is true only for all elements.
+  /// predicate is passed all existing elements.
+  bool addIf(T dev, bool Function(T exDev) predicate) {
+    if (every(predicate)) {
+      add(dev);
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/lib/string_ext.dart b/lib/extensions/string_ext.dart
index 6119c5b..6119c5b 100644
--- a/lib/string_ext.dart
+++ b/lib/extensions/string_ext.dart
diff --git a/lib/model/connection/flutter_blue_plus_device_connection.dart b/lib/model/connection/flutter_blue_plus_device_connection.dart
index abfc061..5cb9eb2 100644
--- a/lib/model/connection/flutter_blue_plus_device_connection.dart
+++ b/lib/model/connection/flutter_blue_plus_device_connection.dart
@@ -18,7 +18,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:logger/logger.dart';
-import 'package:uvok_epaper_badge/first_where_ext.dart';
+import 'package:uvok_epaper_badge/extensions/iterable_ext.dart';
 import 'package:uvok_epaper_badge/model/connection/device_connection.dart';
 import 'package:uvok_epaper_badge/model/device/flutter_blue_plus_device.dart';
 
diff --git a/lib/model/motive_selection/badge_parser.dart b/lib/model/motive_selection/badge_parser.dart
index e1a7b5c..c4b4d58 100644
--- a/lib/model/motive_selection/badge_parser.dart
+++ b/lib/model/motive_selection/badge_parser.dart
@@ -16,7 +16,7 @@
 import 'dart:convert';
 
 import 'package:uvok_epaper_badge/model/badge_motive.dart';
-import 'package:uvok_epaper_badge/string_ext.dart';
+import 'package:uvok_epaper_badge/extensions/string_ext.dart';
 
 mixin BadgeParser {
   List<BadgeMotive> parseBadgeMotives(List<int> val) {
diff --git a/lib/model/motive_selection/universal_blue_motive_selection.dart b/lib/model/motive_selection/universal_blue_motive_selection.dart
index 43edd79..084541a 100644
--- a/lib/model/motive_selection/universal_blue_motive_selection.dart
+++ b/lib/model/motive_selection/universal_blue_motive_selection.dart
@@ -17,7 +17,6 @@ import 'dart:convert';
 
 import 'package:universal_ble/universal_ble.dart';
 import 'package:uvok_epaper_badge/model/motive_selection/badge_parser.dart';
-import 'package:uvok_epaper_badge/string_ext.dart';
 import 'package:uvok_epaper_badge/badge_exception.dart';
 import 'package:uvok_epaper_badge/model/badge_motive.dart';
 import 'package:uvok_epaper_badge/model/device/universal_ble_device.dart';