diff --git a/lib/models/train_data.dart b/lib/models/train_data.dart index 8bc9ac9..5a5a8a5 100644 --- a/lib/models/train_data.dart +++ b/lib/models/train_data.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/widgets.dart'; import 'package:info_tren/hidden_webview.dart'; +import 'package:info_tren/utils/string.dart'; import 'package:info_tren/utils/webview_invoke.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -194,7 +195,7 @@ class OnDemandTrainData extends OnDemand { isFunctionAlready: true, )).trim(); - return takeWhile(result, (char) => char != ' '.codeUnitAt(0)); + return result.takeWhile((char) => char != ' '.codeUnitAt(0)); } Future get _routeDuration async { @@ -1064,14 +1065,3 @@ DateTime parseCFRDateTime(String dateAndTime) { return DateTime(year, month, day, hour, minute); } - -String takeWhile(String input, Function charValidator) { - StringBuffer output = StringBuffer(); - - for (final char in input.codeUnits) { - if (charValidator(char)) output.writeCharCode(char); - else break; - } - - return output.toString(); -} \ No newline at end of file diff --git a/lib/utils/string.dart b/lib/utils/string.dart new file mode 100644 index 0000000..73f312d --- /dev/null +++ b/lib/utils/string.dart @@ -0,0 +1,12 @@ +extension TakeWhile on String { + String takeWhile(Function charValidator) { + StringBuffer output = StringBuffer(); + + for (final char in this.codeUnits) { + if (charValidator(char)) output.writeCharCode(char); + else break; + } + + return output.toString(); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index d601ff1..48fd79e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: info_tren -description: O aplicație de vizualizare a datelor puse la dispoziție de Informatica Feroviară.xe +description: O aplicație de vizualizare a datelor puse la dispoziție de Informatica Feroviară. # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -14,7 +14,7 @@ description: O aplicație de vizualizare a datelor puse la dispoziție de Inform version: 2.0.6 environment: - sdk: ">=2.3.0 <3.0.0" + sdk: ">=2.7.0 <3.0.0" dependencies: flutter: