Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
version: "76.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "0.3.3"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.11.0"
args:
dependency: transitive
description:
Expand All @@ -42,18 +42,18 @@ packages:
dependency: transitive
description:
name: bloc
sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189"
url: "https://pub.dev"
source: hosted
version: "8.1.4"
version: "9.0.0"
bloc_presentation:
dependency: "direct main"
description:
name: bloc_presentation
sha256: d80359c463789a1e7b5095b4fb204798a6c168fd08b9eefa3ffcb9063bf7a85e
sha256: "03ea22745a23274a7fa4425ac16e120838471d3073fa37a3332c18641cb2d8a2"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
version: "1.1.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -178,10 +178,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.0"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -212,7 +212,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.0.6"
version: "0.0.7"
equatable:
dependency: transitive
description:
Expand Down Expand Up @@ -254,10 +254,10 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b"
url: "https://pub.dev"
source: hosted
version: "8.1.6"
version: "9.0.0"
flutter_lints:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -403,18 +403,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -435,18 +435,18 @@ packages:
dependency: transitive
description:
name: logging
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.0"
macros:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
version: "0.1.3-main.0"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -579,7 +579,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_gen:
dependency: transitive
description:
Expand Down Expand Up @@ -608,10 +608,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.0"
stream_channel:
dependency: transitive
description:
Expand All @@ -632,10 +632,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.0"
term_glyph:
dependency: transitive
description:
Expand All @@ -648,10 +648,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.3"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -680,10 +680,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -733,5 +733,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.5.1 <4.0.0"
flutter: ">=3.22.0"
dart: ">=3.6.0 <4.0.0"
flutter: ">=3.27.1"
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
path: ../
flutter:
sdk: flutter
flutter_bloc: ^8.1.1
flutter_bloc: ^9.0.0
freezed_annotation: ^2.2.0
get_it: ^7.7.0
injectable: ^2.1.0
Expand Down
3 changes: 0 additions & 3 deletions lib/chopper/chopper.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/// DCC Toolkit chopper util.
library chopper;

export 'color_converter.dart';
export 'datetime_converter.dart';
export 'json_serializable_converter.dart';
Expand Down
3 changes: 3 additions & 0 deletions lib/chopper/color_converter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ class ColorConverter implements JsonConverter<Color, String> {
/// Each value is a two-digit hexadecimal number.
@override
String toJson(Color color) {
// Next flutter release (>3.27) will contain a new method `toARGB32` to replace `.value`.
// Ignore this for now.
// ignore: deprecated_member_use
return '#${color.value.toRadixString(16).padLeft(8, '0')}';
}
}
3 changes: 1 addition & 2 deletions lib/chopper/json_serializable_converter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert';

import 'package:chopper/chopper.dart';
import 'package:collection/collection.dart';

/// Method signature for a function that creates a dart object from a json map.
typedef JsonFactory<T> = T Function(Map<String, dynamic> json);
Expand Down Expand Up @@ -44,7 +43,7 @@ class JsonSerializableConverter extends JsonConverter {
}

List<T> _decodeList<T>(Iterable<dynamic> values) =>
values.whereNotNull().map<T>((v) => _decode<T>(v) as T).toList();
values.nonNulls.map<T>((v) => _decode<T>(v) as T).toList();

dynamic _decode<T>(dynamic entity) {
if (entity is Iterable) return _decodeList<T>(entity as List);
Expand Down
4 changes: 2 additions & 2 deletions lib/common/dcc_logger.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class DCCLogger {
/// ```dart
/// DCCLogger.info('test bericht', tag: 'test');
/// ```
/// prints: [[13:46]] [[INFO]] DCC: <test> test bericht
/// prints: [[13:46]] [[INFO]] DCC: &lt;test&gt; test bericht
@Deprecated('Use BoltLogger.zap instead')
static void info(
String message, {
Expand All @@ -84,7 +84,7 @@ class DCCLogger {
/// ```dart
/// DCCLogger.severe('test bericht', tag: 'test');
/// ```
/// prints: [[13:46]] [[SEVERE]] DCC: <test> test bericht
/// prints: [[13:46]] [[SEVERE]] DCC: &lt;test&gt; test bericht
@Deprecated('Use BoltLogger.shock instead')
static void severe(
String message, {
Expand Down
3 changes: 0 additions & 3 deletions lib/dcc_toolkit.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/// DCC Toolkit provides set of tools to help you build apps faster.
library dcc_toolkit;

export 'chopper/chopper.dart';
export 'common/dimensions.dart';
export 'common/extensions/build_context.dart';
Expand Down
4 changes: 3 additions & 1 deletion lib/logger/extensions/zap_extension.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ extension ZapExtension on Object {
String? tag,
Level level = Level.INFO,
}) {
//ignore: no_runtimeType_toString
// We actually want to know to runtimeType of the object
// ignore: no_runtimeType_toString
BoltLogger.zap(message, tag: tag ?? runtimeType.toString(), level: level);
}

Expand All @@ -19,6 +20,7 @@ extension ZapExtension on Object {
String? tag,
Level level = Level.SEVERE,
}) {
// We actually want to know to runtimeType of the object
//ignore: no_runtimeType_toString
BoltLogger.shock(message, tag: tag ?? runtimeType.toString(), level: level);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/blocful_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
/// A widget that wraps your UI in a [BlocPresentationListener] and a [BlocConsumer] to be able to handle all events simultaniously
///
/// Example:
/// /// ```dart
/// ```dart
/// class SomePage extends BlocfulWidget<SomeCubit, SomeState, SomeEvent> {
/// const SomePage({super.key})
/// : super(onCreateBloc: SomeCubit());
Expand All @@ -20,7 +20,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
/// return SomeWidget();
/// }
/// }
/// ```dart
/// ```
abstract class BlocfulWidget<BLOC extends BlocPresentationMixin<STATE, EVENT>,
STATE, EVENT> extends StatelessWidget {
/// Creates a [BlocfulWidget]
Expand Down
Loading
Loading