Getting rid of Flutter Logs and base logging on Isar #302 #269

TrackMyIndoorWorkout · Mar 6, 2023 · ab3cd14 · ab3cd14
1 parent 195fc09
commit ab3cd14
Show file tree

Hide file tree

Showing 26 changed files with 1,218 additions and 366 deletions.
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -30,8 +30,6 @@
 -keepclassmembernames class com.mr.flutter.plugin.filepicker.** { *; }
 -keep class com.boskokg.flutter_blue_plus.** { *; }
 -keepclassmembernames class com.boskokg.flutter_blue_plus.* { *; }
--keep class com.flutter.logs.plogs.flutter_logs.** { *; }
--keepclassmembernames class com.flutter.logs.plogs.flutter_logs.* { *; }
 -keep class net.wolverinebeach.flutter_timezone.** { *; }
 -keepclassmembernames class net.wolverinebeach.flutter_timezone.* { *; }
 -keep class io.flutter.plugins.flutter_plugin_android_lifecycle.** { *; }

diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -35,11 +35,6 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch(Exception e) {
       Log.e(TAG, "Error registering plugin flutter_blue_plus, com.boskokg.flutter_blue_plus.FlutterBluePlusPlugin", e);
     }
-    try {
-      flutterEngine.getPlugins().add(new com.flutter.logs.plogs.flutter_logs.FlutterLogsPlugin());
-    } catch(Exception e) {
-      Log.e(TAG, "Error registering plugin flutter_logs, com.flutter.logs.plogs.flutter_logs.FlutterLogsPlugin", e);
-    }
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin());
     } catch(Exception e) {

diff --git a/lib/devices/device_descriptors/concept2_rower.dart b/lib/devices/device_descriptors/concept2_rower.dart
@@ -107,7 +107,7 @@ class Concept2Rower extends FixedLayoutDeviceDescriptor {
   Future<void> executeControlOperation(
       BluetoothCharacteristic? controlPoint, bool blockSignalStartStop, int logLevel, int opCode,
       {int? controlInfo}) async {
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "Concept2",

diff --git a/lib/devices/device_descriptors/cycling_sensor_descriptor.dart b/lib/devices/device_descriptors/cycling_sensor_descriptor.dart
@@ -109,7 +109,7 @@ abstract class CyclingSensorDescriptor extends DeviceDescriptor {
   Future<void> executeControlOperation(
       BluetoothCharacteristic? controlPoint, bool blockSignalStartStop, int logLevel, int opCode,
       {int? controlInfo}) async {
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       tag,

diff --git a/lib/devices/device_descriptors/fitness_machine_descriptor.dart b/lib/devices/device_descriptors/fitness_machine_descriptor.dart
@@ -196,7 +196,7 @@ abstract class FitnessMachineDescriptor extends DeviceDescriptor {
       await controlPoint.write(requestInfo);
       // Response could be picked up in the subscription listener
     } on PlatformException catch (e, stack) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelError,
         "FTMS",

diff --git a/lib/devices/device_descriptors/precor_spinner_chrono_power.dart b/lib/devices/device_descriptors/precor_spinner_chrono_power.dart
@@ -62,7 +62,7 @@ class PrecorSpinnerChronoPower extends FixedLayoutDeviceDescriptor {
   Future<void> executeControlOperation(
       BluetoothCharacteristic? controlPoint, bool blockSignalStartStop, int logLevel, int opCode,
       {int? controlInfo}) async {
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "PSCP",

diff --git a/lib/devices/device_descriptors/schwinn_ac_performance_plus.dart b/lib/devices/device_descriptors/schwinn_ac_performance_plus.dart
@@ -44,7 +44,7 @@ class SchwinnACPerformancePlus extends DeviceDescriptor {
   void processFlag(int flag) {
     final prefService = Get.find<BasePrefService>();
     final logLevel = prefService.get<int>(logLevelTag) ?? logLevelDefault;
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "Schwinn AC Perf+",
@@ -58,7 +58,7 @@ class SchwinnACPerformancePlus extends DeviceDescriptor {
   RecordWithSport? stubRecord(List<int> data) {
     final prefService = Get.find<BasePrefService>();
     final logLevel = prefService.get<int>(logLevelTag) ?? logLevelDefault;
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "Schwinn AC Perf+",
@@ -73,7 +73,7 @@ class SchwinnACPerformancePlus extends DeviceDescriptor {
   void stopWorkout() {
     final prefService = Get.find<BasePrefService>();
     final logLevel = prefService.get<int>(logLevelTag) ?? logLevelDefault;
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "Schwinn AC Perf+",
@@ -87,7 +87,7 @@ class SchwinnACPerformancePlus extends DeviceDescriptor {
   Future<void> executeControlOperation(
       BluetoothCharacteristic? controlPoint, bool blockSignalStartStop, int logLevel, int opCode,
       {int? controlInfo}) async {
-    Logging.log(
+    Logging().log(
       logLevel,
       logLevelError,
       "Schwinn AC Perf+",

diff --git a/lib/devices/device_descriptors/schwinn_x70.dart b/lib/devices/device_descriptors/schwinn_x70.dart
@@ -187,7 +187,7 @@ class SchwinnX70 extends FixedLayoutDeviceDescriptor with CadenceMixin, PowerSpe
       try {
         await controlPoint.write(startHrStreamCommand);
       } on PlatformException catch (e, stack) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelError,
           "Sch x70",

diff --git a/lib/devices/gadgets/cadence_mixin.dart b/lib/devices/gadgets/cadence_mixin.dart
@@ -108,7 +108,7 @@ class CadenceMixin {
 
     final revDiff = _getRevDiff(lastData.revolutions, firstData.revolutions);
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "CadenceMixin",

diff --git a/lib/devices/gadgets/device_base.dart b/lib/devices/gadgets/device_base.dart
@@ -163,7 +163,7 @@ abstract class DeviceBase {
       )
           .listen((controlResponse) async {
         if (logLevel >= logLevelInfo) {
-          Logging.log(
+          Logging().log(
             logLevel,
             logLevelInfo,
             "FITNESS_EQUIPMENT",
@@ -189,7 +189,7 @@ abstract class DeviceBase {
               break;
           }
           if (logLevel >= logLevelInfo) {
-            Logging.log(
+            Logging().log(
               logLevel,
               logLevelInfo,
               "FITNESS_EQUIPMENT",
@@ -322,7 +322,7 @@ abstract class DeviceBase {
 
   void logData(List<int> data, String tag) {
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         tag,

diff --git a/lib/devices/gadgets/fitness_equipment.dart b/lib/devices/gadgets/fitness_equipment.dart
@@ -179,7 +179,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
     if (values.isEmpty) {
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -197,7 +197,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
               (prev, element) => prev.merge(element),
             );
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -213,7 +213,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
   void _throttlingTimerCallback() {
     _throttleTimer = null;
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -282,7 +282,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
   ///   in processRecord
   Stream<RecordWithSport> get _listenToData async* {
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -294,7 +294,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
     await for (final byteList in characteristic!.value) {
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -306,7 +306,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
       final key = keySelector(byteList);
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -318,7 +318,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
       if (key >= 0 && descriptor!.isFlagValid(key)) {
         if (!dataHandlers.containsKey(key)) {
           if (logLevel >= logLevelInfo) {
-            Logging.log(
+            Logging().log(
               logLevel,
               logLevelInfo,
               "FITNESS_EQUIPMENT",
@@ -338,7 +338,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
       bool timerActive = _throttleTimer?.isActive ?? false;
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -481,7 +481,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
       continuationRecord = lastRecord ?? RecordWithSport.getZero(sport);
       continuation = continuationRecord.hasCumulative();
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -607,7 +607,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
           descriptor?.fourCC == kayakProGenesisPortFourCC;
 
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -666,7 +666,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
   bool _checkManufacturerName() {
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -704,7 +704,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
       return manufacturerName;
     } on PlatformException catch (e, stack) {
       if (logLevel > logLevelNone) {
-        Logging.logException(
+        Logging().logException(
           logLevel,
           "FITNESS_EQUIPMENT",
           "discover",
@@ -780,7 +780,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
   RecordWithSport processRecord(RecordWithSport stub, [bool idle = false]) {
     final now = DateTime.now();
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -791,7 +791,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
 
     if (_companionSensor != null && _companionSensor!.attached) {
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -806,7 +806,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     for (final sensor in _additionalSensors) {
       if (sensor.attached) {
         if (logLevel >= logLevelInfo) {
-          Logging.log(
+          Logging().log(
             logLevel,
             logLevelInfo,
             "FITNESS_EQUIPMENT",
@@ -823,7 +823,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     // (intelligent start and elapsed time tracking)
     bool isNotMoving = stub.isNotMoving();
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -887,7 +887,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     if (descriptor != null) {
       stub.adjustByFactors(_powerFactor, _calorieFactor, _extendTuning);
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -898,7 +898,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     }
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -1000,7 +1000,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
       }
 
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -1139,7 +1139,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
       }
 
       if (logLevel >= logLevelInfo) {
-        Logging.log(
+        Logging().log(
           logLevel,
           logLevelInfo,
           "FITNESS_EQUIPMENT",
@@ -1156,7 +1156,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     stub.sport = descriptor?.sport ?? ActivityType.ride;
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -1176,7 +1176,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     }
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -1186,7 +1186,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     }
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -1225,7 +1225,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     initPower2SpeedConstants();
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",
@@ -1271,7 +1271,7 @@ class FitnessEquipment extends DeviceBase with PowerSpeedMixin {
     _enableAsserts = prefService.get<bool>(enableAssertsTag) ?? enableAssertsDefault;
 
     if (logLevel >= logLevelInfo) {
-      Logging.log(
+      Logging().log(
         logLevel,
         logLevelInfo,
         "FITNESS_EQUIPMENT",

diff --git a/lib/main.dart b/lib/main.dart
@@ -40,7 +40,7 @@ void main() async {
 
   PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
     Get.put<PackageInfo>(packageInfo, permanent: true);
-    Logging.logVersion(packageInfo);
+    Logging().logVersion(packageInfo);
   });
 
   rootBundle

diff --git a/lib/persistence/isar/log_entry.dart b/lib/persistence/isar/log_entry.dart
@@ -0,0 +1,23 @@
+import 'package:isar/isar.dart';
+
+part 'log_entry.g.dart';
+
+@Collection(inheritance: false)
+class LogEntry {
+  Id id;
+  late final DateTime timeStamp;
+  final String level;
+  final String tag;
+  final String subTag;
+  final String message;
+
+  LogEntry({
+    this.id = Isar.autoIncrement,
+    required this.level,
+    required this.tag,
+    required this.subTag,
+    required this.message,
+  }) {
+    timeStamp = DateTime.now();
+  }
+}