Skip to content

Commit 7529ed1

Browse files
committed
fixed a bug causing Lite MK2 presets to appear as if they are from the current device
1 parent 6239b01 commit 7529ed1

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

lib/UI/widgets/presets/preset_list/presetItem.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ class PresetItem extends StatelessWidget {
109109
bool selected = item["uuid"] == device.deviceControl.presetUUID;
110110
bool newItem = item.containsKey("new");
111111

112-
var dev = NuxDeviceControl.instance().getDeviceFromId(item["product_id"]) ??
112+
var dev = NuxDeviceControl.instance()
113+
.getDeviceFromPresetClass(item["product_id"]) ??
113114
device;
114115
Color color = dev.getPreset(0).channelColorsList[item["channel"]];
115116

lib/UI/widgets/presets/preset_list/presetListMethods.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import '../../../popups/exportQRCode.dart';
1111

1212
class PresetListMethods {
1313
static void exportQR(Map<String, dynamic> preset, BuildContext context) {
14-
var dev = NuxDeviceControl.instance().getDeviceFromId(preset["product_id"]);
14+
var dev = NuxDeviceControl.instance()
15+
.getDeviceFromPresetClass(preset["product_id"]);
1516
var pVersion = preset["version"] ?? 0;
1617
if (dev != null) {
1718
int? originalVersion;

lib/UI/widgets/presets/preset_list/preset_widget.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ class _PresetWidgetState extends State<PresetWidget> {
126126
void _changePresetChannel(Map<String, dynamic> preset) {
127127
List<String> channelList = [];
128128
int nuxChannel = preset["channel"];
129-
var d = NuxDeviceControl.instance().getDeviceFromId(preset["product_id"]);
129+
var d = NuxDeviceControl.instance()
130+
.getDeviceFromPresetClass(preset["product_id"]);
130131

131132
if (d != null) {
132133
for (int i = 0; i < d.channelsCount; i++) {

lib/bluetooth/NuxDeviceControl.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,15 @@ class NuxDeviceControl extends ChangeNotifier {
198198
return null;
199199
}
200200

201+
NuxDevice? getDeviceFromPresetClass(String presetClass) {
202+
for (int i = 0; i < _deviceInstances.length; i++) {
203+
if (_deviceInstances[i].presetClass == presetClass) {
204+
return _deviceInstances[i];
205+
}
206+
}
207+
return null;
208+
}
209+
201210
_clearDeviceStack({NuxDevice? device}) {
202211
bool notify = device == null;
203212
device ??= _device;

0 commit comments

Comments
 (0)