From 374144259a2e9dfa9ce83cfea6b7bd3a9e74d45e Mon Sep 17 00:00:00 2001 From: uvok Date: Sat, 2 Aug 2025 13:18:32 +0200 Subject: Move extension methods --- lib/control/universal_ble_scanner_controller.dart | 13 +------- lib/extensions/iterable_ext.dart | 25 ++++++++++++++ lib/extensions/list_ext.dart | 39 ++++++++++++++++++++++ lib/extensions/string_ext.dart | 24 +++++++++++++ lib/first_where_ext.dart | 25 -------------- .../flutter_blue_plus_device_connection.dart | 2 +- lib/model/motive_selection/badge_parser.dart | 2 +- .../universal_blue_motive_selection.dart | 1 - lib/string_ext.dart | 24 ------------- 9 files changed, 91 insertions(+), 64 deletions(-) create mode 100644 lib/extensions/iterable_ext.dart create mode 100644 lib/extensions/list_ext.dart create mode 100644 lib/extensions/string_ext.dart delete mode 100644 lib/first_where_ext.dart delete mode 100644 lib/string_ext.dart 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 on List { - /// 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/extensions/iterable_ext.dart b/lib/extensions/iterable_ext.dart new file mode 100644 index 0000000..2d0d6e2 --- /dev/null +++ b/lib/extensions/iterable_ext.dart @@ -0,0 +1,25 @@ +// 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 . + +extension IterableExt on Iterable { + /// 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) { + for (final element in this) { + if (test(element)) return element; + } + return null; + } +} 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 . + +extension ListExt on List { + /// 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/extensions/string_ext.dart b/lib/extensions/string_ext.dart new file mode 100644 index 0000000..6119c5b --- /dev/null +++ b/lib/extensions/string_ext.dart @@ -0,0 +1,24 @@ +// 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 . + +extension StringExt on String { + /// split string on first occurrence. + /// if s is not inside string, the original value is returned. + List splitFirst(String s) { + int idx = indexOf(s); + if (idx == -1) return [this]; + return [substring(0, idx).trim(), substring(idx + s.length).trim()]; + } +} diff --git a/lib/first_where_ext.dart b/lib/first_where_ext.dart deleted file mode 100644 index cb421e3..0000000 --- a/lib/first_where_ext.dart +++ /dev/null @@ -1,25 +0,0 @@ -// 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 . - -extension FirstWhereExt on Iterable { - /// 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) { - for (final element in this) { - if (test(element)) return element; - } - return null; - } -} 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 parseBadgeMotives(List 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'; diff --git a/lib/string_ext.dart b/lib/string_ext.dart deleted file mode 100644 index 6119c5b..0000000 --- a/lib/string_ext.dart +++ /dev/null @@ -1,24 +0,0 @@ -// 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 . - -extension StringExt on String { - /// split string on first occurrence. - /// if s is not inside string, the original value is returned. - List splitFirst(String s) { - int idx = indexOf(s); - if (idx == -1) return [this]; - return [substring(0, idx).trim(), substring(idx + s.length).trim()]; - } -} -- cgit v1.2.3