Skip to content
Open
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
1 change: 1 addition & 0 deletions lib/get_connect/connect.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export 'http/src/certificates/certificates.dart';
export 'http/src/http.dart';
export 'http/src/multipart/form_data.dart';
export 'http/src/multipart/multipart_file.dart';
export 'http/src/request/request.dart';
export 'http/src/response/response.dart';
export 'sockets/sockets.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/get_navigation/src/routes/get_router_delegate.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import '../../../get_instance/src/bindings_interface.dart';
import '../../../get_utils/src/extensions/iterable_extensions.dart';
import '../../../get_utils/src/platform/platform.dart';
import '../../../route_manager.dart';

Expand Down Expand Up @@ -280,12 +281,11 @@ class GetDelegate extends RouterDelegate<RouteDecoder>
return SynchronousFuture(_canPopPage());
}

bool _canPop(mode) {
bool _canPop(PopMode mode) {
switch (mode) {
case PopMode.history:
return _canPopHistory();
case PopMode.page:
default:
return _canPopPage();
}
}
Expand Down
9 changes: 1 addition & 8 deletions lib/get_navigation/src/routes/new_path_route.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:async';

import 'package:flutter/widgets.dart';

import '../../../get_utils/src/extensions/iterable_extensions.dart';
import 'get_route.dart';

class RouteMatcher {
Expand Down Expand Up @@ -247,11 +248,3 @@ class RouteNode {
'RouteNode(name: $path, nodeSegments: $nodeSegments, fullPath: $fullPath )';
}

extension Foo<T> on Iterable<T> {
T? firstWhereOrNull(bool Function(T element) test) {
for (var element in this) {
if (test(element)) return element;
}
return null;
}
}
10 changes: 0 additions & 10 deletions lib/get_navigation/src/routes/parse_route.dart
Original file line number Diff line number Diff line change
Expand Up @@ -283,13 +283,3 @@ class ParseRouteTree {
return params;
}
}

extension FirstWhereOrNullExt<T> on List<T> {
/// The first element satisfying [test], or `null` if there are none.
T? firstWhereOrNull(bool Function(T element) test) {
for (var element in this) {
if (test(element)) return element;
}
return null;
}
}
2 changes: 1 addition & 1 deletion lib/get_utils/src/extensions/export.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export 'duration_extensions.dart';
export 'dynamic_extensions.dart';
export 'event_loop_extensions.dart';
export 'int_extensions.dart';
export 'internacionalization.dart' hide FirstWhereExt;
export 'internacionalization.dart';
export 'iterable_extensions.dart';
export 'num_extensions.dart';
export 'string_extensions.dart';
Expand Down
10 changes: 0 additions & 10 deletions lib/get_utils/src/extensions/internacionalization.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ class _IntlHost {
Map<String, Map<String, String>> translations = {};
}

extension FirstWhereExt<T> on List<T> {
/// The first element satisfying [test], or `null` if there are none.
T? firstWhereOrNull(bool Function(T element) test) {
for (var element in this) {
if (test(element)) return element;
}
return null;
}
}

extension LocalesIntl on GetInterface {
static final _intlHost = _IntlHost();

Expand Down
11 changes: 10 additions & 1 deletion lib/get_utils/src/extensions/iterable_extensions.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
extension IterableExtensions<T> on Iterable<T> {
Iterable<TRes> mapMany<TRes>(
Iterable<TRes>? Function(T item) selector) sync* {
Iterable<TRes>? Function(T item) selector,
) sync* {
for (var item in this) {
final res = selector(item);
if (res != null) yield* res;
}
}

/// The first element satisfying [test], or `null` if there are none.
T? firstWhereOrNull(bool Function(T element) test) {
for (var element in this) {
if (test(element)) return element;
}
return null;
}
}
11 changes: 11 additions & 0 deletions test/utils/extensions/iterable_extensions_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:get/get.dart';

void main() {
group('IterableExt', () {
test('firstWhereOrNull', () {
expect([1, 2, 3].firstWhereOrNull((e) => e == 1), equals(1));
expect([1, 2, 3].firstWhereOrNull((e) => e == 4), equals(null));
});
});
}