Skip to content

Commit 05fac1f

Browse files
ahmedAlaaInstabugahmedAlaaInstabug
committed
monorepo
1 parent 4ac9541 commit 05fac1f

File tree

9 files changed

+83
-83
lines changed

9 files changed

+83
-83
lines changed

‎packages/instabug_dio_interceptor/lib/instabug_dio_interceptor.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ class InstabugDioInterceptor extends Interceptor {
7676

7777
var responseBodySize = 0;
7878
if (responseHeaders.containsKey('content-length')) {
79-
responseBodySize = int.parse(responseHeaders['content-length'][0] ?? '0');
79+
// ignore: avoid_dynamic_calls
80+
responseBodySize = int.parse((responseHeaders['content-length'][0]) ?? '0');
8081
} else if (response.data != null) {
8182
responseBodySize = response.data.toString().length;
8283
}

‎packages/instabug_flutter_modular/lib/src/instabug_modular_manager.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import 'package:flutter_modular/flutter_modular.dart';
22
import 'package:instabug_flutter/instabug_flutter.dart';
3+
import 'package:instabug_flutter_modular/src/instabug_module.dart';
34
import 'package:meta/meta.dart';
45

5-
import './instabug_module.dart';
6-
76
class InstabugModularManager {
87
InstabugModularManager._();
98

@@ -44,7 +43,7 @@ class InstabugModularManager {
4443

4544
if (route is ModuleRoute && route.context is Module && wrapModules) {
4645
final module = InstabugModule(
47-
route.context as Module,
46+
route.context! as Module,
4847
path: fullPath,
4948
);
5049

‎packages/instabug_flutter_modular/lib/src/instabug_module.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter_modular/flutter_modular.dart';
2-
import 'instabug_modular_manager.dart';
2+
import 'package:instabug_flutter_modular/src/instabug_modular_manager.dart';
33

44
class InstabugModule extends Module {
55
final Module module;

‎packages/instabug_flutter_modular/pubspec.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ environment:
1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
meta: ^1.3.0
1413
flutter_modular: '>=5.0.0 <6.0.0'
1514
instabug_flutter: '>=13.2.0 <14.0.0'
16-
15+
meta: ^1.3.0
1716

1817
dev_dependencies:
1918
build_runner: ^2.0.3
19+
flutter_lints: ^2.0.0
2020
flutter_test:
2121
sdk: flutter
22-
flutter_lints: ^2.0.0
2322
# mockito v5.2.0 is needed for running Flutter 2 tests on CI
2423
mockito: '>=5.2.0 <=5.4.4'
2524
# A specific version isn't specified as we want to use the version used in flutter_modular

‎packages/instabug_flutter_modular/test/src/instabug_modular_manager_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
// ignore_for_file: avoid_dynamic_calls
2+
13
import 'package:flutter/widgets.dart';
24
import 'package:flutter_modular/flutter_modular.dart';
35
import 'package:flutter_test/flutter_test.dart';
6+
import 'package:instabug_flutter/instabug_flutter.dart';
47
import 'package:instabug_flutter_modular/instabug_flutter_modular.dart';
58
import 'package:instabug_flutter_modular/src/instabug_modular_manager.dart';
6-
import 'package:modular_core/modular_core.dart';
7-
8-
import 'package:instabug_flutter/instabug_flutter.dart';
9-
109
import 'package:mockito/annotations.dart';
10+
import 'package:modular_core/modular_core.dart';
1111

1212
import 'instabug_modular_manager_test.mocks.dart';
1313

@@ -113,7 +113,7 @@ void main() {
113113
// Arrange
114114
final customTransition = MockCustomTransition();
115115
const duration = Duration.zero;
116-
final List<RouteGuard> guards = [];
116+
final guards = <RouteGuard>[];
117117
const transition = TransitionType.downToUp;
118118

119119
final homeRoute = ChildRoute(
@@ -139,7 +139,7 @@ void main() {
139139
final wrappedRoutes =
140140
InstabugModularManager.instance.wrapRoutes(routes) as List<dynamic>;
141141

142-
for (var element in wrappedRoutes) {
142+
for (final element in wrappedRoutes) {
143143
final widget = element.child(mockContext, mockArgs);
144144

145145
// Assert

‎packages/instabug_http_client/lib/instabug_http_client.dart

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
3030

3131
@override
3232
Future<http.Response> delete(Uri url,
33-
{Map<String, String>? headers, Object? body, Encoding? encoding}) async {
34-
final DateTime startTime = DateTime.now();
35-
final Map<String, String> requestHeader = headers ?? <String, String>{};
36-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
33+
{Map<String, String>? headers, Object? body, Encoding? encoding,}) async {
34+
final startTime = DateTime.now();
35+
final requestHeader = headers ?? <String, String>{};
36+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
3737
return client
3838
.delete(url, body: body, headers: requestHeader, encoding: encoding)
3939
.then((http.Response response) {
@@ -43,8 +43,8 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
4343
}
4444

4545
Future<W3CHeader?> getW3cHeader(Map<String, String> requestHeader, DateTime startTime) async {
46-
final W3CHeader? w3cHeader = await _networklogger.getW3CHeader(
47-
requestHeader, startTime.millisecondsSinceEpoch);
46+
final w3cHeader = await _networklogger.getW3CHeader(
47+
requestHeader, startTime.millisecondsSinceEpoch,);
4848
if (w3cHeader?.isW3cHeaderFound == false &&
4949
w3cHeader?.w3CGeneratedHeader != null) {
5050
requestHeader['traceparent'] = w3cHeader!.w3CGeneratedHeader!;
@@ -54,9 +54,9 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
5454

5555
@override
5656
Future<http.Response> get(Uri url, {Map<String, String>? headers}) async {
57-
final DateTime startTime = DateTime.now();
58-
final Map<String, String> requestHeader = headers ?? <String, String>{};
59-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
57+
final startTime = DateTime.now();
58+
final requestHeader = headers ?? <String, String>{};
59+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
6060
return client
6161
.get(url, headers: requestHeader)
6262
.then((http.Response response) {
@@ -67,9 +67,9 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
6767

6868
@override
6969
Future<http.Response> head(Uri url, {Map<String, String>? headers}) async {
70-
final DateTime startTime = DateTime.now();
71-
final Map<String, String> requestHeader = headers ?? <String, String>{};
72-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
70+
final startTime = DateTime.now();
71+
final requestHeader = headers ?? <String, String>{};
72+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
7373
return client
7474
.head(url, headers: requestHeader)
7575
.then((http.Response response) {
@@ -80,10 +80,10 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
8080

8181
@override
8282
Future<http.Response> patch(Uri url,
83-
{Map<String, String>? headers, Object? body, Encoding? encoding}) async {
84-
final DateTime startTime = DateTime.now();
85-
final Map<String, String> requestHeader = headers ?? <String, String>{};
86-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
83+
{Map<String, String>? headers, Object? body, Encoding? encoding,}) async {
84+
final startTime = DateTime.now();
85+
final requestHeader = headers ?? <String, String>{};
86+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
8787
return client
8888
.patch(url, headers: requestHeader, body: body, encoding: encoding)
8989
.then((http.Response response) {
@@ -94,10 +94,10 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
9494

9595
@override
9696
Future<http.Response> post(Uri url,
97-
{Map<String, String>? headers, Object? body, Encoding? encoding}) async {
98-
final DateTime startTime = DateTime.now();
99-
final Map<String, String> requestHeader = headers ?? <String, String>{};
100-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
97+
{Map<String, String>? headers, Object? body, Encoding? encoding,}) async {
98+
final startTime = DateTime.now();
99+
final requestHeader = headers ?? <String, String>{};
100+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
101101
return client
102102
.post(url, headers: requestHeader, body: body, encoding: encoding)
103103
.then((http.Response response) {
@@ -108,10 +108,10 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
108108

109109
@override
110110
Future<http.Response> put(Uri url,
111-
{Map<String, String>? headers, Object? body, Encoding? encoding}) async {
112-
final DateTime startTime = DateTime.now();
113-
final Map<String, String> requestHeader = headers ?? <String, String>{};
114-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
111+
{Map<String, String>? headers, Object? body, Encoding? encoding,}) async {
112+
final startTime = DateTime.now();
113+
final requestHeader = headers ?? <String, String>{};
114+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
115115
return client
116116
.put(url, headers: requestHeader, body: body, encoding: encoding)
117117
.then((http.Response response) {
@@ -130,9 +130,9 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
130130

131131
@override
132132
Future<http.StreamedResponse> send(http.BaseRequest request) async {
133-
final DateTime startTime = DateTime.now();
134-
final Map<String, String> requestHeader = request.headers;
135-
final W3CHeader? w3cHeader = await getW3cHeader(requestHeader, startTime);
133+
final startTime = DateTime.now();
134+
final requestHeader = request.headers;
135+
final w3cHeader = await getW3cHeader(requestHeader, startTime);
136136
return client.send(request).then((http.StreamedResponse streamedResponse) =>
137137
http.Response.fromStream(streamedResponse)
138138
.then((http.Response response) {
@@ -148,6 +148,6 @@ class InstabugHttpClient extends InstabugHttpLogger implements http.Client {
148148
persistentConnection: response.persistentConnection,
149149
reasonPhrase: response.reasonPhrase,
150150
);
151-
}));
151+
}),);
152152
}
153153
}

‎packages/instabug_http_client/lib/instabug_http_logger.dart

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ import 'package:instabug_flutter/instabug_flutter.dart';
55

66
class InstabugHttpLogger {
77
void onLogger(http.Response response, {DateTime? startTime,W3CHeader? w3CHeader}) {
8-
final NetworkLogger networkLogger = NetworkLogger();
8+
final networkLogger = NetworkLogger();
99

10-
final Map<String, dynamic> requestHeaders = <String, dynamic>{};
10+
final requestHeaders = <String, dynamic>{};
1111
response.request?.headers.forEach((String header, dynamic value) {
1212
requestHeaders[header] = value;
1313
});
1414

15-
final http.BaseRequest? request = response.request;
15+
final request = response.request;
1616

1717
if (request == null) {
1818
return;
1919
}
20-
final String requestBody = request is http.MultipartRequest
20+
final requestBody = request is http.MultipartRequest
2121
? json.encode(request.fields)
2222
: request is http.Request
2323
? request.body
2424
: '';
2525

26-
final NetworkData requestData = NetworkData(
26+
final requestData = NetworkData(
2727
startTime: startTime!,
2828
method: request.method,
2929
url: request.url.toString(),
3030
requestHeaders: requestHeaders,
3131
requestBody: requestBody,
32-
w3cHeader: w3CHeader
32+
w3cHeader: w3CHeader,
3333
);
3434

35-
final DateTime endTime = DateTime.now();
35+
final endTime = DateTime.now();
3636

37-
final Map<String, dynamic> responseHeaders = <String, dynamic>{};
37+
final responseHeaders = <String, dynamic>{};
3838
response.headers.forEach((String header, dynamic value) {
3939
responseHeaders[header] = value;
4040
});
41-
int requestBodySize = 0;
41+
var requestBodySize = 0;
4242
if (requestHeaders.containsKey('content-length')) {
4343
requestBodySize = int.parse(responseHeaders['content-length'] ?? '0');
4444
} else {
4545
requestBodySize = requestBody.length;
4646
}
4747

48-
int responseBodySize = 0;
48+
var responseBodySize = 0;
4949
if (responseHeaders.containsKey('content-length')) {
5050
responseBodySize = int.parse(responseHeaders['content-length'] ?? '0');
5151
} else {
@@ -65,6 +65,6 @@ class InstabugHttpLogger {
6565
requestContentType: request.headers.containsKey('content-type')
6666
? request.headers['content-type']
6767
: '',
68-
));
68+
),);
6969
}
7070
}

0 commit comments

Comments
 (0)