Merge pull request #9 from Frezyx/dev

Implement filter and FlutterTalkerData models

README.md

@@ -37,7 +37,7 @@ Follow these steps to use this package
 ### Add dependency
 ```yaml
 dependencies:
-  talker: ^0.5.0
+  talker: ^0.6.0
 ```
 
 ### Easy to use
@@ -86,8 +86,8 @@ Often you need to check what happening in the application when there is no conso
 ### Add dependency
 ```yaml
 dependencies:
-  talker: ^0.5.0
-  talker_flutter: ^0.4.0
+  talker: ^0.6.0
+  talker_flutter: ^0.5.0
 ```
 
 ### Easy to use

talker/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.0
+- Implement filter for logs
+
+## 0.5.2
+- Add title for default models
+
 ## 0.5.1
 - Fix README images urls
 

talker/README.md

@@ -37,7 +37,7 @@ Follow these steps to use this package
 ### Add dependency
 ```yaml
 dependencies:
-  talker: ^0.5.0
+  talker: ^0.6.0
 ```
 
 ### Easy to use
@@ -86,8 +86,8 @@ Often you need to check what happening in the application when there is no conso
 ### Add dependency
 ```yaml
 dependencies:
-  talker: ^0.5.0
-  talker_flutter: ^0.4.0
+  talker: ^0.6.0
+  talker_flutter: ^0.5.0
 ```
 
 ### Easy to use

talker/lib/src/models/filter/filter.dart

@@ -0,0 +1 @@
+export 'talker_filter.dart';

talker/lib/src/models/filter/talker_filter.dart

@@ -0,0 +1,67 @@
+import 'package:talker/src/src.dart';
+
+abstract class Filter<T> {
+  bool filter(T item);
+}
+
+class TalkerFilter implements Filter<TalkerDataInterface> {
+  TalkerFilter({
+    required this.titles,
+    required this.types,
+    this.searchQuery,
+  });
+
+  final List<String> titles;
+  final List<Type> types;
+  final String? searchQuery;
+
+  @override
+  bool filter(TalkerDataInterface item) {
+    var match = false;
+
+    if (titles.isNotEmpty) {
+      match = match || titles.contains(item.displayTitle);
+    }
+
+    if (types.isNotEmpty) {
+      match = match || _checkTypeMatch(item);
+    }
+
+    if (searchQuery?.isNotEmpty ?? false) {
+      final fullMsg = item.generateTextMessage();
+      final fullUpperMsg = fullMsg.toUpperCase();
+      final fullLowerMsg = fullMsg.toLowerCase();
+      final textContain = fullUpperMsg.contains(searchQuery!) ||
+          fullLowerMsg.contains(searchQuery!);
+      match = match || textContain;
+    }
+
+    if (titles.isEmpty && types.isEmpty && (searchQuery?.isEmpty ?? true)) {
+      match = true;
+    }
+    return match;
+  }
+
+  bool _checkTypeMatch(TalkerDataInterface item) {
+    var match = false;
+    for (final type in types) {
+      if (item.runtimeType == type) {
+        match = true;
+        break;
+      }
+    }
+    return match;
+  }
+
+  TalkerFilter copyWith({
+    List<String>? titles,
+    List<Type>? types,
+    String? searchQuery,
+  }) {
+    return TalkerFilter(
+      titles: titles ?? this.titles,
+      types: types ?? this.types,
+      searchQuery: searchQuery ?? this.searchQuery,
+    );
+  }
+}

talker/lib/src/models/models.dart

@@ -1 +1,2 @@
+export 'filter/filter.dart';
 export 'talker_data/talker_data.dart';

talker/lib/src/models/talker_data/talker_data_interface.dart

