From 8b76354bc1a03677d1e3d4822c7b979ec6b297ed Mon Sep 17 00:00:00 2001 From: Alexandr Date: Tue, 11 Feb 2025 14:35:53 +0300 Subject: [PATCH 1/2] update battery and power use only one param --- lib/domain/data_source/blocs/general_data_cubit.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/domain/data_source/blocs/general_data_cubit.dart b/lib/domain/data_source/blocs/general_data_cubit.dart index 33cb3fd..e9e1504 100644 --- a/lib/domain/data_source/blocs/general_data_cubit.dart +++ b/lib/domain/data_source/blocs/general_data_cubit.dart @@ -98,9 +98,9 @@ final class GeneralDataState with EquatableMixin { final Sequence gear; final Sequence batteryPercent; - IntWithStatus get mergedBatteryPercent => batteryPercent.merged(); + IntWithStatus get mergedBatteryPercent => batteryPercent.first; - IntWithStatus get mergedPower => power.merged(); + IntWithStatus get mergedPower => power.first; IntWithStatus get mergedSpeed => speed.merged( ( From a055920d436e3035e2299117ca13096a443c2bd3 Mon Sep 17 00:00:00 2001 From: Radomir Epur Date: Wed, 12 Feb 2025 18:26:13 +0300 Subject: [PATCH 2/2] chore: added TODOs --- lib/domain/data_source/blocs/general_data_cubit.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/domain/data_source/blocs/general_data_cubit.dart b/lib/domain/data_source/blocs/general_data_cubit.dart index e9e1504..4673222 100644 --- a/lib/domain/data_source/blocs/general_data_cubit.dart +++ b/lib/domain/data_source/blocs/general_data_cubit.dart @@ -98,8 +98,12 @@ final class GeneralDataState with EquatableMixin { final Sequence gear; final Sequence batteryPercent; + // TODO(Radomir): hardcoded temporarily because there is only one battery + // at the moment, and the merged value(mean) is irrelevant IntWithStatus get mergedBatteryPercent => batteryPercent.first; + // TODO(Radomir): hardcoded temporarily because there is only one battery + // at the moment, and the merged value(mean) is irrelevant IntWithStatus get mergedPower => power.first; IntWithStatus get mergedSpeed => speed.merged(