@@ -24,6 +24,11 @@ abstract class TalkerDataInterface {
   /// {@endtemplate}
   Error? get error;
 
+  /// {@template talker_data_title}
+  /// Title of Talker log
+  /// {@endtemplate}
+  String? get title;
+
   /// {@template talker_data_stackTrace}
   /// StackTrace?] [stackTrace] - stackTrace if [exception] or [error] happened
   /// {@endtemplate}
@@ -57,20 +62,24 @@ abstract class TalkerDataInterface {
 extension FeildsToDisplay on TalkerDataInterface {
   /// Displayed title of [TalkerDataInterface]
   String get displayTitle {
-    var title = '';
+    var t = '';
     switch (runtimeType) {
       case TalkerError:
-        title = 'ERROR';
+        t = 'ERROR';
         break;
       case TalkerException:
-        title = 'EXCEPTION';
+        t = 'EXCEPTION';
         break;
       case TalkerLog:
       default:
-        title = logLevel.title;
+        t = title ?? logLevel.title;
         break;
     }
-    return '[$title]' + ' | $displayTime | ';
+    return t;
+  }
+
+  String get displayTitleWithTime {
+    return '[$displayTitle] | $displayTime | ';
   }
 
   /// Displayed stackTrace of [TalkerDataInterface]

talker/lib/src/models/talker_data/talker_error.dart

@@ -8,6 +8,7 @@ class TalkerError implements TalkerDataInterface {
     this.message,
     this.logLevel,
     this.stackTrace,
+    this.title,
     DateTime? time,
   }) {
     _time = time ?? DateTime.now();
@@ -27,14 +28,18 @@ class TalkerError implements TalkerDataInterface {
   @override
   final StackTrace? stackTrace;
 
+  /// {@macro talker_data_title}
+  @override
+  final String? title;
+
   /// {@macro talker_data_loglevel}
   @override
   final LogLevel? logLevel;
 
   /// {@macro talker_data_generateTextMessage}
   @override
   String generateTextMessage() {
-    return '$displayTitle$displayMessage$displayError$displayStackTrace';
+    return '$displayTitleWithTime$displayMessage$displayError$displayStackTrace';
   }
 
   /// {@macro talker_data_time}

talker/lib/src/models/talker_data/talker_exception.dart

@@ -8,6 +8,7 @@ class TalkerException implements TalkerDataInterface {
     this.message,
     this.logLevel,
     this.stackTrace,
+    this.title,
     DateTime? time,
   }) {
     _time = time ?? DateTime.now();
@@ -27,14 +28,18 @@ class TalkerException implements TalkerDataInterface {
   @override
   final StackTrace? stackTrace;
 
+  /// {@macro talker_data_title}
+  @override
+  final String? title;
+
   /// {@macro talker_data_loglevel}
   @override
   final LogLevel? logLevel;
 
   /// {@macro talker_data_generateTextMessage}
   @override
   String generateTextMessage() {
-    return '$displayTitle$displayMessage$displayException$displayStackTrace';
+    return '$displayTitleWithTime$displayMessage$displayException$displayStackTrace';
   }
 
   /// {@macro talker_data_time}

talker/lib/src/models/talker_data/talker_log.dart

@@ -10,6 +10,7 @@ class TalkerLog implements TalkerDataInterface {
     this.error,
     this.stackTrace,
     this.additional,
+    this.title,
     DateTime? time,
     this.pen,
   }) {
@@ -33,6 +34,11 @@ class TalkerLog implements TalkerDataInterface {
   @override
   final StackTrace? stackTrace;
 
+  /// {@macro talker_data_title}
+  @override
+  final String? title;
+
+  /// {@macro talker_data_additional}
   @override
   final Map<String, dynamic>? additional;
 
@@ -43,7 +49,7 @@ class TalkerLog implements TalkerDataInterface {
   /// {@macro talker_data_generateTextMessage}
   @override
   String generateTextMessage() {
-    return '$displayTitle$message$displayAditional';
+    return '$displayTitleWithTime$message$displayAditional';
   }
 
   /// {@macro talker_data_time}

talker/pubspec.yaml

@@ -1,12 +1,11 @@
 name: talker
 description: Advanced error handler and logger package for flutter and dart apps
-version: 0.5.1
+version: 0.6.0
 homepage: https://github.com/Frezyx/talker
 
 environment:
   sdk: '>=2.15.0 <3.0.0'
 
-
 dependencies:
   intl: ^0.17.0
   talker_error_handler: ^0.5.0

talker_flutter/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.0
+- Implement UI filter for convenient work with the console in the application
+
+## 0.4.1
+- Add Flutter Colors extended Talker models <br> to customize colors of your UI logs
+
 ## 0.4.0
 - Update talker version to 0.5.0