From 58a56199f03a3d6aa23b99b5176f723d1f1e30e4 Mon Sep 17 00:00:00 2001 From: Dan Cojocaru Date: Sun, 22 Aug 2021 17:48:54 +0300 Subject: [PATCH 1/3] Upped Dart version, switched to extension methods --- lib/models/train_data.dart | 14 ++------------ lib/utils/string.dart | 12 ++++++++++++ pubspec.yaml | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 lib/utils/string.dart 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: From 7872e7afa08f2fc61484dcaf255fb44b953e9d32 Mon Sep 17 00:00:00 2001 From: Dan Cojocaru Date: Sun, 22 Aug 2021 22:06:26 +0300 Subject: [PATCH 2/3] Changed app id to match website --- android/app/build.gradle | 2 +- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- ios/Runner/Info.plist | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3f9921f..5dd6841 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "ml.dandevelop.info_tren" + applicationId "xyz.dcdevelop.infotren" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 7fbc945..f58a5bf 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -381,7 +381,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = ml.dandevelop.infoTren; + PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -517,7 +517,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = ml.dandevelop.infoTren; + PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -550,7 +550,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = ml.dandevelop.infoTren; + PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 0218884..c1f234b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -28,7 +28,7 @@ NSExceptionDomains - cfr-scrapper.herokuapp.com + example.com NSExceptionAllowsInsecureHTTPLoads From 2b52efb6209e0ff2dc98ea24480fa98ad3d4be04 Mon Sep 17 00:00:00 2001 From: Dan Cojocaru Date: Mon, 23 Aug 2021 07:59:30 +0300 Subject: [PATCH 3/3] Transitioned from WebViews to API; upgraded to null safety --- CHANGELOG.TXT | 5 + analysis_options.yaml | 29 + android/.gitignore | 13 + .../xyz/dcdevelop/info_tren/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 + .../app/src/main/res/values-night/styles.xml | 18 + fonts/ah/ah-Bold.ttf | Bin 0 -> 43756 bytes fonts/ah/ah-BoldItalic.ttf | Bin 0 -> 44664 bytes fonts/ah/ah-Italic.ttf | Bin 0 -> 43540 bytes fonts/ah/ah-Regular.ttf | Bin 0 -> 42596 bytes ios/.gitignore | 33 + ios/Flutter/AppFrameworkInfo.plist | 4 +- ios/Flutter/Debug.xcconfig | 1 - ios/Flutter/Flutter.podspec | 18 - ios/Flutter/Release.xcconfig | 1 - ios/Flutter/flutter_export_environment.sh | 1 - ios/Podfile | 41 - ios/Podfile.lock | 22 - ios/Runner.xcodeproj/project.pbxproj | 159 +-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../contents.xcworkspacedata | 3 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 + ios/Runner/AppDelegate.swift | 2 +- .../Icon-App-1024x1024@1x.png | Bin 11112 -> 10932 bytes ios/Runner/Info.plist | 19 +- ios/Runner/Runner-Bridging-Header.h | 2 +- lib/api/train_data.dart | 9 + lib/components/cupertino_divider.dart | 60 + lib/components/future_display.dart | 42 + lib/components/loading/loading.dart | 31 + lib/components/loading/loading_cupertino.dart | 28 + lib/components/loading/loading_material.dart | 26 + lib/components/refresh_future_builder.dart | 117 ++ .../select_train_suggestions.dart | 209 +++ .../select_train_suggestions_cupertino.dart | 74 + .../select_train_suggestions_material.dart | 47 + lib/components/slim_app_bar.dart | 62 + lib/hidden_webview.dart | 23 - lib/main.dart | 226 +-- lib/models/train_data.dart | 1228 +++-------------- lib/models/train_data.g.dart | 98 -- lib/models/train_operator_lines.dart | 42 + lib/models/train_operator_lines.g.dart | 42 + lib/models/ui_design.dart | 15 + lib/pages/main/main_page.dart | 68 + lib/pages/main/main_page_cupertino.dart | 30 + lib/pages/main/main_page_material.dart | 34 + .../select_train/select_train.dart | 61 + .../select_train/select_train_cupertino.dart | 39 + .../select_train/select_train_material.dart | 43 + .../train_info_animation_helpers.dart.old} | 2 +- .../train_info_page/train_info_constants.dart | 0 .../view_train/train_info.dart | 69 + .../view_train/train_info_cupertino.dart | 741 ++++++++++ ...in_info_cupertino_DisplayTrainStation.dart | 466 +++++++ .../view_train/train_info_material.dart | 659 +++++++++ ...ain_info_material_DisplayTrainStation.dart | 476 +++++++ ...tions_list.dart => stations_list.dart.old} | 95 +- lib/train_info_display.dart | 147 +- lib/train_info_page/train_info.dart | 72 - lib/train_info_page/train_info_cupertino.dart | 1022 -------------- ...in_info_cupertino_DisplayTrainStation.dart | 506 ------- lib/train_info_page/train_info_material.dart | 944 ------------- ...ain_info_material_DisplayTrainStation.dart | 509 ------- lib/train_info_page/train_info_prompt.dart | 385 ------ lib/train_info_page/train_info_prompt.g.dart | 44 - lib/utils/default_ui_design.dart | 12 + lib/utils/state_to_string.dart | 12 + lib/utils/webview_invoke.dart | 34 - pubspec.lock | 194 ++- pubspec.yaml | 29 +- web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 101 ++ web/manifest.json | 35 + 79 files changed, 4301 insertions(+), 5320 deletions(-) create mode 100644 analysis_options.yaml create mode 100644 android/.gitignore create mode 100644 android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 fonts/ah/ah-Bold.ttf create mode 100644 fonts/ah/ah-BoldItalic.ttf create mode 100644 fonts/ah/ah-Italic.ttf create mode 100644 fonts/ah/ah-Regular.ttf create mode 100644 ios/.gitignore delete mode 100644 ios/Flutter/Flutter.podspec delete mode 100644 ios/Podfile delete mode 100644 ios/Podfile.lock create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 lib/api/train_data.dart create mode 100644 lib/components/cupertino_divider.dart create mode 100644 lib/components/future_display.dart create mode 100644 lib/components/loading/loading.dart create mode 100644 lib/components/loading/loading_cupertino.dart create mode 100644 lib/components/loading/loading_material.dart create mode 100644 lib/components/refresh_future_builder.dart create mode 100644 lib/components/select_train_suggestions/select_train_suggestions.dart create mode 100644 lib/components/select_train_suggestions/select_train_suggestions_cupertino.dart create mode 100644 lib/components/select_train_suggestions/select_train_suggestions_material.dart create mode 100644 lib/components/slim_app_bar.dart delete mode 100644 lib/hidden_webview.dart delete mode 100644 lib/models/train_data.g.dart create mode 100644 lib/models/train_operator_lines.dart create mode 100644 lib/models/train_operator_lines.g.dart create mode 100644 lib/models/ui_design.dart create mode 100644 lib/pages/main/main_page.dart create mode 100644 lib/pages/main/main_page_cupertino.dart create mode 100644 lib/pages/main/main_page_material.dart create mode 100644 lib/pages/train_info_page/select_train/select_train.dart create mode 100644 lib/pages/train_info_page/select_train/select_train_cupertino.dart create mode 100644 lib/pages/train_info_page/select_train/select_train_material.dart rename lib/{train_info_page/train_info_animation_helpers.dart => pages/train_info_page/train_info_animation_helpers.dart.old} (98%) rename lib/{ => pages}/train_info_page/train_info_constants.dart (100%) create mode 100644 lib/pages/train_info_page/view_train/train_info.dart create mode 100644 lib/pages/train_info_page/view_train/train_info_cupertino.dart create mode 100644 lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart create mode 100644 lib/pages/train_info_page/view_train/train_info_material.dart create mode 100644 lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart rename lib/{stations_list.dart => stations_list.dart.old} (78%) delete mode 100644 lib/train_info_page/train_info.dart delete mode 100644 lib/train_info_page/train_info_cupertino.dart delete mode 100644 lib/train_info_page/train_info_cupertino_DisplayTrainStation.dart delete mode 100644 lib/train_info_page/train_info_material.dart delete mode 100644 lib/train_info_page/train_info_material_DisplayTrainStation.dart delete mode 100644 lib/train_info_page/train_info_prompt.dart delete mode 100644 lib/train_info_page/train_info_prompt.g.dart create mode 100644 lib/utils/default_ui_design.dart create mode 100644 lib/utils/state_to_string.dart delete mode 100644 lib/utils/webview_invoke.dart create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/manifest.json diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 3d1aef6..37dfd83 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,8 @@ +v2.0.7 +Switched from WebView to API +Updated app to latest Flutter +Tweaks + v2.0.6 Brought feature parity with iOS _(except for v2.0.2, which is iOS specific)_. diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 0000000..6f56801 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt b/android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt new file mode 100644 index 0000000..0fd345f --- /dev/null +++ b/android/app/src/main/kotlin/xyz/dcdevelop/info_tren/MainActivity.kt @@ -0,0 +1,6 @@ +package xyz.dcdevelop.info_tren + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..449a9f9 --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/fonts/ah/ah-Bold.ttf b/fonts/ah/ah-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..14b719618a199672eab4aacda3b9bee5ec5529d7 GIT binary patch literal 43756 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 C)jy2|0F%#U0q#W-*0{I`c{P_ z9LJgPBjd#0#d8O6hnu^%rxxP2Bcxm?^ z`G35{ad&*mar~(Z7uVF~4TW!U+=(94A76jc+U@m&pZpT{yYPY6*Pn5k=zK$)=D6Js zJm0!$`{t8$TP`(m-1c#f(^YR?yJI`29}Sw{aNH3tLd23ac;RxD!6YeR#`Br=9hWmkphGei_Hfw{P9He(hhc`Cs&9-4*EH zlP9e`Ydd*``vmt}QC~cH?MWNkzu%5$yD#FnYWMbSJ5GBzzZmfBxtZe>7j8dw*BSaB5Bi>~Q9QF+c)lvtSkkqg)WqCwG*Vk}s96eCWyh z@BjIIWamQ<@jp1+%imu5DRGuwDE*Suko4hic}RWfIkYNp$@2UB8T{>>g%i0fSM@+b zv|DsCp)O@^7xHyJUa1p8!7N{t*A)eYLaFfadBI#L6bpqc9w_TnbtBvR`!{viRY$If zA|BYU(h739BOA8fsHzrtUZ!=%yb+Ns9G)1<<;Et4hbLCl)~=Wse#=d|9ZkX9(#{C^ ze(8tyg5OeCUmLaC(LGSZ9Q@qLAK!iJtK$rLdA9=7LA623T12tG-W^;2)Q=gc51Uqo)ZIo zj@_2lIYY7R($26Tv~9Y0kfdFQ%jf1dj;~C5#YnO)+z>K4a{V=h4J#K%&PD$ez+Vr( z(}M5R2l1Vv4|r?m8|t%sh<25IQ^!w#)M~-C%~nBcthirh^F__}gx?g%cX(~7fxL(C z4N*%>bSie+ntF$lxusnZlbEn4!!lWJ-s<|~!rr3sx1_3>P&J?i5{I~xo3fYNSOm0fh|;NZAxkE5ZXugcY&$qY9K1R*tdZPVQKEoS9E92km1 zrnXffXk2k8X`gf9hL%Dq7aE;wvHP1x>gz{4BXwhE_y5Wq%(|P3O+|M$Xr{O&z$nKr z0&Wz*jX-HGPXfh&l4!|=rEj=-;wtUs{pX&0`1jzuD!@?#ID&wq9emf2O9VYt;5%?u zF&YK2G8BU4e8LePoWZlgmN!$ZOMuz(T6tfqR?qWdaY0S8H*1y2-4)zBl8bvC#?X+a2i>2KKcO#5QdUi3x!3xPm=PcYhH(TK^0KyG2t z?{6BaS)NZ=12#=InXDrZ*vY%gzEl?*T~cHpkrY7@e1@@sQ_6i zqR~RpPQ^x4DM^vyw$vG|HL+x$Xh>E2!%KoCG4y2{@UH}QtM0E-5e|I` zk-Rw+3n+{ESQpvzz_xD~%B1^}J4OD$;SFb=`HvDOl&A3Cd3etV=^w#Z_+56Rj-xU# zKqVkL42D%GLXfkJ)T5!0vV#4PGJhtC=9aekm5Rn}Dyh-mdRgh``)aPqbtqM}`76aA zCkk?TD7nYGmp`D7_0-qQv04`OE!}|6znKbz;x`auSoB3MrS#)0zr+6*Xd(>y@yS3x z6&Vb|#yCT6PzuJV+ZBpfRwzcaz3X?+jSck`bXS|Y5~0q9h)SuAG=`#c#LIFAPVPEs zu1`aTmYu&mZ3wrdYm=gQRNIySGhc^Q8ozv{w8V`t6r1G=d| z%SbNMm$8?iz6krqx%dW^<7y>^O-UsVqy;3#C(d7af8`|`yoW#D#{)>?X?rgPzV=q$ zqw-3P_mpz>9^QfUr*Dx?Z|U)tTlSIPd+9r+zp{5YJ9z71;4z7J!pFp;&29rkMaVlL z6vN0;4HwaMZ#aK`dZ;^ZxVE~xKHQm)s0@95?&i9PQg*$YG%h+(k=#0`Y2$!TM}|ix zMzh9HG1}zHdJ4n!n@&;+)t-!Ko+w>1FP+ScUa*wO1P1rdDsU5~hs=2;q%4I%u-lz`=z_%rIZ)a#w7JdY&G*LZD`W7}N?#Nd27nOB6LUyVDnn=9Tt^HqmF|Dy zn^&$#-ohXF``=5yEnP~i!#`&I0dJ8%;axfUBM`hB!HDMt@+V)(zwhR4doj$1-;ur{ zY)3r}>dB>VfbM`L5`vUE^DoiAeek6NCzU?BsOFTf@&`&0@@t@~RN{H-;XhB)*YEK@ zrITqqvjzlU`6oAT*^i&ic+pMXz>9B`+>l)^;OaHdiG@pm?!B;krgh0|yQf0>)BG2z z?%90tf_Y~yimKIJTP_=3c=iHOO`4N)8zXXsE!ixF`ajR3>nn2*<43O zJrg#vkrP@BN@Zrz8N;X7-m>rMOZ2K@_vSEQ6PuUha|;@MKzHdE%Tvia(JbdLKf}Mt zKZ%xeXgloC&xR3_&90oLe^_`iNk&suUXeEO3bZ2;wW>M0eC6uIartS8Bb$%gY_!Ry zfleqTpjRxucohSB-Z?d!hPPR40DR6f#&d?wa(9IrhUx(O@}}6_;t|--0qiDdbk+SH zlV-N;Q9^Pv@Q(-}<(VIMZR+(aWDbCO`8Ov9z&#r`dvaliAn5#A&uR#ETisAoq@y;Z zD!upVr$EN*3WL{S_Zby8FrH+(cQwYn9<-9PQ64#Bw8<)(SCY93tHno^SST2cRqa>! z;yH&c?l(0rT|Zo-Qsft`sg2AZXtnOw&WYp;frj4x?mD+jR<~eX{YeM>U#)kB?bT|7 zQ|}LZ#r#NTrYB|9gTLxSfq={5x0`LgOjovcu+BLKmx3@|3J!w)0uNALF*Ak_nVWq4 zJnu`}ZrRQo_wGIX4sVp;p!E9)>bp?i!s>%#6bfpPfoNwKz8G6{%VMS6luaj!5u0l9 zEyI@9<)_YDzB$KhNtm2fItS*V!=7x7kc&%~tv;j2nOnTA9sL;r0lkR!sXa5zlO#_< zBVVf}fc;ip~XTcu}wyvwzB@7d%ld(WnNviv@Imy{qa>OrfSL`V;L z0cWCEvBP3BrYA_oI-^+ZP}xOl_1N+@zI*eztwL2aAvWqxkDk7?Zlqwi&;bb?z|M1TT2ReqTyoGeM zDPofF`zdf$2CkwQ6OrjJ$)c6`YL+b{DW#&ax-h(@RcxtCXfIYJe3oR?t5PX!L5o;t zKgZG3(IvJX*J!E!xOHt$SnI0|XGMoTScu1qLA}LW6U=xtvHo!wqZIxU;NJ-NeOwLT zkN6yFj1%K)8z@RLN@0~w3qCqN759Z2Sn8^5&(hl5prK*E&7v|Iv~rc6TqhR?Mggd=?>K-Kis%7Hays6i*77*B!bbt^=;P=4TbCcy0&hA za~fd~$94Y3haSuc(RoVGly1Q04Y7M1p=5I2d zn%XtL<+x_M`j$V)n-Z2}*sJ`gZq3|udf~PnPs~|uHl_=Wp`NvE`MNr-GvWkZ2xKfr z?&1Fzcv0NzQBnC4g1d)tfhEQSzJl6hlu|()>xUhSv|4X&sIAwTu)B>_3SQt(be^d7 zXmr~Bi^#6i+UvU`x-;cQ(XG_0Piw!psjGv)2;s|rF4ywiqzuod6ZmheO*#Rmy&{&V z698^tFjA738Io!1q&RChZ241^Ij!Ajrf8iP)UHQ(aZxKN8C=v;;4)(jn5x zbwLR=md2~h-=(c^Vse4VkFB$LIv@$j_ zzti5jwCFU78BhAombrntfT6voV-D<*w*iO+^1%*VP1_U7icZ(P^ zj&M^*sck*bsJF+~xC;<0Z|giZowIRSd+AN0>}%aqqV@*xzk&Y%GSURR=u|x8%X;`q zHmd~~i8e6HHgqr_jn>ykqxtg)fBb<(Q0fS)znI*W#9g}4?Xq%RbOAz>w>_& z(1*V<@HM5DTbH9E-ppb_dAmeH6~Rjfra*lq<;<0WUM{^%UhR+PJgr^2@K{5x zT@YP|RZiP+o+7Szjnh=qq$?gcp1j*hM=p^}$NWu;@})yW8LsnbFD!jRl+ik` zrnkFPA_$^PG{lE$~ED z_q!#VbXrDKWF?JhOncH6u$5BXxM*Fzu(HdmuI^d3GTOYd-L3qqSR+1L-u^q1DblKyoOKX+mhb!Sk25<%)@V= z_61=EF}=aQPvbpQXf3@&;aZZ&3}j8Js$Ac)Tw;!+_P`aB-b}zEQ`cm3Jvx=r5wVeX zd(+Wq@9M_x^}WG(>P`Nt(%H6H-ZwC>r!UeNwNRXbO3I7*ar7b16#;)u+&Uv8si3G> zH%01=Q=*wIOe$Dmy|U%yie&GK`oscz_|jD}rNU|x8$FJ8G0>K_sCXGK2;Mo#^gxYO z{((IW+fmjKFU&(IEdF}imce8+(^r~j4LY>i3#v4RXnR&+uh!~9fl$X-!%l0eE8Wzz zcv)wmLIdO)$U5U}8lc_6uz(O1R7f0uj?&fNrm)CGr?snHTZ^Gzo-GhUz9RItzbVnu zhvoOk{{rqT+KHRMAF(18n1xtY-ca8Tx8KK0s*{?eGA1sve5~pMReLa)7x+|re@i^j zG?WSVwB$?|Ro90?VxnVCN8;=)p1$s8(`o6T&t)}QOtx@SI?$M~S38qp#$|G7&33an zP@fn&PVK3aY%%C3j_l#L!e>z2YY?cOfSSlNe|$LBh{g!IRy_8`HBo)Uuf_Y}!lhi;A-4M9AD}I z?kszfx^ws!GDEIiEt|Mrb=}wAxLdgPX1w+o=_-AfEP{00P&z=rRel)XYQ_6U>`8Ns z+LKB<1XcgXr(EB zZTE{&yGF5WzweuqrI&-*hW_T-TTWJJEPC?S(vL`MN#EEJz`Ny_(FZr$qBf?A;*rRy zkr{y>&y&)#L~xcuE>d{YMII+-md-xAbT;b)H^#Sj5&kE7jdpii8)hYd-?R8ezKVYy(XVNHodOI_iN*4NZd`KBqh_aQJ9P*D zJYLW{ce8gclU@QE|9O{Cyf@1v8J=V z7T;UXcXRLZzmUd=+R*0N+Gc&y>rEuQ-XwpSHz{3%zgO^fvR)7&-vZ!ok4?>VAgG%L z#wkxTYFAn)?Kjj@4zeC{*M_auaIM>&qvxEv#%-~<=^=>pcJ||oqz7(D6H@+Zc`^3@ zpk)3L#Xl_IVxER1r8wHO6v@l$LSHtAy%wHVYK$tKPifHBniF}ql3(J^sntfKQLV04 z@JfEZpfI}pdcfXAMo1X?%mln?7>~fn&r6Yg8l3ADsrHOrSa}2YoN=&!`d>i*cb}{+Y$Mt@}s!l7m%8<1Z*m~Ty@I&G4dB(ONh23 zliBD42~wBTvzp>5d=QfqKB|X&R*e7~&U`eC z`J-=-0rIO13qDctFR}1>wD25o!pj*>==Xz8gOYy#Xjot-K{Ngwr9{k^Lfx0;%+RC$Ks_& z$zTY;dglX?t0E6L9vr@k8sc}}d0OdWat`BX$Q^zG#*NA^gJdHi%sDN-X~;EH3~`8F=HcKZ z8XFUdro(@Ss}pkT_3n@*(L_{5l;K%%89UL-CcQgsv4q`vdMzD@rVNzdmw&Ai=WFK{ za4Wgvxsy0^r(x~N#Y26aZLNiL(4mtlL0}aNzhY>Sqi+L8-!i`u5{f#rwtRrPEi-qd za>u-W0YQ^Nd9-CPk?70WWwO}x74ML)duK}N6}jtJrH_btnUDw=d=5R2b7}F>_lN%! zsFTT(VjwTz*Fye#cPUN&keJip_czQ*OrJ|HO<#S{c_l ziFDos^x@#*x+s;8!!>a$LE+}!x17gR_nCVd^L}`n>atg zV6H|VtCR?8!PjB9A+&+8!Y20&*m87hE^SX7k4$mzn>&OiZW@Pa$MhVWoAS{Iz7+jdBYqmmJFvg>_?Awi zVso1LhP*Xz1-cqSR!qA$K0fg{{_$LiBbRR3vUT(3{S$ztAKt*7f(0{aihG?JY7{7_D~1 zJl>{!N6a@E|HMN?s(X$OA%9|dO}0xfEi%gZ4%QdLj@@4+K=>Rk3lat@gAeuaZcQ?by>9h zPc>FkM$a3os&z41qG9bZA2bKtQ{Tf@i6g^Yv)c+ZU@*kyn6f)<_GkDnOZ}~decuLJqy1G+&kfRPHRO}v zfaTVxPPfmG5x+in>zZ3u-8#P3oAF@A@=&Zl@9RCRvMK zj`sCz(B>kcn)xFN20M+l0jtH(+2(k`Ix@VaehGi+sMcS)?0xXTdeGW_{vdEQo9B+L z1kqVrezVM%ZSwmI5tB^j%h0Q+Np_XhFOxapMBvxT`=iCM(HN#F4q=lC=l)3q#I7BBzC{rXdZY>OsxfokDX0jdN zK*&X>!(!4Xc#g`&X;_Pxy9`CBOlIa#2d_MB8hA7LJ@n>ovefwcshK8olVP*LWLd{= z(@~5pPaobmxZrm$EgKwMHa-q*MZdQk-=kRr32NH}y#_+_1|rAid1@3eY!}V22zU}* z)RPf-FW6v7Vu!DuiGV_P@H#U@KxxNJpS0vfbZXIzNLUV$;I4=S-Y0eK@Kp%IZ-j0b zM4vW7PNtzFTaZ}-9JIC+qSbQ3a4=0=|4vr09?qZ$7GzO**Z)C!taGwHKl;Y0*(Oty zVT<9h7cA?^HM1p(7>{XPkSJ+&b!|nW1WG4SD84d-V$f_5x=xR{2#p!Ys5~H6x!f9Q z;Ps^+klvD+l=hu**1i|lQ@P#Bjl<`^2_vI~+?LB&{)f3C;N=4itxQn6ckgaK|9r{| zLuj{Ux?Lu>8st`aLu82j1&#KR?fd?F{fqm~qBO}ZMcvb3KL)ux+KmPERHqZ@P%6yv zF9f%;GU5t|`9fZ(1avFjEZJVSZeC2S@Fwb9u9(-Nx@!tUy7i``>s9dW6RR=EAHpje#WfdIpdsp~=#Anjusef$mjI0)-j zb^r23owNE#9r;SYj54pyE=gx<6(E8Zg`vdkRs@z%QYcy#Gk!S2sl`G=RI+gKh+N!t z{<^$Y8O}AiW9?O*zM#7{piyaRyXVLJtuB>Psg=uRI%~Df;PaDEIJU0P44WYh8zR~* zb~1~C8VOFNlIM-7L`bc2+Z+vQ{`UGcmn=@T#m(VRIAlw<#hMn>SgO_Fs7|}XZ&Imr z{YzJbqOtURYK_cGnM^~TinUQJ-5~~5RlGo~*+eLq&M-LwzXK*z8FHD$8B9tk&H$%k zI?RA!I$Bi!*R*t|?!)azMgy)!dG=jt`Rt0!S3DVJV0qeCwlQDzGrpo^l^yx~EN9WG zmVA1x|tOuOT}jgV>xg^Al-;2(n{d+dbhd z9iBvxiH{%t&JLmNG~k7B%klFb>Qh^r&9erOAVuE0q4dd(C?(~G(B9Tcdy)+*AX^0! zMP%z_>9BKR_k@E#@aYeC@XMt3YDpuTC!zew+B4I1D`n`dQy%)#y7gbeEWm*$pG3Q_ zl_%KD#f*)wYzSC=OQKO{q^{tf9Rp9Pv{1ZOWm0SGswyug zbGGWV)ySiSS@En=QB|!;+gu(^b(KYB&PY5#=K%@T^#;t6sO~qZBwcd!pd+-25DPzh ze3wL?imcfIr}Bt1Np8CHPGlm3&o+^J$RxwxY#9TW12#nLech=#GEaAkoRFQ$^6e5;vFT%C~`{RSS zQ39V*W+9C!;zo{yDEI&|rC>o-xJyWPh`Ri-g{`7e9-p(NS2t)Vj{Em3y=Gs0aaU9> zs~b6~!!X}GXOo>EIW=IZi~1JFMNe)1s}0_G_4QgYKd%_>%(;8!Ydf3k&2H5d8c%kh zkXumi5C)eT7a>1JWpo(4LEV*Pr#qmzkQeDRCA^K4KeW#|Qxi+0- zK8~Cj)iYBPmlRe9+KH^FfB^+t| z5y~HwKjd#ij!p#g)y){Ux@;oiRnq*!XmmRGkBGn0PQ#b5=;5_V;vDzXs=*zCwruK4 zspD<-`>j?HNt?0moM+C$USFMQw|8;vs&9r`wq#mH>#IY{2AW-2alAgE%mkL#M1+vT z8L77T$;Dz%AkkCjcBWcF^(REPc;}`Dccrgx2zt}~qhrIK(mOiimkcdUNNlnfYD7Zp zNH&H{86)>_Z!(^!`0r-$!kgd)$_99@f=s!H|0;_USMoDxH$zAYEfoK9!_t!z{>JN? zoY}2|{8u;s@aY%Ny8O*&4lbd%A?26w?&8Y3EC)r|&Lb>svjGpGr1WaDvu5ky4Y$mC zm2mUPFu59iqH*miDo+S9os=*ni*}gQMLWqRh7!!z+8bdg})3 z)|=K>Q!$B*R*sKV<`7g&Ce88zW0LoMU-ncE~)Y9-K@UpzT zhMSsAYj$Jaxcur{gtkwAi09>p(dQNDa}IsBQ+tul-ylv6`-}=e>WWj_7q**{agCCt zSkQT$erHgOe7>X3Vr_S{N@bA=YIKzXCO2#1O>;7ZThB7OcZoBd_3!c;&ZJpX=&nP1 zj;;cdO6s?oyPEu!oXT=9ywuO5Xhb*IguPv2XBJ9~sjIz-LfDgv1Wan9UL#v)TQJ~C zgu_e8#^!-VCrJ`u0Q&A5 zG@crVehXQC3st9y@Cq77Eheaaad`Bu!-wyp?R`-GHYxKh@J@qh&+U@tV!^Z1IwU6G z2A!vq6maP5W?UlORB65HB<);X!y@~|)zKD9(0EQ}M~h*eaqTkGV@)%3Gp;+en`=gnzq-9@S)W3T5-0+5^Ms79e&o-K>b=4XN zHG!bxS8{`VKi>dLvkrJl2AnFYv(*{t@ zDp`ujX38@o=;X)X37QkEm0~J%G7~tHJYZ&v0H;#6+~b=J7icdqoNxHLVVB_?-7dpg zem~2dyKr9T+`+-Qo%1Nnln?)x@!@Pc$QW|+dE@_1Ou+7YmJ~kyAt{z1X)uaEE|2gn z7{_jIDR8u~ztsaADPfmPMFao z=4z|mYgT)rHC|_JCT0k(TH0a|YkZ_m>2g~f4L+JMpqE?SUM(c}?0D@U^m}KV<{DG| z{@M5?nIQ>;X{kGAoEp3hbvdR{A1?`qhC zYsh&eBm~X1ONKo(CQoxB@sHXnP!Uq#y~2{kqcW0A@QG{Pu9(lNyjiuN$;5o(TurW@ z`oyd1)(ytg#5X<7qk=>1(lE@oEB&;e^jgGc;KH547ZPAz^%kwcq&lT~PIVcc$ z_@@k=KcI6~S6AyTTDwXoqrpy#;~f6i{W=FqHC5Hq(M~Ee2)7JvzAfzdf;oQktT}#R z!^|9ixy+r$zeJuC)^kd-3>Lt(v@PVN{tb5jw=e?81D=j)QWb}evFL9s1~x-~XUB-a zP>6T->+^#fJM+uiv3?~H3B}~f&Q;qRH3?sBs~~G_^Eq9G4!IDm^JRi|^@^{qBKP*L zZgSeQ{WYm(hjB?0R&HrzmsHneYBQ&2Bd(+_P)L+U$-U?oU&eYISq)@_9;2YT-)La# zN(fRQnAoAI5SWdO6qS5}S9nYNoxk?I;w2k>hd*}x==f)NW8@kv=QwT8WqYwq=kB`! z`|14upwlP8*X=1E=CCpnuz$O}ggnCkishMx=z28B6hI2Y7y@nDQ~|8?lgJ(dN+5if zdyIiJ4!oR=j!A#s@O^Sh4Kj51Yf1dagzG6T5yI~mo-!*nU#JL{92SUcPdh>AxlKN zBOn+xgy#_p^yE6irm)9IOGUwZq|g}hnwQx9nCw!k>T5Lh{lg3U9LrDXc4-{}tVpBf zx>eN;{li23tXS_9O_0xFu8I7SJcKxCEyop^p>ecYgjQ-ecJX(-HHnBx?;u;0E#0n6 zGHx~4aoyVUMdj}yhsY6)_6?crCYZc^3!g%PJsRm7f^~v|-i1IFXdcQ4Gd=IXKE}FL z*btaa!2!p)7;1n++)Sb^H@0>ki2tbchu#}|=6*f#9Jy)fQbg>=$IovDObvLyfyL~q z(3}(pG$M?^H?ZU%)F7qvn_AA_bzbQ_7FIwBKFu$je#gv0d=a@d(6Erj0~eLP%g&`; z=j}SbrRgwzi|3-{Z}55kIY@3L$EmS^q!{D#rH@PhB+7Ho-L;D}m9~;=$u*^u9(m*u z3fC#+)%<0k^JIHifjBg=$kfO7cH$AIuJ)(AIY1!t7xC<)!!i zg_zBq?Ffb2Yuxr&!C!j+@*R%Y1w(Bo4rjB&C$DD8H3hSLjNy`fWj z3gZKb%Rh3W6P?a~7S;?T5(8@rSJ@m<(OKU?ue%r891hz;e9wySIRH2K`^fj~SwRVA zrfGptxGZ`r|Ewip4YiGALyc*%O7OOC9CXfKwzMx*Wi&T-_K9^XdgEN#8ub_qo~YFt z^%@M`sP)C{qPCFU?$Oo^HM(VI5mR!}#G3T7WVSV=^ENIi9#1RTq?c^;CE%m{2mGu= z|9Hf45Q7((4-yCvAt3N84_``JCkQve-+uU~q=w0aQ!pQQF=!K5SzdY)jRnG&e2*yZ8Zn% zL$SO|p=i8*5tbz)QRcMQwWezM7NalaCW_KUEFg)Vj`6LCVZH?WID&S6kaB*VIWJ>fiRabryPP4`Fmf?=hPc4dYwk=(2^>J*&BB`gB~}s zFUOS5P}<2K)atcWS}X=uTUBk4KMokB9gQ)~>;oH>Am0{o5Gi+P-dkbvJ)$m+9BI-3u5_uO^jlC?{aM6#;% zS7KWA_S>ba2q~4>v5oe{g`WnDGhHtz#gpk`&k&}|XeK;TJy`-g0Ux}}9|E0Gnw8&t0gMP26Emm0K`eEa3GJ!w0 zv9r1>6CU=TpS}9{`mx@m{KPlsxr6g|oU04BX6iD5mcl%f+c2-G(U&a@E|T$L>xvdi z`=5X}<%~CT92e{0sfSNj`s?|M30z4lQW9!DGI^jZ%I)*w+GOKEa^Z+dp6*$e(-^Ak zqCI7aY9rZ#Khlvjs^<|$vaw2GFgsi-mwfvPHQ#SvUT_Zdr3N}$MAh6(*rXk+vYR!g zcxO$9s9Xz@E>}1_fi>u5EO%nLHCo_FN%;orFOd|3$#i8A6UAHOWQT`Rvw`L2v0HaQz(OZiUEVqle5S@fjBd1z2Jzh{5VPS@E^mcyTP z(j0!R+C1My8senmwXU6=r_E#okH%@Dt5E)9`3=4vi`iU=wAI2dibsPkrv`petSBvj zm%L_avjlj|5gLAi=Le%Uk1EXWR@hw~NsYP*3Gm55Uq`;(W>Qu6EL{~@)z+RTMlp*d zc%G0asy&wFkJ_W@UM(hy+|6C91~zs2ES8o+leoBnro^XP3JYmQyuqWnUtP6&(!}!} z3p7sZzsWJKf9CIojE}EoOZ`L$z0%QWjL?n}D*0i7A}}H! z@L171tRLOEurJ^1cd1m}n=c>kK0XTnWi&YlOGtsf(zE7<&_0s0k5l+L0b^%ma}RE# zv>qNKPxU!f6m)GR3qY~8-AenuTdbp9#}D|_RRbGNZya;q`s;Pr1i&E31V>G5Q;gvp}P)U#q+n?fBy=va3K z7Sh$uF@=_QbgeGx45h23RZ`8yQ2_YjAh=_6IgywJKFVyefIqnT5{odS@D50`2p& z(7$oeh#j>+ST49Q>29wNhWpmGTapp4s_p=3 zjpu#U*+iySuT(k1R>WoBN`y_>h3)M-MjJGC(egIYMCzL?U4^cJaASn&pCx>hT+3eu zPMe-TfNo#H^1q_%X#N-I>s0>FfU=P<%w2!|=-hQ-WIA^p z?fndX^a=rfH0GC1ko;(F3I8H_Q&{vL=-l7@Tb(Nm{R^Fo@2|zIphvg>-@glX`JD`& zB4>lj`wfc;u=$3_tT_vE`enyma_MoG?LBVK<;Q(=*^0~X@ABjJ?mZ5#0&{WD9<@U? zoD(*D)dN<8M!|AXj>^f0IS(6=xub=A1m^IsYDBSy9t))tW_4&n+jj$5Sl~4^fzsHSZCC0XKRF*rn6(zj=1)cpMZUXsLYmZa7N$K`uX0|0($Zn zU+IAJ6)&9r4c?Mj8$GeO;Eef47Smf(Y%%@xy7I0OtSe6@=O83-=@l)}K;7s$bDj;h zF0PfP70nBLc`O3UL|v-_NavzwMuC#l~5$6BnM|NyEtl9MpI>zm50gO z;uXTGFI=M0CT+k{n$^eCX8L#y_v$grujQcC04rOIjeLP1^gR;XwM<+Nb{X$t4rULnBR_5UWxZ{>fsRC@Op<^qzl|II3D3O|54 z7ctKuVt16ruHg{sI7a!k9AbSaN3I2LXXBA(csZjRr_YsBJbs&%zXxi2owaXc^{+jX z)o1p92W#gZsU7)|@^8*6U$aOm$J^K+jE=WdzZ>10?&t3z%Y(4mX#bz2G>`Ec0bC!m z?_$af<=1lm!|K0{atosmM42$IcVqIG)@SQ6*>|zrkJ4GsvC1i2x3hNG`Y~3&0~Kkx z#G6t%r88R2Pt#eYKa@A6{#?(|g=jqND2{)I*=}@wFZRWda*${3$`gVOG0S*^DIT6* zn7uns^L*d)zS$e}xKH!#AO{FHy-N=1}$>y_~`8#yDexkk&S5*T{eBl6hmQfrI@X@T zOY!MM`^(t9(oCO&4*25$C(o$_`dq~GF?O%k)B6Nv|Zrk8iPvjQy4UL=6K$t6qbe( zYF=ZqYt>zSZYozyx}vVvFaGy)8lG z@^~AjgFds0PDpw)y-B@_Tr|B|!5==mTS31|7c(8T$j+9oRwcWZH&k{osKDBd^^Fp& zJlE4G;ov>Q;OSmTK}2u>Blj+4VbnidUQFnE`yjFbX!$@LE0^}!VlsfraL51xA%psC z&kDx7NmjmwyA5Yjy1Got=a&DQ*_j%e*CA(gpOg=W|;mz;9%GNAPszMK_g=B$unjKYHYHO+0m| zr62&N-zpYn#rBl;^^kOEtXNAk+ow16u;pvXp3SK!a``@#(|r+WZn0DzgcKv(AYx!|V_hy?|Ht+cq;rle+z<2)HYoiDw_7o1 zF?shUiz#Y0s87aQFm=e?ct>hWATnsZ3hiMJt_M)gzK!yyI3>P4RVF;$Gi#d0J|-_o zG=_4zufa4;evF)Iv_q{;{+FoFb8o0{3EA@=e+y_LF8RChpmy5dg@emTkIuKz=o^)Y z)9bPz4q1X8^$8@Gm+rW-jPAJNz1Db*ZaW*$Kb|ym6{?F~e!f*lDe#&5W0N(<};rAn_0NJgpr z1_rYo_32)6L5>DhX#I~^{l|cSZNhw%QyW~#J;vR^#*^8lf{5}s%6YDT2Tl~%xH*^E z>?T%z9TpE9DX02hD!={|sr)_E=UIJ8rd>x*Xb0uwU4hn@%CCpnj&f-)GgjY&0_qb$ zcFmMiJ4h;jlCFrJDW~m7<=1l(9;AL!xg+)G#uKIXB|C`PSp^heeQscOIkl^$@}uo0 zYVWXevW(iv=)Ytq(sro6LObEv<+MI4C(Bw;4tX#I8BX_Ha$}v_2rO$vPLHvIyOw4g z%#JFt_!dH3M|NSVr9=mrLDLaxfBMBMzJLG!utn3cSBd}P|Fm&aWo%zzIzk%TYt}Q| zFq`-q=A+z$0@#i}u9U;}d5zVV#_$>r+F@pFsqHS6UrR8%QYn9g)elnK!lwVlG0U&z zUYk`;{Y+Y)=dRm%_Yq*tGiXsx1Gsf|MQDz#A_U^WV90m~z) zyuz|O4)TfzkD;G*AIy6(&p+MHjWj+2{6IfrriSW&+79%89qSL{t(#bVBW;JfQS#L) zJa>e*o{)TuO8Ek`Lup(9?_R*#muQp90EsqNEU&ar_x)nBLE`BZy;8X(14dAv$^e0T zoclU!NAgW6TvGksdRCw9OZiuU)|X_-7 zPh0&#cYauIWBa{`G(+KE#|zBV==nDr!PKt#H?TVY!;ND81&rcZVK@rXOaxYbBcrP()TjF-2H|;0 zyOeQSbP`6iVQN%iruTUdW+ee`D=PUt77o_x$tRq88=jOe%~lz&nCZ+))) zQP$5_(C7h1=QLHGy&{xZtljLth*`5I_tiU+Aal}off&pojVCzMO|DPK$V`yk1V z)Ti=Lsz1$lw0@l7lhy}5eXJd33p~Q)fFz$E<8GntRLZ}Ec4)a0`Qv-Jx|#9|D&+#? zz%{Hr7ktP^fM++=;a{YAh3QS15D~x%-RU6K#b4}CYrk+e%42)l{NKJ{hf0bYYOkEb za8G3t#r5KHM3Z93^|=|gscp);6F^^C+ZKCEpD3!w@LF{mXteXgAPj^CM8 z4jZddzgzM_EA4>3q;j&XeO5aHY}QKs{xgo0FQj^)Qhpb+$tbLg8LTwN-ggXGj~V}n zQFo1Q1O6HKKfmuz9roRkH-*0lFGp|3V{-eo{u*_ggsda|uBGy!((e`XQBHkWGR~b0 zx*x?lS>&bATzr&ofX__tI9L_Z-<{m`+_NM|y2%B|i})kXZ zgb!sVS*vV?>}1(K+3m8oIwDJ>c3azs!pwXw(76d_0{9mXH;KbeNXkv)$doouQ6znnmL+vny+Y{ z(!8xTX$#sjwBOTys59vbx)r(u`hNYWeye^$|APKqgUqniaGv2l!wW{C2|4%_j3s^Ow!vH2=V&vs`a^&RS&+TI;OytgEdjTfbs`()xRrG2OUdi#U+=j|Ul6ppB)(Q$#}YR4g`!P)5C>3q)RarL`ayME)I=f2+k1NR?2 zyhr01^-Os7c%JpzyyM;p?@iwOyw7?6=>5Bo_j!DEzDs=1`g#9|{{;Ve{yY62ifOS` zoG+d#ULrmpa0QwJTLM1_I)X#NWx?k|$wT2??k>Ac{1|zXd&7i9g41qZi=27JukW^dVTcP=-ttWqfbR&h#rc* z75y+)7i*5Kh^>pA5IZ%tGj>62PweX0O|hrrRdHK97@vq=5&ug3w)kZH2k}Gkx8ffr z_=GOeo;WpeDDhU}!=xeUNyd})$$I^CG=O%JD6rnjU|OHZV)NPi`LTY576gY?ts7t^n% z-%fv&k!1`SPbQA3q0Y?w%xGpqW_#w3*(KTW?AGjA*^9DY&K}6#p1m*oc=oyM%h}hn z?`A)(QPo&##F}(XW6hqL>uYYU`FYK!IaSV*6LaZYW3D%MZSH1?#zE&7_WmT@utwkd z0VfE5LMiw1@LSK*^DEEY{6j>uIQiFvFF{sfO)M>iNV$#v-y-0TPWp@cYq%u&2{(ry zEdQ22kyG%OAlqgOXXH=kVtg&9<+pKFd?(k$KU{u{|8jW>xe-qO9-J5BsKIfFv-1y> zr^rvC@eAeG`KwUoFHZ?8aQ-QdPdFEUKJFEqpT7wA7off4(cWz+zn&Wr&gMq=C(A#= z|8+9LpH+T^_oB|C^4q+*{3$(`Rz0bKon+r(oZI{regN@n2-{2k>F2=d;@PV{|e`6cpwZa#l8 z7h~;wg{xw1K8*gKQT_xnb2-ir17~Wq^)$xd1B?~Vf0J8D$A=6d*FInVF@=xcS$>0i z7i)}v!ktgP!Yw1GAYc80@{~+bevDkpolY*silWi-3w#qjX|FaJ&S12yOgzrvYPs^EU+|ut)_k+qE z3P^{@$%6A|`C-`o} zvOoJ5wus;gWkWq|E6X*bS_&xk6{@MB^${O zauzuc>u=rsPcV!5TOkUo>D$5&gvZ687!`A3v)C)%iCqeUfozZu>Vu}BHRuZZf~nw~ z;COIj0xlyS;G6`YDrrKZwTwNrIdjZ@8215*p8hNc!zZJgRVwPWhssf(xfPF*#1 z>(qCq?wFdKx_9cqsYj=NH1*@DpHBS@_A!MsfVrP$%yo5f$6>#g)44Oaa{$3Dn615= z`yL`cPa+onEBFlmzm7%6F9Sz!L?Ixj5F~K$NI_KF(bEHTL_hVeeqTIn z`?U1wZJ)v~dNuWG@Kx8V##fcUyXALZ`rXb$-#T>Q(3cPGJGA%EWrwyOT5_oEQ1dG< z*|*p?+c&}Q8?Yn%V;{5k+DGm1KkOb{_0jh2bL<`Xr9n8(_KnK%p6ySz-{82`c0Fk7 zar%t=0sEyt-(y!a3N^{D=>3B@;1R?3<_HXR?CyUVes3oa(;9@mL1>-IpV`;bWnX+I z@QBa~`(;fRWl#EF>=TcUC0eX z(gD}-&m=65fnQg0tGLyWJZrgi43`v>6gT&mO_(L@K@0Rd9Q)3lIMYA(LP8y! z~i%7)Ln2Xk3yW-_qR6QHH{=&YpMBjPgDeUF)#@hmjS4UcXdyT?Xo z&CH}MJt?Fntv#dkdy}@Fo=OF`xIvtJe0Wk8U2#vGXnXqB_f0DLMgx;VWNhTPQB-#C z85Jjohf&ly<`yR#=~d&{n0QdCjUL5ORJju;bM$$R)_i<;R0KBmtQ9A#hDXOyBGPA7 z^r}Fw3ghnav9U2Xur;aaSwG2*j81Zcv~mFV?!iePz48sNebB(Ir!^jwbL+;&Hmn_+ zB&o5n3It=~2EY^Q9?MM1(_)`EDT}NHOv;|&(Me^fdr}qZ#t7h*@yw)xp&OVGHyl*1 z>lW!l3a(q~KK-2(#{1S!%98;+>=E~fd+@D;Ie7#aS~NO7>|Q%EHX0fWjER$-i%0Ry zP4QCcN@h}-o>cdw?tu7xlrBeg&Db9!*m=-^_h&>cXznU!182RT#E($Rw^Q_mz>+dXMaQI-Q~ zbsyBz9|L|Si49{RM21HXQa%K_y7yp&@mWJM5W;KI*PsXboW251rccKJ$pHF4fYPG} z>kEePAl9sefaIP@uKgbD-?wCR(iG|z`zCcDKWzvk*Da1e;BesoK}6K3 zyStlWz=CIF?LmtwHMuwC4uZUGfYF-DOxn{22|YW2Z+dp74+`|`N*|QbvpaoIPS2k7 zK?OZ~(+8FG>`Nb1(X&5&P)*ONG_WDze^N0HOoznmBw0ndB{P|x_0Tr+@D%A`X4b># z%)?WqhhmzW)Th1>P5^bk1S*AdHhclVC!$|Lz(>y^z(>zvz(>y!z(>zfz(>z9z(>z< zz(>ysz(>zXz(>znM28q7)uhGoNyoSdp-09kO{~RvGD~STm!7OiP1b-PYrzTwpx9$F zWN2+;hzj<9Sp(#lnf(8XI}_lziZhRQ&#lqS_{0V*>}O=SdN5v6DpOkTdv(&Dx0vIYnPRc6S9EWRM>#I3?d-`L192cvWhce z0YjWrDzm?@-y2=F7D#Q?&eZq%dwuu+`(Agy_jSKlT@dlnh_6vJuB&R!QLnzJaXX!& zNO8dsct(q}u-sZ?YQBiv?0g!}?%l;tsSL> zTrAP0^SYLlS4^&%*Tsgu|2-;--9q$bh)7Mk!m6;=N|yk%>kl7ZTe_AmXgdQRy)Glt zQmrqV2*S(hyC!u_CYp!t^a>O0Xh_v{71z&=9j+*~teV5*xng)UtHRE&%U4=gh;4Q4 zls;w6mhBIEEUz`?LC;L@r90}Rrw!6+Q$95)ZQ9x8L)ybHSFS8Q*B+HT^*dWjySxml zbatNl=oI*!JLn%qrioHD`v20V=+Y^rl+Z*waZD-XcY#8vh;+$5IuV57Md27hM%08H zqcU1aCEOgHo^-G*l%=MCg+&d#GaW2SYk+CxKu}kZ&cw2sO4mxEBE?mOFw+hlSP+3oWD_n%~G2_2pg5=MIff zNK`1Wp}cFw+{37!=-6Sd^wH{uKr6Z`sbZsPvZ(P)8~G>`v^u-#qRypUK5UD18q`#N zG{{&Z+HW-fld1ID3n|!NqQ!!@^kX%pOQ%d9qA$~TIQ3jh2fTc40hM)}t>9y#4lYh> z1|V1u1Q*$tJ+l+8@Cg-Ni@D0L9L4`CveOeMbS)vyhVrguI2#4UM&P!Z7=#OGZ7LUq z?%D{^Ze6Eo=Yw_78afG>6;s|q{#1ZED@(1Y)>*2P; zF}B0)DCe! z2h%EXgo#NUVRlIzVcJZ+8sOSZy@ZRKdI|R#Q!n9mn|cY?Vd^E^9#b#j5~g0lCBe96 zK!AJAS=Sl@Zn4=~*pz@S(Yoq5OEcEON}P<%N}Ns;M*<|yJ`%4S$aTLtGbs+(tfV+- zvl9If`K+|F{H)DNgwNTmMEE>$R}JKMt2s0IeZgiW`fWBV(f^8+tL*%4w^@mBhs{ca zJBhn`AiulJnaS^qHY?G;WU~_eZc?tc^ZT;RN`%8UD-r&>{8+J>*>?G+9OI)tjodUb zmhGsU+ZBj)xo2E`pfI3g0llj0sAd%XXv}Pa5r%Gc5_xHXFm=o`*g>YqqD^0 z;lOQ5d)D0D!VH--+(_-%@ldtvay|&;j?DS7&fnGL`6{Dx!-L*dpK6fBMIZIMnEkl7 ztJ_`wfYtfCJjh!y$eE=3)IRK=tV+=D%DL;i#Ct}c%b(?oC{9}Uc>N9c`21A_U#6S6 z)a)OtQ5>E<*4&rd{w|(6$y@*B2Uy&x+q_3jXN`i*dsUbf1vZaehr4r|5Aa;-*A8E# zR;oWbd{BMJ6A3#`v6}9h=kOt(;cjyHuzKDVbNI-RIOEl2?uGKy(o;l@?qi>a&1*Hs z{f@&k-SJ%F@NTuuGvDDos?KwV!+X`Go}W3qPp$HtcKCoQ^IqogMe2~Z(cy#oci#VS z_+nM(|AE7YRE0n1@L_#lV2Z;>B+mD&>dNX$t1cCdcks&m^@(&Qp6SfQtmH1Mc26u7 zZ;6)U+rlh3YAvd)Dr=ctwqUkZ-yTiHGtp*}Y)-XB6Y)dQOgx#WsLkw-C(_A;weH~F zSgIq|7AHzwvZK{npNV$FTdFE5E2~#9*jXzIQHREyCsFN~h2UX1SwphAE|yADq-C-! z#2ziPy?Z<2u~w@gmX5b2tm~7h-RZ`Tj(9SYv94+1SZ-~M(G06Gp57lzW!lTF4e>;0 zn)3EU6Xn*n_E@qtnTlCg$18#_NJ2is4U`*wq#-{D-~-= zwk6_5xK?{6vp2nb{`~#>_g6R?GoUaP$yD2Xi9mRJtfM0twOd)ylHBvr+GR<(@zz+{ zx-hbWPG>q+Zfc(F%+U5!d>=Zuk0gXeJE*Kt!E$Lwraflu?QBNjtX-*?QD$jUTg;#U zN>(D7m`Baf@RoSA!?b_M>3$TX!rGLyqM1x8-rOn82Z~!dz=B}VMHY9U3r6SswBl)^`$MdVt= zvdtD==w8N>{Mq=`t9HU9RR*`&DP=Q0ZJa0YKZGmgB{{30l#JTVnbbmjWJ};d9&Jj= zQo}aF>|E*y@1SFqI!oRigtSn81+|dYtsunyuQ)H)(ej)J9(Jxn^ZfXA5%4|qksf^mkwrLF-fn-|$_G`Na1 zEMmrqzu(k1gX|=H1AYn2KWTVr-yS153E4)B7(T5~3eMtDbc_;GoTn-I;CaZ8E>Fvp zY->`&|)VkPGP`Yf88He3rW-v!BaC32G5XNV<;B=8kvqr{cg4_*Uu&B|3J zu?sD*V@gRW;#4Ao8`ZHv76wn3@#I+e3{6bE&CC+4j{dNDI1xl9VCZ zBRVFz7p`1svuM{|@?Vbeb3WzCzhXombAAs~L2l9?%pb_XPA|G8cqD24P+3-(^7o9$ z_b=|oXO0uFJZ^V6jm3{P*Km+f_NuRHA1j?6=Z$iHbswuoKTv0} z4^9K5>FRP-%3B_$@(q#IY7Gii$3WYv%m_#O6)+{=3Cf9L+;9c+~m^-sJZ zd5j*bj_7gN_5L1<=qp(I9#mgZzcRMfw^XnCN35_pJyCsA{Z{phja5%}Y^MK>t+k71 z_D^DKY(`Q3RXxRfJ$9oGqH@x?KZ9!Bf*L++guV|IJfjXUbRT5b%)?k^`@|y4I)}6#{@JE$S$*(%^*IzQt?RG|@5hGxg8C&E;g?t$R<9d$qu6V8lU^(KQ+=hrN^cO$ zuimIP>CISMw_s(xMl7=WIq@S*p`a! zi&eBR@eM{>xQQ|Bn3i~|rE|}&j@SWn9&U}tQrrim?T9VW6!$HXMzX1{u3F@{%k1oH zmleghC)y*EciU&#LQi97DrursRV^q=#S?7<8B|u+FDu>?Z7F0LY)&ytH^GtCWG33u z5=&(4k~8s+Ry$-|duO68n(Exs5$&`C{fAtFArK|Ms`;mtz@8BPv8^KG>&kg}a?Z0OR) zF)gaDTI#sA=2b1W6}@Wl0^c?}QN}nNdbIV@&pK@aTQWPEYa;|68DKfI#PwSU??NwHUM1?im= z%H7bkVVj!RmWu6GR!1}=!>~splU7m=@_Y#Xe`G7 zU;5$=k&K#Q-Z8h86-_s??(nm?ZhYRx=NxC}$j^(PFQ3Eb6?|SHO(6d&W6ul~l6Z_( zpM~z=E0X^PbwNJTWK}U~!ld1rf1JFtq+_(+GPC|GV;E zzJR~fWkk$zFPj!0V9(M-dggYW(#Q2L^=qzbca8fxcZd54&sfhSPmTBczHDG-U}@mW zz}1240RmJOyuPfeL ze7N}j;>Xw@@Lut`;y;HxA-+i-niR6wDX=uu6xtBFIn)|TgbsubhrStlICL`fV(5)f zf9P!Jk6{(|g+t-X!)4*R@VfBU@TbDf;r8&Y;d{g14<8TzH2gyNm*LmKZ-viAB9V!a zOCyz$<&lQS*2s1~-fGp-F!}yMpxqJWu2Sk znH97wVGnC2dNd6vj?;-ada_=Gc9&+y?_a1WXA=e&q z?a>WtvTlObktU#~le3gClbXK{W%J#-f%2Q6b%bd(kM>+dNm<^j^^ST3Itl+2^fdGg z^eprobc(R&p%&{Swn{xoknIn5Wm zPOHlNNxpt_S}lcY@~6P`lv)iP!~Y@t9)+GD&6Bu4$NdHFub`Kq9^$+Ty#~F(`J2#N zr0s>?gFg#>0R5iubEN%4{EUttcd&m*pQYFk-OLQf4 zm71V8LYqmajn)=X%OlL6$Dy?|(b^K`{S(weTDpWaoXemi`8$}sM`+7fbZ8x1%7llL3&Z$eql-zDvP z@Mob9pmU`81MZ)Q_h&HGXh8rsh#NN7!U?X09<(frmSxehELzr$mUW|L-Dp`iTGq|A z(u0;|(XuRBmPO0D(Xwu|EQ^+Pqh;M(OL9e@;9BZISCD3KWu?VB51IZjn_JL#{ zNajGY4K&c;;`svMb^kz9w>IbEMQ0k{QJLBkIKS+tr^&6cV13z5f`a!85l=?xbAC&q* zDM!zCW`xf5gH*qxbNwLI4^lZ$$~pR$bM!5zmyq^)(Ao~|fNp@8Y0%SU>FKicbXj`3 zEHi}3T=Sx1OY+b1HIN)WHAr|h^cK_$NzakxSVgblrdRAS=Q4s4LQ410(P~KSaz+&C zy$YIL(CRt#k#nJPsFG(Gi*c7iE8veo55YeQ*_zxtYL91YZ7*`^MJ~O_(ThBKkw-7`=tUN1M`&#?vgmcR zwij9SnjTlQRWx-8@f#t&@2=NVrrn2^F)yuTX1Iiz^7{O5SZQ3MHsEf=-2&YX-3c8d z&LhM<1w9YF0ChtzLOq1N3cUvXKL55JqbBLgplR^)ajT#ugcYPFvYTdl`ZC_oBE5Yj z^Pm;XR%&<_w325+tC&x$hChb?Bg8ocJrBJAbwe*gJ%qgqy#~ES++OJSY7AHW`{?TX ztP>xDF20X0zOR?SH>$CEEwr9;T#TmdYBTz>l9s#7>}wv+q0lw*k+KVU$}^jZW&}Nn z`xNvv^bGVY^c*xWa;k}pa}z;*;*cB%XJey};lp+Kqh@u(V~;+!{QnObD)G_yL3{?e z;Vm3~X3saz?d$Qnpr@=^|o?1K9*+=6Y{U-ALDf)RDgu@!*|Y9}YZ)lJh6IvoXK?`|`a3 zhnIQpc|Rm`vf#;TB(qaV&PT+(*!Vrn)1Fa&yyN*pg2s_jo-Xhkim{W(rDg7={A>Kp zTqW+oQmCcIav`>ip_YtWv5VYg_9?lTABbH;N|2Fn5;h$lepA6rY$IWFXEz4RP8qV8 zgH2~5J;x%(*kz2g)7Tq!gnN!3@}I>V<56Ng!MtJ)&-q_rUh+D&jg^eXZxi=j>@D@| z?D_*s0RF`PN?yPHXLjEPbdYbDM%c}@8N0-E_Bzkfv(!%ZeO0NbUaS|ZxUOO3{|qgu zrLMLGM(SBY`C`2h%hM5R@F-=UWR!oJ5nlGKnO$qt<8`qeQ2zVW;2iduh}p@;E;f7j z8kUu*+8SmDna!TFa`u~5QvPym6;0SEuGAZ_Ol+eT%W0ojxaJ$X)>6l!CAOnSu*#gW z_rHOH+5H9rV$XRGd(#KB{ZH&Rqs7>N#0E2qR*HqC3OmYb_L$Z4J@&O&L$1OKvU#|* zgL3_5H<|1t+rr%LPNX#tG~^lMIQ}l~?#CnhN&G#aa|u!};qL;aX~=Xse?Mqljwa0H zUj%Bikg`b7Z6xRg!AFVz1b;W^{hXZH_Xqz9e-AjmPAZ;caeSM<3q;>1^h5q0Y&Yi= z-x$<saxKr~Ziz`(Sd2HagN%PeO>_ppWql@RT5&k@= zg93LL{5_`qMMkqjMxp_1mKF5PvLq#pjxQpo#ry+|luJ1-=Pz^J6(C!~-;Y+W=D3D` zkooR0Qa!{!fF3+TzaeM_44N+V;z{_EXr)F&UL;iTb)h4_z@J@`9DA4#hYiXewB|IW zzk$6oVD!gtaQC3aaz($#KVUQ}z`XhQq!RR9=IRQVt1Duzt_X{RdG?FO1ylsB3xar9 zhe0{QY*(X&V^qkI(8aoh(94+php-DyQ(;F=A|aQarTJ=tk&_FZodaK?D>%;A^NC-n zE6GjX>JY+GSWSFBx=FbU^+NbXdJ+5*X7XY5d?oYw)p|9@TC9X)(D{0fB4an&->AGs z(r&JUweTWuH&?`Z_^WsV739j;=t#YYYh*M0_3X?P+0W#vEC-!={9Rm~vJO%#&u$|> zkCC6($j@iw7clY*82J?$nQ0>@TS9Il6>TKpHZlkp+_k}78NOa-jh?!Uo)#Iryaq3?(Nn+CP_IGCYjm*4;N`)#&C^h$eIBEI zexq?-qibG+qu1c*F}hY{(DWFc@*7M82GfASG+;0d7@cC_J38evI>o|!bjoLRN;@c< z-UIx+j7L|ZI~)0H`qwQSS$E9wPX1zR&$KqY7O$@huuo{xAR>P$_dfS4El-%3#%B{_}C%7QsV%9RfL{@ycnES z!W^;c!5`X%-A&zQj$bs#uOw5g3H5bzJYtUb?M-yNQ5 z%X$7|m%H3?ZR|9CzNB)o#^JCN@^#1kn&aL}=+{9{mi7s`)Yri7Z&;D>6W;CcFl$Ec zny}Cz)_odNygNggYnsJe5D=o(`sj4 zMxIu}TFpLh`NrE@_p&l+oHNA{YS8(3Ykk98dnu<}7P&ugxFi61ukxky)L VLP|*Mg8Q|Sy941QuKhEm{|^Ahhob-h literal 0 HcmV?d00001 diff --git a/fonts/ah/ah-Italic.ttf b/fonts/ah/ah-Italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..89e5ce4bc785e9a44f929509591f69f3f4ff3caa GIT binary patch literal 43540 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 literal 0 HcmV?d00001 diff --git a/fonts/ah/ah-Regular.ttf b/fonts/ah/ah-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..c4fa6fbe19063e315ba204adf1db3cf10ee0d0b3 GIT binary patch literal 42596 zcmb@v31HjBl|Mf7m2LTyE$g%-%U|iM+md|9vV6yud?c|G+liCdNeFgq=YU+~;4ZY3 zc3BFv4JBMD+qC8Z@!Xj=V00X{|;Y$ z=R4mwGw;25^WK{`GhY~Ij8)^OfXV&qR}J9_51-qLd+|{Jz#yyS^^9Hr3Z9KaW25VT zYB_W_p5JE7`kSHk8LX;OP2>=B5`9Zewi6rGTHF-8*yO+rRnU^LT!a zG0oB0ix11@Tgt9u>@pAD@7Zx+=U&~ef2d~cf<27s%685iI>5Bdj{1Lw_vJhHT(;x$ z_W1&!6lQGe4ZG%N=FD5ahx(_F<9+KcWN3#9H=+IsJbQNSJ$&gi`tEwO;vJ|AJM^r-{;4;?;lF#RH9 z*G@84^!@_}=MVfb`RR`{cIl;n|7TXnnt{vDrAL{D6|oXl&MFx*xb!aWG8i-ljYeOn z(KPda$!y>s&fNIO;}1OW%>DfGM;?(LJ=HJWoq3wqWPX_W0dL^pQ=fP6mdtlhtA=$g z{7D*-?nZ59R>w*ovYD%O#geAE-q6w-Yc`vVMT*-Oj~UIe<^(S)G9`Fxyv3)uwOt>) z=9&-EwPj*zAe4EttR%^``VEtPAwGKdi4%9+~8>Q2q^H%TJg;GYIK)}f4^ zp-e2^qY+r>B(1*{cseDM5owpn<(~S`baP*qHR5#?O;lep6 z6(oj5S~EtCDi-Rv$x)EVOOXz6PAS%vYO~cjnv-5%ve{8*YfJf3o8v8;Q@$+|D_3sV zuyW7Z9kbhGs~bC0sm{*9!Oo}k zwE>IS@6hWVezPS|t0&&018magnUlr9d%sh^$a}(CtJ7$e)a@f$xjbq2lW8 z+tl2=sn1(o=xH7F?XuRGnv6A$rcHgm*W~t))f#G-<+h;J8f=sKBTbuneJBu%M#=}L z54O3Lx>fEXA8NS68fuf}1i>c&AF`5Ml;UTX^l@n4Qs7ovEHTIhj~NudORFSe8eX{j zt+`m{`?0zE-?&2h_^H{WM_=Mw&@IqkBPct7J~Tk88qhB;*=VR@q`zE3E9ASwr8k&j zIjR)>lJp3#XdP{~dfd%Tj>Nh|=A~`la)fGiy4q0fQ;*nuH5C>3c|K%8{E-aBk%7A{{m;>UsWL0Vjj0NrVO)mY&Hok4!w#=u{?=N!)Oj83e=gwV_<+sV7iI665EykOd

Ln0t( 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 CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) + en CFBundleExecutable App CFBundleIdentifier @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index e8efba1..592ceee 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1,2 +1 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Flutter.podspec b/ios/Flutter/Flutter.podspec deleted file mode 100644 index 2c4421c..0000000 --- a/ios/Flutter/Flutter.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: This podspec is NOT to be published. It is only used as a local source! -# This is a generated file; do not edit or check into version control. -# - -Pod::Spec.new do |s| - s.name = 'Flutter' - s.version = '1.0.0' - s.summary = 'High-performance, high-fidelity mobile apps.' - s.homepage = 'https://flutter.io' - s.license = { :type => 'MIT' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '8.0' - # Framework linking is handled by Flutter tooling, not CocoaPods. - # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. - s.vendored_frameworks = 'path/to/nothing' -end diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 399e934..592ceee 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1,2 +1 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index eafe31c..2d03b62 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -5,7 +5,6 @@ export "FLUTTER_APPLICATION_PATH=/Users/dan.cojocaru/info_tren" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=/Users/dan.cojocaru/info_tren/lib/main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "FLUTTER_BUILD_NAME=2.0.6" export "FLUTTER_BUILD_NUMBER=2.0.6" export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==" diff --git a/ios/Podfile b/ios/Podfile deleted file mode 100644 index 1e8c3c9..0000000 --- a/ios/Podfile +++ /dev/null @@ -1,41 +0,0 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '9.0' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def flutter_root - generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) - unless File.exist?(generated_xcode_build_settings_path) - raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" - end - - File.foreach(generated_xcode_build_settings_path) do |line| - matches = line.match(/FLUTTER_ROOT\=(.*)/) - return matches[1].strip if matches - end - raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" -end - -require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) - -flutter_ios_podfile_setup - -target 'Runner' do - use_frameworks! - use_modular_headers! - - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) - end -end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 5a029b1..0000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,22 +0,0 @@ -PODS: - - Flutter (1.0.0) - - webview_flutter (0.0.1): - - Flutter - -DEPENDENCIES: - - Flutter (from `Flutter`) - - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) - -EXTERNAL SOURCES: - Flutter: - :path: Flutter - webview_flutter: - :path: ".symlinks/plugins/webview_flutter/ios" - -SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c - webview_flutter: 1aa7604e6cdb451a9b7ed2c37d5454c0b440246b - -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c - -COCOAPODS: 1.10.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f58a5bf..4a5186f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,15 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 722F441253D3B79676E4DE80 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F72320B12B1F4015789BBC8E /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -33,12 +31,9 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 313F1E773DA06364A0C4F20A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 636963D381657D3BAEDC0A47 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 74CD890ACD2E394E606FCBEB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; @@ -47,7 +42,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - F72320B12B1F4015789BBC8E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,21 +49,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 722F441253D3B79676E4DE80 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0B24EBF53F1DCC708FA961FD /* Frameworks */ = { - isa = PBXGroup; - children = ( - F72320B12B1F4015789BBC8E /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -87,8 +72,6 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - A2E7A2EB20EFBBAC4AB0299B /* Pods */, - 0B24EBF53F1DCC708FA961FD /* Frameworks */, ); sourceTree = ""; }; @@ -107,7 +90,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, @@ -116,23 +98,6 @@ path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; - A2E7A2EB20EFBBAC4AB0299B /* Pods */ = { - isa = PBXGroup; - children = ( - 313F1E773DA06364A0C4F20A /* Pods-Runner.debug.xcconfig */, - 74CD890ACD2E394E606FCBEB /* Pods-Runner.release.xcconfig */, - 636963D381657D3BAEDC0A47 /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -140,14 +105,12 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 0D525F98970BF5A8EFFD825C /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 1B7EDCF8AB293318D8391906 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -165,18 +128,16 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "The Chromium Authors"; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = NF9A3KMT8Q; - LastSwiftMigration = 0910; - ProvisioningStyle = Automatic; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -200,7 +161,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -209,46 +169,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0D525F98970BF5A8EFFD825C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 1B7EDCF8AB293318D8391906 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -352,9 +272,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -365,27 +286,19 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NF9A3KMT8Q; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 2.0.7; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); + MARKETING_VERSION = 2.0.7; PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -437,7 +350,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -486,10 +399,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -501,29 +416,19 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NF9A3KMT8Q; + CURRENT_PROJECT_VERSION = 2.0.7; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); + MARKETING_VERSION = 2.0.7; PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -534,28 +439,18 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NF9A3KMT8Q; + CURRENT_PROJECT_VERSION = 2.0.7; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); + MARKETING_VERSION = 2.0.7; PRODUCT_BUNDLE_IDENTIFIER = xyz.dcdevelop.infotren; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc1..1d526a1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 71cc41e..70693e4 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -5,7 +5,7 @@ import Flutter @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3d43d11e66f4de3da27ed045ca4fe38ad8b48094..dc9ada4725e9b0ddb1deab583e5b5102493aa332 100644 GIT binary patch literal 10932 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 P-1+_A+?hGkL;m(J7kc&K diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index c1f234b..4a95797 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -17,24 +17,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion - $(FLUTTER_BUILD_NUMBER) + $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS - NSAppTransportSecurity - - NSExceptionDomains - - example.com - - NSExceptionAllowsInsecureHTTPLoads - - - - UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -42,6 +31,8 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad @@ -52,7 +43,5 @@ UIViewControllerBasedStatusBarAppearance - io.flutter.embedded_views_preview - diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h index 7335fdf..308a2a5 100644 --- a/ios/Runner/Runner-Bridging-Header.h +++ b/ios/Runner/Runner-Bridging-Header.h @@ -1 +1 @@ -#import "GeneratedPluginRegistrant.h" \ No newline at end of file +#import "GeneratedPluginRegistrant.h" diff --git a/lib/api/train_data.dart b/lib/api/train_data.dart new file mode 100644 index 0000000..1ac8ece --- /dev/null +++ b/lib/api/train_data.dart @@ -0,0 +1,9 @@ +import 'package:http/http.dart' as http; +import 'package:info_tren/models/train_data.dart'; + +const AUTHORITY = 'scraper.infotren.dcdevelop.xyz'; + +Future getTrain(int trainNumber) async { + final response = await http.get(Uri.https(AUTHORITY, 'train/$trainNumber')); + return trainDataFromJson(response.body); +} \ No newline at end of file diff --git a/lib/components/cupertino_divider.dart b/lib/components/cupertino_divider.dart new file mode 100644 index 0000000..2012a69 --- /dev/null +++ b/lib/components/cupertino_divider.dart @@ -0,0 +1,60 @@ +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/pages/train_info_page/train_info_constants.dart'; + +class CupertinoDivider extends StatelessWidget { + final Color color; + + CupertinoDivider({Key? key, Color? color}): + color = color ?? FOREGROUND_DARK_GREY, + super(key: key); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + height: 1, + ), + Container( + height: 1, + decoration: BoxDecoration( + color: color, + ), + ), + Container( + height: 1, + ), + ], + ); + } +} + +class CupertinoVerticalDivider extends StatelessWidget { + final Color color; + + CupertinoVerticalDivider({Key? key, Color? color}): + color = color ?? FOREGROUND_DARK_GREY, + super(key: key); + + @override + Widget build(BuildContext context) { + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + width: 1, + ), + Container( + width: 1, + decoration: BoxDecoration( + color: color, + ), + ), + Container( + width: 1, + ), + ], + ); + } +} diff --git a/lib/components/future_display.dart b/lib/components/future_display.dart new file mode 100644 index 0000000..075c117 --- /dev/null +++ b/lib/components/future_display.dart @@ -0,0 +1,42 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; + +class FutureDisplay extends StatelessWidget { + final UiDesign? uiDesign; + final Future future; + final Widget Function(BuildContext context, T data) builder; + final Widget Function(BuildContext context, Object error, StackTrace? st)? errorBuilder; + + FutureDisplay({Key? key, required this.future, required this.builder, this.errorBuilder, this.uiDesign}): super(key: key); + + @override + Widget build(BuildContext context) { + final uiDesign = this.uiDesign ?? defaultUiDesign; + return FutureBuilder( + future: future, + builder: (context, snapshot) { + if (snapshot.hasData) return builder(context, snapshot.data); + if (snapshot.hasError) return (errorBuilder != null ? errorBuilder!(context, snapshot.error!, snapshot.stackTrace) : throw snapshot.error!); + if (snapshot.connectionState == ConnectionState.done) return Container(); + + Widget loadingWidget; + switch (uiDesign) { + case UiDesign.MATERIAL: + loadingWidget = CircularProgressIndicator(); + break; + case UiDesign.CUPERTINO: + loadingWidget = CupertinoActivityIndicator(); + break; + default: + throw UnmatchedUiDesignException(uiDesign); + } + + return Center( + child: loadingWidget, + ); + }, + ); + } +} diff --git a/lib/components/loading/loading.dart b/lib/components/loading/loading.dart new file mode 100644 index 0000000..65c8670 --- /dev/null +++ b/lib/components/loading/loading.dart @@ -0,0 +1,31 @@ +import 'package:flutter/widgets.dart'; +import 'package:info_tren/components/loading/loading_cupertino.dart'; +import 'package:info_tren/components/loading/loading_material.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; + +class Loading extends StatelessWidget { + static const DEFAULT_TEXT = 'Loading...'; + + final UiDesign? uiDesign; + final String? text; + const Loading({ Key? key, this.text, this.uiDesign }) : super(key: key); + + @override + Widget build(BuildContext context) { + final uiDesign = this.uiDesign ?? defaultUiDesign; + switch (uiDesign) { + case UiDesign.MATERIAL: + return LoadingMaterial(text: text ?? DEFAULT_TEXT,); + case UiDesign.CUPERTINO: + return LoadingCupertino(text: text ?? DEFAULT_TEXT,); + default: + throw UnmatchedUiDesignException(uiDesign); + } + } +} + +abstract class LoadingCommon extends StatelessWidget { + final String text; + LoadingCommon({required this.text}); +} \ No newline at end of file diff --git a/lib/components/loading/loading_cupertino.dart b/lib/components/loading/loading_cupertino.dart new file mode 100644 index 0000000..8faa1b0 --- /dev/null +++ b/lib/components/loading/loading_cupertino.dart @@ -0,0 +1,28 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/src/widgets/framework.dart'; +import 'package:info_tren/components/loading/loading.dart'; + +class LoadingCupertino extends LoadingCommon { + LoadingCupertino({required String text}) : super(text: text,); + + @override + Widget build(BuildContext context) { + return Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: CupertinoActivityIndicator(), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text(text), + ), + ], + ), + ); + } + +} \ No newline at end of file diff --git a/lib/components/loading/loading_material.dart b/lib/components/loading/loading_material.dart new file mode 100644 index 0000000..6fccd10 --- /dev/null +++ b/lib/components/loading/loading_material.dart @@ -0,0 +1,26 @@ +import 'package:flutter/material.dart'; +import 'package:info_tren/components/loading/loading.dart'; + +class LoadingMaterial extends LoadingCommon { + LoadingMaterial({required String text}) : super(text: text,); + + @override + Widget build(BuildContext context) { + return Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: CircularProgressIndicator(), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text(text), + ), + ], + ), + ); + } +} \ No newline at end of file diff --git a/lib/components/refresh_future_builder.dart b/lib/components/refresh_future_builder.dart new file mode 100644 index 0000000..f107ea0 --- /dev/null +++ b/lib/components/refresh_future_builder.dart @@ -0,0 +1,117 @@ +import 'package:flutter/widgets.dart'; + +class RefreshFutureBuilder extends StatefulWidget { + final Future Function()? futureCreator; + final T? initialData; + final Widget Function(BuildContext context, Future Function() refresh, RefreshFutureBuilderSnapshot snapshot) builder; + + const RefreshFutureBuilder({ Key? key, this.futureCreator, this.initialData, required this.builder }) : super(key: key); + + @override + _RefreshFutureBuilderState createState() => _RefreshFutureBuilderState(); +} + +class _RefreshFutureBuilderState extends State> { + late RefreshFutureBuilderSnapshot snapshot; + Future Function()? futureCreator; + + @override + void initState() { + super.initState(); + snapshot = widget.initialData != null ? RefreshFutureBuilderSnapshot.initial(widget.initialData!) : RefreshFutureBuilderSnapshot.nothing(); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + if (futureCreator != widget.futureCreator) { + futureCreator = widget.futureCreator; + runFuture(); + } + } + + Future runFuture() async { + if (futureCreator == null) { + return; + } + // Set state to signify loading + setState(() { + switch (snapshot.state) { + case RefreshFutureBuilderState.none: + snapshot = RefreshFutureBuilderSnapshot.waiting(); + break; + case RefreshFutureBuilderState.initial: + snapshot = RefreshFutureBuilderSnapshot.refresh(snapshot.data); + break; + case RefreshFutureBuilderState.waiting: + return; + case RefreshFutureBuilderState.error: + snapshot = RefreshFutureBuilderSnapshot.refresh(null, snapshot.error, snapshot.stackTrace); + break; + case RefreshFutureBuilderState.done: + snapshot = RefreshFutureBuilderSnapshot.refresh(snapshot.data); + break; + case RefreshFutureBuilderState.refreshing: + return; + case RefreshFutureBuilderState.refreshError: + snapshot = RefreshFutureBuilderSnapshot.refresh(null, snapshot.error, snapshot.stackTrace); + break; + default: + } + }); + try { + final data = await futureCreator!(); + setState(() { + snapshot = RefreshFutureBuilderSnapshot.withData(data); + }); + } + catch (e, st) { + setState(() { + if (snapshot.state == RefreshFutureBuilderState.waiting) { + snapshot = RefreshFutureBuilderSnapshot.withError(e, st); + } + else { + snapshot = RefreshFutureBuilderSnapshot.refreshError(snapshot.data, e, st); + } + }); + } + } + + @override + Widget build(BuildContext context) { + return widget.builder( + context, + runFuture, + snapshot, + ); + } +} + +class RefreshFutureBuilderSnapshot { + final RefreshFutureBuilderState state; + final T? data; + final Object? error; + final StackTrace? stackTrace; + + bool get hasData => data != null; + bool get hasError => error != null; + + const RefreshFutureBuilderSnapshot._(this.state, this.data, this.error, this.stackTrace); + const RefreshFutureBuilderSnapshot.nothing() : state = RefreshFutureBuilderState.none, data = null, error = null, stackTrace = null; + const RefreshFutureBuilderSnapshot.initial(this.data) : state = RefreshFutureBuilderState.initial, error = null, stackTrace = null; + const RefreshFutureBuilderSnapshot.waiting() : state = RefreshFutureBuilderState.waiting, data = null, error = null, stackTrace = null; + const RefreshFutureBuilderSnapshot.withError(this.error, [this.stackTrace]) : state = RefreshFutureBuilderState.error, data = null; + const RefreshFutureBuilderSnapshot.withData(this.data) : state = RefreshFutureBuilderState.done, error = null, stackTrace = null; + const RefreshFutureBuilderSnapshot.refresh(this.data, [this.error, this.stackTrace]) : state = RefreshFutureBuilderState.refreshing; + const RefreshFutureBuilderSnapshot.refreshError(this.data, this.error, this.stackTrace) : state = RefreshFutureBuilderState.refreshError; +} + +enum RefreshFutureBuilderState { + none, + initial, + waiting, + error, + done, + refreshing, + refreshError, +} diff --git a/lib/components/select_train_suggestions/select_train_suggestions.dart b/lib/components/select_train_suggestions/select_train_suggestions.dart new file mode 100644 index 0000000..a88ab0b --- /dev/null +++ b/lib/components/select_train_suggestions/select_train_suggestions.dart @@ -0,0 +1,209 @@ +import 'dart:convert'; + +import 'package:flutter/widgets.dart'; +import 'package:info_tren/components/select_train_suggestions/select_train_suggestions_cupertino.dart'; +import 'package:info_tren/components/select_train_suggestions/select_train_suggestions_material.dart'; +import 'package:info_tren/models/train_operator_lines.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; +import 'package:tuple/tuple.dart'; + +class SelectTrainSuggestions extends StatefulWidget { + final UiDesign? uiDesign; + final String userInput; + final void Function(int trainNumber) onTrainSelected; + + const SelectTrainSuggestions({ Key? key, required this.uiDesign, required this.userInput, required this.onTrainSelected }) : super(key: key); + + @override + SelectTrainSuggestionsState createState() { + final uiDesign = this.uiDesign ?? defaultUiDesign; + switch(uiDesign) { + case UiDesign.MATERIAL: + return SelectTrainSuggestionsStateMaterial(); + case UiDesign.CUPERTINO: + return SelectTrainSuggestionsStateCupertino(); + default: + throw UnmatchedUiDesignException(uiDesign); + } + } +} + +abstract class SelectTrainSuggestionsState extends State { + late String userInput; + + List operators = []; + + Future loadOperators(BuildContext context) async { + operators = []; + + final operatorsString = await DefaultAssetBundle.of(context).loadString("assets/lines/files.txt"); + final operatorsFilesList = operatorsString.split("\n"); + + final decoder = JsonDecoder(); + + for (final operatorFile in operatorsFilesList) { + final operatorString = await DefaultAssetBundle.of(context).loadString("assets/lines/$operatorFile"); + final operatorData = decoder.convert(operatorString); + final _operator = TrainOperatorLines.fromJson(operatorData); + operators.add(_operator); + } + } + + @override + void initState() { + super.initState(); + userInput = widget.userInput; + + loadOperators(context).then((_) { + setState(() {}); + }); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + if (userInput != widget.userInput) { + setState(() { + userInput = widget.userInput; + }); + } + } + + String getUseCurrentInputWidgetText(int currentInput) => 'Caută trenul cu numărul $currentInput'; + Widget getUseCurrentInputWidget(int currentInput, void Function(int) onTrainSelected); + + @override + Widget build(BuildContext context) { + var sliversTuple = operators.map( + (op) => Tuple2( + getFilteredLines(op, userInput), + op.operator, + ) + ).where((tuple) => tuple.item1.isNotEmpty).toList(); + if (userInput.isNotEmpty) sliversTuple.sort((a, b) { + final aTrain = a.item1.first; + final bTrain = b.item1.first; + + final inputAsRegExp = RegExp(userInput); + + final matchOnA = inputAsRegExp.firstMatch(aTrain.number)!; + final matchOnB = inputAsRegExp.firstMatch(bTrain.number)!; + + if (matchOnA.start != matchOnB.start) return matchOnA.start - matchOnB.start; + + if (aTrain.number.length != bTrain.number.length) return aTrain.number.length - bTrain.number.length; + + return aTrain.number.compareTo(bTrain.number); + }); + var slivers = sliversTuple.map((tuple) => OperatorAutocompleteSliver( + uiDesign: widget.uiDesign, + operatorName: tuple.item2, + trains: tuple.item1, + onTrainSelected: widget.onTrainSelected, + )).toList(); + + return CustomScrollView( + slivers: [ + ...slivers, + SliverToBoxAdapter( + child: int.tryParse(userInput) != null ? getUseCurrentInputWidget(int.parse(userInput), widget.onTrainSelected) : Container(), + ), + SliverToBoxAdapter( + child: Container( + height: MediaQuery.of(context).viewPadding.bottom, + ), + ), + ], + ); + } + + List getFilteredLines(TrainOperatorLines _operator, String currentInput) { + if (currentInput.isNotEmpty) { + final filteredLines = _operator.trains + .where((elem) => elem.number.contains(currentInput)) + .toList(); + + filteredLines.sort((a, b) { + final inputAsRegExp = RegExp(currentInput); + + final matchOnA = inputAsRegExp.firstMatch(a.number)!; + final matchOnB = inputAsRegExp.firstMatch(b.number)!; + + if (matchOnA.start != matchOnB.start) return matchOnA.start - matchOnB.start; + + if (a.number.length != b.number.length) return a.number.length - b.number.length; + + return a.number.compareTo(b.number); + }); + + return filteredLines; + } + else { + return _operator.trains; + } + } +} + +class OperatorAutocompleteSliver extends StatelessWidget { + final UiDesign? uiDesign; + final String operatorName; + final List trains; + final void Function(int) onTrainSelected; + + const OperatorAutocompleteSliver({ Key? key, required this.uiDesign, required this.operatorName, required this.trains, required this.onTrainSelected }) : super(key: key); + + Widget mapTrainToItem(TrainOperatorTrainDescription train) { + final uiDesign = this.uiDesign ?? defaultUiDesign; + switch (uiDesign) { + case UiDesign.MATERIAL: + return OperatorAutocompleteTileMaterial( + onTrainSelected: onTrainSelected, + operatorName: operatorName, + train: train, + ); + case UiDesign.CUPERTINO: + return OperatorAutocompleteTileCupertino( + onTrainSelected: onTrainSelected, + operatorName: operatorName, + train: train, + ); + default: + throw UnmatchedUiDesignException(uiDesign); + } + } + + @override + Widget build(BuildContext context) { + if (trains.isEmpty) { + return SliverToBoxAdapter(child: Container(),); + } + + return SliverPrototypeExtentList( + prototypeItem: Column( + children: [ + mapTrainToItem(TrainOperatorTrainDescription()), + ], + ), + delegate: SliverChildBuilderDelegate( + (context, index) { + return Column( + children: [ + mapTrainToItem(trains[index]), + ], + ); + }, + childCount: trains.length, + addSemanticIndexes: true, + ), + ); + } +} + +abstract class OperatorAutocompleteTile extends StatelessWidget { + final String operatorName; + final TrainOperatorTrainDescription train; + final void Function(int) onTrainSelected; + + const OperatorAutocompleteTile({ Key? key, required this.onTrainSelected, required this.operatorName, required this.train }) : super(key: key); +} diff --git a/lib/components/select_train_suggestions/select_train_suggestions_cupertino.dart b/lib/components/select_train_suggestions/select_train_suggestions_cupertino.dart new file mode 100644 index 0000000..d35d8b4 --- /dev/null +++ b/lib/components/select_train_suggestions/select_train_suggestions_cupertino.dart @@ -0,0 +1,74 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart'; +import 'package:info_tren/models/train_operator_lines.dart'; + +class SelectTrainSuggestionsStateCupertino extends SelectTrainSuggestionsState { + @override + Widget getUseCurrentInputWidget(int currentInput, void Function(int p1) onTrainSelected) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + GestureDetector( + onTap: () { + onTrainSelected(currentInput); + }, + child: Padding( + padding: const EdgeInsets.all(8), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text(getUseCurrentInputWidgetText(currentInput)), + ], + ) + ), + ), + Divider(), + ], + ); + } +} + +class OperatorAutocompleteTileCupertino extends OperatorAutocompleteTile { + OperatorAutocompleteTileCupertino({ + Key? key, + required String operatorName, + required void Function(int) onTrainSelected, + required TrainOperatorTrainDescription train + }): super( + onTrainSelected: onTrainSelected, + operatorName: operatorName, + train: train, + key: key, + ); + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + onTrainSelected(train.internalNumber); + }, + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 2, 16, 2), + child: SizedBox( + width: double.infinity, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + operatorName, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(fontSize: 10, fontWeight: FontWeight.w200), + textAlign: TextAlign.left, + ), + Text( + "${train.rang} ${train.number}", + textAlign: TextAlign.left, + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/components/select_train_suggestions/select_train_suggestions_material.dart b/lib/components/select_train_suggestions/select_train_suggestions_material.dart new file mode 100644 index 0000000..b8526b4 --- /dev/null +++ b/lib/components/select_train_suggestions/select_train_suggestions_material.dart @@ -0,0 +1,47 @@ +import 'package:flutter/material.dart'; +import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart'; +import 'package:info_tren/models/train_operator_lines.dart'; + +class SelectTrainSuggestionsStateMaterial extends SelectTrainSuggestionsState { + @override + Widget getUseCurrentInputWidget(int currentInput, void Function(int) onTrainSelected) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + ListTile( + title: Text(getUseCurrentInputWidgetText(currentInput)), + onTap: () { + onTrainSelected(currentInput); + }, + ), + Divider(), + ], + ); + } +} + +class OperatorAutocompleteTileMaterial extends OperatorAutocompleteTile { + OperatorAutocompleteTileMaterial({ + Key? key, + required String operatorName, + required void Function(int) onTrainSelected, + required TrainOperatorTrainDescription train + }): super( + onTrainSelected: onTrainSelected, + operatorName: operatorName, + train: train, + key: key, + ); + + @override + Widget build(BuildContext context) { + return ListTile( + dense: true, + title: Text("${train.rang} ${train.number}"), + subtitle: Text(operatorName), + onTap: () { + onTrainSelected(train.internalNumber); + }, + ); + } +} diff --git a/lib/components/slim_app_bar.dart b/lib/components/slim_app_bar.dart new file mode 100644 index 0000000..7e74411 --- /dev/null +++ b/lib/components/slim_app_bar.dart @@ -0,0 +1,62 @@ +import 'package:flutter/material.dart'; + +class SlimAppBar extends StatelessWidget { + final String title; + final double size; + // final Function onBackTap; + + SlimAppBar({ + required this.title, + this.size = 24, + // this.onBackTap, + }); + + @override + Widget build(BuildContext context) { + return SizedBox( + width: double.infinity, + height: size, + child: Container( + color: + Theme.of(context).appBarTheme.color ?? + Theme.of(context).primaryColor, + child: InkWell( + onTap: (ModalRoute.of(context)?.canPop ?? false) + ? () => Navigator.of(context).pop() + : null, + child: Row( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Container( + height: size, + width: size, + child: (ModalRoute.of(context)?.canPop ?? false) + ? BackButtonIcon() + : null, + ), + Expanded( + child: Center( + child: Padding( + padding: const EdgeInsets.all(2), + child: Text( + title, + textAlign: TextAlign.center, + style: + Theme.of(context).appBarTheme.textTheme?.caption?.copyWith(color: Theme.of(context).appBarTheme.textTheme?.bodyText2?.color) ?? + Theme.of(context).textTheme.caption?.copyWith(color: Theme.of(context).textTheme.bodyText2?.color), + ), + ), + ), + ), + Container( + height: size, + width: size, + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/hidden_webview.dart b/lib/hidden_webview.dart deleted file mode 100644 index 236787d..0000000 --- a/lib/hidden_webview.dart +++ /dev/null @@ -1,23 +0,0 @@ - -import 'package:flutter/widgets.dart'; -import 'package:webview_flutter/webview_flutter.dart'; - -class HiddenWebView extends StatelessWidget { - final WebView webView; - final Widget child; - - HiddenWebView({@required this.child, this.webView}); - - @override - Widget build(BuildContext context) { - return Stack( - children: [ - Offstage( - offstage: true, - child: webView, - ), - Positioned.fill(child: child) - ], - ); - } -} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 9bfcabe..89e53dc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,195 +2,73 @@ import 'dart:io' show Platform; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:info_tren/models/train_data.dart'; -import 'package:info_tren/train_info_page/train_info.dart'; -import 'package:info_tren/train_info_page/train_info_cupertino.dart'; -import 'package:info_tren/train_info_page/train_info_material.dart'; -import 'package:info_tren/train_info_page/train_info_prompt.dart'; +// import 'package:flutter_redux/flutter_redux.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/main/main_page.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train.dart'; -void main() => runApp(StartPoint()); +void main() { + // final store = createStore(); + // runApp( + // StoreProvider( + // store: store, + // child: StartPoint(), + // ) + // ); + runApp( + StartPoint(), + ); +} + +Map routesByUiDesign(UiDesign uiDesign) => { + Navigator.defaultRouteName: (context) { + return MainPage(uiDesign: uiDesign,); + }, + SelectTrainPage.routeName: (context) { + return SelectTrainPage(uiDesign: uiDesign); + }, + TrainInfo.routeName: (context) { + return TrainInfo( + trainNumber: ModalRoute.of(context)!.settings.arguments as int, + ); + }, +}; class StartPoint extends StatelessWidget { + final String appTitle = 'Info Tren'; + @override Widget build(BuildContext context) { - if (Platform.isAndroid) { + if (Platform.isIOS) { + return CupertinoApp( + title: appTitle, + theme: CupertinoThemeData( + primaryColor: Colors.blue.shade600, + brightness: Brightness.dark, + // textTheme: CupertinoTextThemeData( + // textStyle: TextStyle( + // fontFamily: 'Atkinson Hyperlegible', + // ), + // ), + ), + routes: routesByUiDesign(UiDesign.CUPERTINO), + ); + } + else { return MaterialApp( - title: 'Info Tren', + title: appTitle, theme: ThemeData( primarySwatch: Colors.blue, brightness: Brightness.dark, primaryColor: Colors.blue.shade600, accentColor: Colors.blue.shade700, + // fontFamily: 'Atkinson Hyperlegible', ), -// home: MainPageMaterial(), - routes: { - Navigator.defaultRouteName: (context) { - return MainPageMaterial(); - }, - TrainInfoPromptCommon.routeName: (context) { - return TrainInfoPromptMaterial(); - }, - TrainInfo.routeName: (context) { - return TrainDataWebViewAdapter( - builder: (context) { - return TrainInfoMaterial( - trainNumber: ModalRoute.of(context).settings.arguments as int, - ); - }, - ); - }, - }, - ); - } - else if (Platform.isIOS) { - return CupertinoApp( - title: "Info Tren", - theme: CupertinoThemeData( - primaryColor: Colors.blue.shade600, - brightness: Brightness.dark, - ), -// home: MainPageCupertino(), - routes: { - Navigator.defaultRouteName: (context) { - return MainPageCupertino(); - }, - TrainInfoPromptCommon.routeName: (context) { - return TrainInfoPromptCupertino(); - }, - TrainInfo.routeName: (context) { - return TrainDataWebViewAdapter( - builder: (context) { - return TrainInfoCupertino( - trainNumber: ModalRoute.of(context).settings.arguments as int, - ); - }, - ); - }, - } + routes: routesByUiDesign(UiDesign.MATERIAL), ); } - return null; - } -} - -mixin MainPageAction { - onTrainInfoPageInvoke(BuildContext context) { - Navigator.of(context).pushNamed(TrainInfoPromptCommon.routeName); - } - - onStationBoardPageInvoke(BuildContext context) { - - } - - onRoutePlanPageInvoke(BuildContext context) { - - } -} - -class MainPageMaterial extends StatelessWidget with MainPageAction { - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text("Info Tren"), - centerTitle: true, - ), - body: SafeArea( - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ElevatedButton( - child: Text( - "Informații despre tren", - style: Theme.of(context).textTheme.button.copyWith(fontSize: 18), - ), - onPressed: () { - onTrainInfoPageInvoke(context); - }, - ), - ElevatedButton( - child: Text( - "Tabelă plecari/sosiri", - style: Theme.of(context).textTheme.button.copyWith(fontSize: 18), - ), - // TODO: Implement departure/arrival - onPressed: null, - // onPressed: () { - // onStationBoardPageInvoke(context); - // }, - ), - ElevatedButton( - child: Text( - "Planificare rută", - style: Theme.of(context).textTheme.button.copyWith(fontSize: 18), - ), - // TODO: Implement route planning - onPressed: null, - // onPressed: () { - // onRoutePlanPageInvoke(context); - // }, - ) - ].map((w) => Padding( - padding: const EdgeInsets.fromLTRB(4, 2, 4, 2), - child: SizedBox( - width: double.infinity, - child: w, - ), - )).toList(), - ), - ), - ), - ); } } - -class MainPageCupertino extends StatelessWidget with MainPageAction { - @override - Widget build(BuildContext context) { - return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - middle: Text("Info Tren"), - ), - child: SafeArea( - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - CupertinoButton.filled( - child: Text("Informații despre tren"), - onPressed: () { - onTrainInfoPageInvoke(context); - }, - ), - CupertinoButton.filled( - child: Text("Tabelă plecari/sosiri"), - // TODO: Implement departure/arrival - onPressed: null, - // onPressed: () { - // onStationBoardPageInvoke(context); - // }, - ), - CupertinoButton.filled( - child: Text("Planificare rută"), - // TODO: Implement route planning - onPressed: null, - // onPressed: () { - // onRoutePlanPageInvoke(context); - // }, - ), - ].map((w) => Padding( - padding: const EdgeInsets.fromLTRB(4, 2, 4, 2), - child: SizedBox( - width: double.infinity, - child: w, - ), - )).toList(), - ), - ), - ), - ); - } -} \ No newline at end of file diff --git a/lib/models/train_data.dart b/lib/models/train_data.dart index 5a5a8a5..7469334 100644 --- a/lib/models/train_data.dart +++ b/lib/models/train_data.dart @@ -1,1067 +1,229 @@ -import 'dart:async'; -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'; - -part 'train_data.g.dart'; - -enum TrainLookupResult { - FOUND, - NOT_FOUND, - OTHER -} - -class OnDemandInvalidatedException implements Exception { - final String propertyName; - final OnDemand onDemandClass; - - OnDemandInvalidatedException({this.propertyName, this.onDemandClass}); - - @override - String toString() { - return "OnDemandInvalidatedException: An attempt to get $propertyName from ${onDemandClass.runtimeType} failed because the source was invalidated."; - } -} - -class OnDemand { - bool valid; - - final Function onInvalidation; - - void invalidate() { - if (valid) { - valid = false; - if (onInvalidation != null) onInvalidation(); - } - } - - OnDemand(this.onInvalidation): valid = true; -} - -class OnDemandTrainData extends OnDemand { - final WebViewController _controller; - - OnDemandTrainData({ - WebViewController controller, - Function onInvalidation - }) - : _controller = controller, - _route = OnDemandTrainRoute(controller: controller), - _lastInfo = OnDemandLastInfo(controller: controller), - _destination = OnDemandDestination(controller: controller), - _nextStop = OnDemandNextStop(controller: controller), - _stations = OnDemandStations(controller: controller), - super(onInvalidation); - - @override - invalidate() { - super.invalidate(); - route.invalidate(); - lastInfo.invalidate(); - destination.invalidate(); - nextStop.invalidate(); - stations.invalidate(); - } - - Future get _originalDepartureDate async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_originalDepartureDate"); - - final tempRes = await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let field = table.querySelector("caption"); - return field.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - - return tempRes.split(" ").last; - } - - Future get departureDate async { - final str = await _originalDepartureDate; - - final parts = str.split(".").map((str) => int.parse(str)).toList(); - - return DateTime(parts[2], parts[1], parts[0]); - } - - Future get rang async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "rang"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[0]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get trainNumber async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "trainNumber"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[1]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get operator async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "operator"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[2]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - final OnDemandTrainRoute _route; - OnDemandTrainRoute get route => _route; - - Future get state async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "state"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[4]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - final OnDemandLastInfo _lastInfo; - OnDemandLastInfo get lastInfo => _lastInfo; - - final OnDemandDestination _destination; - OnDemandDestination get destination => _destination; - - final OnDemandNextStop _nextStop; - OnDemandNextStop get nextStop => _nextStop; - - Future get routeDistance async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "routeDistance"); - - final result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[12]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - return result.takeWhile((char) => char != ' '.codeUnitAt(0)); - } - - Future get _routeDuration async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_routeDuration"); - - var result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[13]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - if (result[result.length - 1] == '.') result = result.substring(0, result.length - 1); - - return result; - } - - Future get routeDuration async { - final input = await _routeDuration; - - var result = Duration(); - - StringBuffer buffer = StringBuffer(); - - for (var i = 0; i < input.length; i++) { - if ('0'.codeUnitAt(0) <= input.codeUnitAt(i) && input.codeUnitAt(i) <= '9'.codeUnitAt(0)) { - buffer.writeCharCode(input.codeUnitAt(i)); - } - else if (input.startsWith("min", i)) { - result += Duration(minutes: int.parse(buffer.toString())); - buffer = StringBuffer(); - i += 2; - } - else if (input.startsWith("h", i)) { - result += Duration(hours: int.parse(buffer.toString())); - buffer = StringBuffer(); - } - else throw FormatException("Unrecognised!"); - } - - return result; - } - - final OnDemandStations _stations; - OnDemandStations get stations => _stations; -} - -class OnDemandTrainRoute extends OnDemand { - final WebViewController _controller; - - OnDemandTrainRoute({ - WebViewController controller, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get original async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "original"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[3]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get from async { - final original = await this.original; - return original.split("-")[0]; - } - - Future get to async { - final original = await this.original; - return original.split("-")[1]; - } -} - -class OnDemandLastInfo extends OnDemand { - final WebViewController _controller; - - OnDemandLastInfo({ - WebViewController controller, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get _lastInfoOriginal async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_lastInfoOriginal"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[5]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get station async { - final original = await _lastInfoOriginal; - - return original - .split("[")[0] - .trim(); - } - - Future get event async { - final original = await _lastInfoOriginal; - - return original - .split("[")[1] - .split("]")[0] - .trim(); - } - - Future get originalDateAndTime async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "originalDateAndTime"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[6]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get dateAndTime async => parseCFRDateTime(await originalDateAndTime); - - Future get delay async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "delay"); - - return int.parse( - await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[7]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - ) - ); - } -} - -class OnDemandDestination extends OnDemand { - final WebViewController _controller; - - OnDemandDestination({ - WebViewController controller, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get stationName async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "destinationStation"); - - final result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[8]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - if (result.isEmpty) return null; - else return result; - } - - Future get _originalDestinationArrival async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_originalDestinationArrival"); - - final result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[9]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - if (result.isEmpty) return null; - else return result; - } - - Future get arrival => _originalDestinationArrival.then((value) => parseCFRDateTime(value)); -} - -class OnDemandNextStop extends OnDemand { - final WebViewController _controller; - - OnDemandNextStop({ - WebViewController controller, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get stationName async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "destinationStation"); - - final result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[10]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - if (result.isEmpty) return null; - else return result; - } - - Future get _originalNextStopArrival async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_originalDestinationArrival"); - - final result = (await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - let rows = table.querySelectorAll("tr"); - let currentRow = rows[11]; - let currentDataCell = currentRow.querySelectorAll("td")[1]; - return currentDataCell.textContent; - })() - """, - isFunctionAlready: true, - )).trim(); - - if (result.isEmpty) return null; - else return result; - } - - Future get arrival => _originalNextStopArrival.then((value) => parseCFRDateTime(value)); -} - -class OnDemandStations extends OnDemand { - final WebViewController _controller; - List issuedOnDemands = []; - - @override - void invalidate() { - issuedOnDemands.map((od) => od.invalidate()); - super.invalidate(); - } - - OnDemandStations({ - @required WebViewController controller, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get _stationsLoaded async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "_stationsLoaded"); +// To parse this JSON data, do +// +// final trainData = trainDataFromJson(jsonString); - final result = await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => JSON.stringify(document.querySelector("#GridView1") == null))() - """, - isFunctionAlready: true, - ); +import 'dart:convert'; - final decoder = JsonDecoder(); - return !(decoder.convert(result) as bool); - } +TrainData trainDataFromJson(String str) => TrainData.fromJson(json.decode(str)); - Stream call({@required Future pageLoadFuture}) async* { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "call"); +String trainDataToJson(TrainData data) => json.encode(data.toJson()); - if (!await _stationsLoaded) { - await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const button = document.querySelector("#Button2"); - button.click(); - })() - """, - isFunctionAlready: true, +/// Results of scrapping InfoFer website for train info +class TrainData { + TrainData({ + required this.date, + required this.number, + required this.operator, + required this.rank, + required this.route, + required this.stations, + this.status, + }); + + final String date; + final String number; + final String operator; + final String rank; + final Route route; + final List stations; + final TrainDataStatus? status; + + factory TrainData.fromJson(Map json) => TrainData( + date: json["date"], + number: json["number"], + operator: json["operator"], + rank: json["rank"], + route: Route.fromJson(json["route"]), + stations: List.from( + json["stations"].map((x) => Station.fromJson(x))), + status: json["status"] == null + ? null + : TrainDataStatus.fromJson(json["status"]), ); - await pageLoadFuture; - } - - final count = int.parse(await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const count = rowsArray.length - 1; - return String(count); - })() - """, - isFunctionAlready: true, - )); - for (int i = 1; i <= count; i++) { - final ods = OnDemandStation( - controller: _controller, - index: i, + Map toJson() => { + "date": date, + "number": number, + "operator": operator, + "rank": rank, + "route": route.toJson(), + "stations": List.from(stations.map((x) => x.toJson())), + "status": status?.toJson(), + }; +} + +/// Route of the train +class Route { + Route({ + required this.from, + required this.to, + }); + + final String from; + final String to; + + factory Route.fromJson(Map json) => Route( + from: json["from"], + to: json["to"], ); - issuedOnDemands.add(ods); - yield ods; - } - } -} - -class OnDemandStation extends OnDemand { - final WebViewController _controller; - final int index; - - OnDemandStation({ - @required WebViewController controller, - @required this.index, - Function onInvalidation - }) : _controller = controller, super(onInvalidation); - - Future get km async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "km"); - - return int.parse(await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[0]; - return kmCell.textContent; - })() - """, - isFunctionAlready: true, - )); - } - - Future get stationName async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "stationName"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[1]; - return kmCell.textContent; - })() - """, - isFunctionAlready: true, - ); - } - - Future get arrivalTime async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "arrivalTime"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[2]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - } - - Future get stopsFor async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "stopsFor"); - - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[3]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - } - - Future get departureTime async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "departureTime"); - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[4]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - } - - Future get realOrEstimate async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "realOrEstimate"); - - final value = await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[5]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - - if (value == "Real") return RealOrEstimate.real; - else if (value == "Estimat") return RealOrEstimate.estimate; - else return RealOrEstimate.UNKNOWN; - } + Map toJson() => { + "from": from, + "to": to, + }; +} + +class Station { + Station({ + this.arrival, + this.departure, + required this.km, + required this.name, + this.platform, + this.stoppingTime, + }); + + final StationArrDepTime? arrival; + final StationArrDepTime? departure; + final int km; + final String name; + final String? platform; + final int? stoppingTime; + + factory Station.fromJson(Map json) => Station( + arrival: json["arrival"] == null + ? null + : StationArrDepTime.fromJson(json["arrival"]), + departure: json["departure"] == null + ? null + : StationArrDepTime.fromJson(json["departure"]), + km: json["km"], + name: json["name"], + platform: json["platform"] == null ? null : json["platform"], + stoppingTime: + json["stoppingTime"] == null ? null : json["stoppingTime"], + ); - Future get delay async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "delay"); + Map toJson() => { + "arrival": arrival?.toJson(), + "departure": departure?.toJson(), + "km": km, + "name": name, + "platform": platform == null ? null : platform, + "stoppingTime": stoppingTime == null ? null : stoppingTime, + }; +} + +class StationArrDepTime { + StationArrDepTime({ + required this.scheduleTime, + this.status, + }); + + final String scheduleTime; + final StationArrDepTimeStatus? status; + + factory StationArrDepTime.fromJson(Map json) => + StationArrDepTime( + scheduleTime: json["scheduleTime"], + status: json["status"] == null ? null : StationArrDepTimeStatus.fromJson(json["status"]), + ); - final value = await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[6]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); + Map toJson() => { + "scheduleTime": scheduleTime, + "status": status?.toJson(), + }; +} - if (value.isEmpty) return 0; - else return int.parse(value); - } +class StationArrDepTimeStatus { + StationArrDepTimeStatus({ + required this.delay, + required this.real, + }); - Future get observations async { - if (!valid) throw OnDemandInvalidatedException(onDemandClass: this, propertyName: "observations"); + final int delay; + final bool real; - return await wInvoke( - webViewController: _controller, - jsFunctionContent: """ - (() => { - const table = document.querySelector("#GridView1"); - const rows = table.querySelectorAll("tr"); - const rowsArray = Array.from(rows); - const row = rowsArray[$index]; - const columns = row.querySelectorAll("td"); - const kmCell = columns[7]; - return kmCell.textContent.trim(); - })() - """, - isFunctionAlready: true, - ); - } -} + factory StationArrDepTimeStatus.fromJson(Map json) => + StationArrDepTimeStatus( + delay: json["delay"], + real: json["real"], + ); -enum RealOrEstimate { - real, - estimate, - UNKNOWN + Map toJson() => { + "delay": delay, + "real": real, + }; } -class TrainDataWebViewAdapter extends StatefulWidget { - final WidgetBuilder builder; - - TrainDataWebViewAdapter({@required this.builder}); - - @override - State createState() { - return _TrainDataWebViewAdapterState(); - } +class TrainDataStatus { + TrainDataStatus({ + required this.delay, + required this.state, + required this.station, + }); - static _TrainDataWebViewAdapterState of(BuildContext context) => - (context.findAncestorWidgetOfExactType<_TrainDataWebViewAdapterInheritedWidget>()) - .state; -} + final int delay; + final State state; + final String station; -class ProgressReport { - final int current; - final int total; - final String description; + factory TrainDataStatus.fromJson(Map json) => + TrainDataStatus( + delay: json["delay"], + state: stateValues.map[json["state"]]!, + station: json["station"], + ); - ProgressReport({@required this.current, @required this.total, this.description}); + Map toJson() => { + "delay": delay, + "state": stateValues.reverse[state], + "station": station, + }; @override String toString() { - return description == null ? "ProgressReport($current/$total)" : "ProgressReport($current/$total: $description)"; - } -} - -class _TrainDataWebViewAdapterState extends State { - Completer _webViewControllerCompleter = Completer(); - Future get webViewController => _webViewControllerCompleter.future; - - StreamController _pageLoadController; - Stream pageLoadStream; - Future get nextLoadFuture => pageLoadStream.take(1).first; - - StreamController _progressController; - Stream progressStream; - - Future loadTrain(int trainNo) async { - currentDatas.removeWhere((ondemand) { - ondemand.invalidate(); - return true; - }); - - final controller = await webViewController; - var nlf; - - nlf = nextLoadFuture; - await controller.loadUrl("https://appiris.infofer.ro/MytrainRO.aspx"); - await nlf; - _reportStatus( - current: 2, - description: "Loaded Informatica Feroviară webpage" - ); - - nlf = nextLoadFuture; - await controller.evaluateJavascript(""" - ( () => { - let inputField = document.querySelector("#TextTrnNo"); - inputField.value = $trainNo; - let submitButton = document.querySelector("#Button1"); - submitButton.click(); - } ) () - """); - await nlf; - - _reportStatus( - current: 3, - description: "Loaded train information" - ); - - var result = await wInvoke( - webViewController: controller, - jsFunctionContent: """ - (() => { - let errorMessage = document.querySelector("#Lblx"); - return errorMessage.textContent; - })() - """, - isFunctionAlready: true, - ); - - if (result.isNotEmpty) { - return TrainLookupResult.NOT_FOUND; + String result = ''; + if (delay == 0) { + result += 'La timp'; } - - final jsonDecoder = JsonDecoder(); - - final foundTable = jsonDecoder.convert(await wInvoke( - webViewController: controller, - jsFunctionContent: """ - (() => { - let table = document.querySelector("#DetailsView1"); - return JSON.stringify(table !== null); - })() - """, - isFunctionAlready: true, - )) as bool; - - if (foundTable) { - return TrainLookupResult.FOUND; + else { + result += '${delay.abs()} min'; } - - /// Should not happen, report error in this case - return TrainLookupResult.OTHER; - } - - List currentDatas = []; - - Future trainData({Function onInvalidation}) async { - final controller = await webViewController; - - final result = OnDemandTrainData( - controller: controller, - onInvalidation: onInvalidation - ); - - currentDatas.add(result); - - return result; - } - - int lastStatusReported; - - _reportStatus({@required int current, String description}) { - lastStatusReported = current; - _progressController.add(ProgressReport( - current: current, - total: TOTAL_PROGRESS, - description: description - )); - } - - recallLastReport() { - _progressController.add(ProgressReport(current: lastStatusReported, total: TOTAL_PROGRESS)); - } - - restartProgressReport() { - lastStatusReported = 0; - webViewController.then((_) { - _reportStatus(current: 1, description: "WebView created"); - }); - } - - @override - void initState() { - _pageLoadController = StreamController(); - pageLoadStream = _pageLoadController.stream.asBroadcastStream(); - - _progressController = StreamController(); - progressStream = _progressController.stream.asBroadcastStream(); - - lastStatusReported = 0; - - super.initState(); - } - - @override - void dispose() { - _pageLoadController.close(); - _progressController.close(); - - super.dispose(); - } - - static const int TOTAL_PROGRESS = 3; - - @override - Widget build(BuildContext context) { - return HiddenWebView( - webView: WebView( - javascriptMode: JavascriptMode.unrestricted, - onWebViewCreated: (controller) { - _webViewControllerCompleter.complete(controller); - _reportStatus( - current: 1, - description: "WebView created" - ); - }, - onPageFinished: (url) { - _pageLoadController.add(url); - }, - ), - child: _TrainDataWebViewAdapterInheritedWidget( - child: Builder( - builder: widget.builder, - ), - state: this, - ), - ); - } -} - -class _TrainDataWebViewAdapterInheritedWidget extends InheritedWidget { - final _TrainDataWebViewAdapterState state; - - _TrainDataWebViewAdapterInheritedWidget({this.state, Widget child, Key key}) - :super(key: key, child: child); - - @override - bool updateShouldNotify(InheritedWidget oldWidget) { - return true; - } -} - -@JsonSerializable() -class TrainData { - final String rang; - @JsonKey(name: "tren") - final String trainNumber; - final String operator; - @JsonKey(name: "relatia") - final String route; - @JsonKey(name: "stare") - final String state; - @JsonKey(name: "ultima_informatie") - final LastInfo lastInfo; - @JsonKey(name: "destinatie") - final StopInfo destination; - @JsonKey(name: "urmatoarea_oprire") - final StopInfo nextStop; - @JsonKey(name: "durata_calatoriei") - final String tripLength; - @JsonKey(name: "distanta") - final String distance; - - @JsonKey(name: "stations") - List stations; - - TrainData({this.rang, this.trainNumber, this.operator, this.lastInfo, - this.state, this.route, this.tripLength, this.stations, this.nextStop, - this.distance, this.destination}); - factory TrainData.fromJson(Map json) { - var result = _$TrainDataFromJson(json); - var foundEstimat = false; - result.stations = result.stations.map((station) { - if (station.realOrEstimate == "Estimat") { - foundEstimat = true; - } - - station.realOrEstimate = foundEstimat ? "Estimat" : "Real"; - - return station; - }).toList(); + result += ' la '; + switch (state) { + case State.PASSING: + result += 'trecerea fără oprire prin'; + break; + case State.ARRIVAL: + result += 'sosirea în'; + break; + case State.DEPARTURE: + result += 'plecarea din'; + break; + } + result += station; return result; } - Map toJson() => _$TrainDataToJson(this); } -@JsonSerializable() -class LastInfo { - @JsonKey(name: "statia") - final String station; - @JsonKey(name: "eveniment") - final String event; - @JsonKey(name: "data_si_ora") - final String dateAndTime; - DateTime get formattedDateAndTime { - return parseCFRDateTime(dateAndTime); - } - @JsonKey(name: "intarziere") - final int delay; +enum State { PASSING, ARRIVAL, DEPARTURE } +final stateValues = EnumValues({ + "arrival": State.ARRIVAL, + "departure": State.DEPARTURE, + "passing": State.PASSING +}); - LastInfo({this.dateAndTime, this.delay, this.event, this.station}); +class EnumValues { + Map map; + Map? reverseMap; - factory LastInfo.fromJson(Map json) => _$LastInfoFromJson(json); - Map toJson() => _$LastInfoToJson(this); -} + EnumValues(this.map); -@JsonSerializable() -class StopInfo { - @JsonKey(name: "statia") - final String station; - @JsonKey(name: "data_si_ora") - final String dateAndTime; - DateTime get formattedDateAndTime { - return parseCFRDateTime(dateAndTime); - } - - StopInfo({this.station, this.dateAndTime}); - - factory StopInfo.fromJson(Map json) => _$StopInfoFromJson(json); - Map toJson() => _$StopInfoToJson(this); -} - -@JsonSerializable() -class StationEntry { - final String km; - @JsonKey(name: "statia") - final String name; - @JsonKey(name: "sosire") - final String arrivalTime; - @JsonKey(name: "stationeaza_pentru") - final String waitTime; - @JsonKey(name: "plecare") - final String departureTime; - @JsonKey(name: "real/estimat") - String realOrEstimate; - bool get real { - return realOrEstimate == "Real"; + Map get reverse { + if (reverseMap == null) { + reverseMap = map.map((k, v) => new MapEntry(v, k)); + } + return reverseMap!; } - @JsonKey(name: "intarziere") - final int delay; - @JsonKey(name: "observatii") - final String observations; - - StationEntry({this.name, this.delay, this.realOrEstimate, - this.arrivalTime, this.departureTime, this.km, this.observations, - this.waitTime}); - - factory StationEntry.fromJson(Map json) => _$StationEntryFromJson(json); - Map toJson() => _$StationEntryToJson(this); -} - -DateTime parseCFRDateTime(String dateAndTime) { - if (dateAndTime == null || dateAndTime.isEmpty) return null; - - final parts = dateAndTime.split(" "); - - final dateParts = parts[0].split("."); - final day = int.parse(dateParts[0]); - final month = int.parse(dateParts[1]); - final year = int.parse(dateParts[2]); - - final timeParts = parts[1].split(":"); - final hour = int.parse(timeParts[0]); - final minute = int.parse(timeParts[1]); - - return DateTime(year, month, day, hour, minute); } diff --git a/lib/models/train_data.g.dart b/lib/models/train_data.g.dart deleted file mode 100644 index d90192d..0000000 --- a/lib/models/train_data.g.dart +++ /dev/null @@ -1,98 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'train_data.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -TrainData _$TrainDataFromJson(Map json) { - return TrainData( - rang: json['rang'] as String, - trainNumber: json['tren'] as String, - operator: json['operator'] as String, - lastInfo: json['ultima_informatie'] == null - ? null - : LastInfo.fromJson( - json['ultima_informatie'] as Map), - state: json['stare'] as String, - route: json['relatia'] as String, - tripLength: json['durata_calatoriei'] as String, - stations: (json['stations'] as List) - ?.map((e) => e == null - ? null - : StationEntry.fromJson(e as Map)) - ?.toList(), - nextStop: json['urmatoarea_oprire'] == null - ? null - : StopInfo.fromJson( - json['urmatoarea_oprire'] as Map), - distance: json['distanta'] as String, - destination: json['destinatie'] == null - ? null - : StopInfo.fromJson(json['destinatie'] as Map)); -} - -Map _$TrainDataToJson(TrainData instance) => { - 'rang': instance.rang, - 'tren': instance.trainNumber, - 'operator': instance.operator, - 'relatia': instance.route, - 'stare': instance.state, - 'ultima_informatie': instance.lastInfo, - 'destinatie': instance.destination, - 'urmatoarea_oprire': instance.nextStop, - 'durata_calatoriei': instance.tripLength, - 'distanta': instance.distance, - 'stations': instance.stations - }; - -LastInfo _$LastInfoFromJson(Map json) { - return LastInfo( - dateAndTime: json['data_si_ora'] as String, - delay: json['intarziere'] as int, - event: json['eveniment'] as String, - station: json['statia'] as String); -} - -Map _$LastInfoToJson(LastInfo instance) => { - 'statia': instance.station, - 'eveniment': instance.event, - 'data_si_ora': instance.dateAndTime, - 'intarziere': instance.delay - }; - -StopInfo _$StopInfoFromJson(Map json) { - return StopInfo( - station: json['statia'] as String, - dateAndTime: json['data_si_ora'] as String); -} - -Map _$StopInfoToJson(StopInfo instance) => { - 'statia': instance.station, - 'data_si_ora': instance.dateAndTime - }; - -StationEntry _$StationEntryFromJson(Map json) { - return StationEntry( - name: json['statia'] as String, - delay: json['intarziere'] as int, - realOrEstimate: json['real/estimat'] as String, - arrivalTime: json['sosire'] as String, - departureTime: json['plecare'] as String, - km: json['km'] as String, - observations: json['observatii'] as String, - waitTime: json['stationeaza_pentru'] as String); -} - -Map _$StationEntryToJson(StationEntry instance) => - { - 'km': instance.km, - 'statia': instance.name, - 'sosire': instance.arrivalTime, - 'stationeaza_pentru': instance.waitTime, - 'plecare': instance.departureTime, - 'real/estimat': instance.realOrEstimate, - 'intarziere': instance.delay, - 'observatii': instance.observations - }; diff --git a/lib/models/train_operator_lines.dart b/lib/models/train_operator_lines.dart new file mode 100644 index 0000000..ed408af --- /dev/null +++ b/lib/models/train_operator_lines.dart @@ -0,0 +1,42 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'train_operator_lines.g.dart'; + +@JsonSerializable() +class TrainOperatorLines { + @JsonKey(name: "short_name") + final String shortName; + final String operator; + @JsonKey(name: "versiune") + final String version; + @JsonKey(name: "trenuri") + final List trains; + + TrainOperatorLines({ + required this.operator, + this.shortName = "", + required this.version, + required this.trains, + }); + + factory TrainOperatorLines.fromJson(Map json) => _$TrainOperatorLinesFromJson(json); + Map toJson() => _$TrainOperatorLinesToJson(this); +} + +@JsonSerializable() +class TrainOperatorTrainDescription { + final String rang; + @JsonKey(name: "numar") + final String number; + @JsonKey(name: "numar_intern") + final int internalNumber; + + TrainOperatorTrainDescription({ + this.number = '', + this.rang = '', + this.internalNumber = 0, + }); + + factory TrainOperatorTrainDescription.fromJson(Map json) => _$TrainOperatorTrainDescriptionFromJson(json); + Map toJson() => _$TrainOperatorTrainDescriptionToJson(this); +} diff --git a/lib/models/train_operator_lines.g.dart b/lib/models/train_operator_lines.g.dart new file mode 100644 index 0000000..c1ab5ec --- /dev/null +++ b/lib/models/train_operator_lines.g.dart @@ -0,0 +1,42 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'train_operator_lines.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +TrainOperatorLines _$TrainOperatorLinesFromJson(Map json) => + TrainOperatorLines( + operator: json['operator'] as String, + shortName: json['short_name'] as String? ?? "", + version: json['versiune'] as String, + trains: (json['trenuri'] as List) + .map((e) => + TrainOperatorTrainDescription.fromJson(e as Map)) + .toList(), + ); + +Map _$TrainOperatorLinesToJson(TrainOperatorLines instance) => + { + 'short_name': instance.shortName, + 'operator': instance.operator, + 'versiune': instance.version, + 'trenuri': instance.trains, + }; + +TrainOperatorTrainDescription _$TrainOperatorTrainDescriptionFromJson( + Map json) => + TrainOperatorTrainDescription( + number: json['numar'] as String? ?? '', + rang: json['rang'] as String? ?? '', + internalNumber: json['numar_intern'] as int? ?? 0, + ); + +Map _$TrainOperatorTrainDescriptionToJson( + TrainOperatorTrainDescription instance) => + { + 'rang': instance.rang, + 'numar': instance.number, + 'numar_intern': instance.internalNumber, + }; diff --git a/lib/models/ui_design.dart b/lib/models/ui_design.dart new file mode 100644 index 0000000..19ebc75 --- /dev/null +++ b/lib/models/ui_design.dart @@ -0,0 +1,15 @@ +enum UiDesign { + MATERIAL, + CUPERTINO +} + +class UnmatchedUiDesignException implements Exception { + final UiDesign uiDesign; + + UnmatchedUiDesignException(this.uiDesign); + + @override + String toString() { + return '$uiDesign was not matched'; + } +} diff --git a/lib/pages/main/main_page.dart b/lib/pages/main/main_page.dart new file mode 100644 index 0000000..6734556 --- /dev/null +++ b/lib/pages/main/main_page.dart @@ -0,0 +1,68 @@ +import 'package:flutter/widgets.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/main/main_page_cupertino.dart'; +import 'package:info_tren/pages/main/main_page_material.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; + +class MainPage extends StatelessWidget { + final UiDesign? uiDesign; + + const MainPage({ Key? key, this.uiDesign }) : super(key: key); + + @override + Widget build(BuildContext context) { + final uiDesign = this.uiDesign ?? defaultUiDesign; + + switch (uiDesign) { + case UiDesign.MATERIAL: + return MainPageMaterial(); + case UiDesign.CUPERTINO: + return MainPageCupertino(); + default: + throw UnmatchedUiDesignException(uiDesign); + } + } +} + +abstract class MainPageShared extends StatelessWidget { + final String pageTitle = 'Info Tren'; + + List get options => [ + MainPageOption( + name: 'Informații despre tren', + action: (BuildContext context) { + onTrainInfoPageInvoke(context); + }, + ), + MainPageOption( + name: 'Tabelă plecari/sosiri', + // TODO: Implement departure/arrival + action: null, + ), + MainPageOption( + name: 'Planificare rută', + // TODO: Implement route planning + action: null, + ), + ]; + + onTrainInfoPageInvoke(BuildContext context) { + Navigator.of(context).pushNamed(SelectTrainPage.routeName); + } + + onStationBoardPageInvoke(BuildContext context) { + + } + + onRoutePlanPageInvoke(BuildContext context) { + + } +} + +class MainPageOption { + final String name; + final void Function(BuildContext context)? action; + + MainPageOption({required this.name, this.action}); +} diff --git a/lib/pages/main/main_page_cupertino.dart b/lib/pages/main/main_page_cupertino.dart new file mode 100644 index 0000000..4e0d2df --- /dev/null +++ b/lib/pages/main/main_page_cupertino.dart @@ -0,0 +1,30 @@ +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/pages/main/main_page.dart'; + +class MainPageCupertino extends MainPageShared { + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + navigationBar: CupertinoNavigationBar( + middle: Text(pageTitle), + ), + child: SafeArea( + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: options.map((option) => CupertinoButton.filled( + child: Text(option.name), + onPressed: option.action == null ? null : () => option.action!(context), + )).map((w) => Padding( + padding: const EdgeInsets.fromLTRB(4, 2, 4, 2), + child: SizedBox( + width: double.infinity, + child: w, + ), + )).toList(), + ), + ), + ), + ); + } +} diff --git a/lib/pages/main/main_page_material.dart b/lib/pages/main/main_page_material.dart new file mode 100644 index 0000000..1a78d76 --- /dev/null +++ b/lib/pages/main/main_page_material.dart @@ -0,0 +1,34 @@ +import 'package:flutter/material.dart'; +import 'package:info_tren/pages/main/main_page.dart'; + +class MainPageMaterial extends MainPageShared { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(pageTitle), + centerTitle: true, + ), + body: SafeArea( + child: Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: options.map((option) => ElevatedButton( + child: Text( + option.name, + style: Theme.of(context).textTheme.button?.copyWith(fontSize: 18), + ), + onPressed: option.action != null ? () => option.action!(context) : null, + )).map((w) => Padding( + padding: const EdgeInsets.fromLTRB(4, 2, 4, 2), + child: SizedBox( + width: double.infinity, + child: w, + ), + )).toList(), + ), + ), + ), + ); + } +} diff --git a/lib/pages/train_info_page/select_train/select_train.dart b/lib/pages/train_info_page/select_train/select_train.dart new file mode 100644 index 0000000..545c6ff --- /dev/null +++ b/lib/pages/train_info_page/select_train/select_train.dart @@ -0,0 +1,61 @@ +import 'dart:io' show Platform; + +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train_cupertino.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train_material.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; +import 'package:tuple/tuple.dart'; + +typedef TrainSelectedCallback(int trainNumber); + +class SelectTrainPage extends StatefulWidget { + final UiDesign? uiDesign; + + SelectTrainPage({Key? key, this.uiDesign}) : super(key: key); + + static String routeName = "/trainInfo/selectTrain"; + + void onTrainSelected(BuildContext context, int selection) { + Navigator.of(context).pushNamed(TrainInfo.routeName, arguments: selection); + } + + @override + SelectTrainPageState createState() { + final uiDesign = this.uiDesign ?? defaultUiDesign; + switch(uiDesign) { + case UiDesign.MATERIAL: + return SelectTrainPageStateMaterial(); + case UiDesign.CUPERTINO: + return SelectTrainPageStateCupertino(); + default: + throw UnmatchedUiDesignException(uiDesign); + } + } +} + +abstract class SelectTrainPageState extends State { + final String pageTitle = 'Informații despre tren'; + final String textFieldLabel = 'Numărul trenului'; + + TextEditingController trainNoController = TextEditingController(); + + @override + void initState() { + super.initState(); + } + + void onTextChanged() { + setState(() {}); + } + + Widget get suggestionsList => SelectTrainSuggestions( + uiDesign: widget.uiDesign, + userInput: trainNoController.text, + onTrainSelected: (trainNumber) => widget.onTrainSelected(context, trainNumber), + key: ValueKey(trainNoController.text), + ); +} diff --git a/lib/pages/train_info_page/select_train/select_train_cupertino.dart b/lib/pages/train_info_page/select_train/select_train_cupertino.dart new file mode 100644 index 0000000..e9d0ba4 --- /dev/null +++ b/lib/pages/train_info_page/select_train/select_train_cupertino.dart @@ -0,0 +1,39 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/services.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train.dart'; + +class SelectTrainPageStateCupertino extends SelectTrainPageState { + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + navigationBar: CupertinoNavigationBar( + middle: Text(pageTitle), + ), + child: SafeArea( + bottom: false, + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: CupertinoTextField( + controller: trainNoController, + autofocus: true, + placeholder: textFieldLabel, + textInputAction: TextInputAction.search, + keyboardType: TextInputType.number, + onChanged: (_) => onTextChanged(), + inputFormatters: [ + FilteringTextInputFormatter.digitsOnly, + ], + ), + ), + Expanded( + child: suggestionsList, + ), + ], + ), + ), + ); + } +} diff --git a/lib/pages/train_info_page/select_train/select_train_material.dart b/lib/pages/train_info_page/select_train/select_train_material.dart new file mode 100644 index 0000000..2edc436 --- /dev/null +++ b/lib/pages/train_info_page/select_train/select_train_material.dart @@ -0,0 +1,43 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:info_tren/pages/train_info_page/select_train/select_train.dart'; + +class SelectTrainPageStateMaterial extends SelectTrainPageState { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(pageTitle), + centerTitle: true, + ), + body: SafeArea( + bottom: false, + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: TextField( + controller: trainNoController, + autofocus: true, + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: textFieldLabel, + ), + inputFormatters: [ + FilteringTextInputFormatter.digitsOnly, + ], + textInputAction: TextInputAction.search, + keyboardType: TextInputType.number, + onChanged: (_) => onTextChanged(), + ), + ), + Expanded( + child: suggestionsList, + ), + ], + ), + ), + ); + } +} diff --git a/lib/train_info_page/train_info_animation_helpers.dart b/lib/pages/train_info_page/train_info_animation_helpers.dart.old similarity index 98% rename from lib/train_info_page/train_info_animation_helpers.dart rename to lib/pages/train_info_page/train_info_animation_helpers.dart.old index dc891a7..7a34ff7 100644 --- a/lib/train_info_page/train_info_animation_helpers.dart +++ b/lib/pages/train_info_page/train_info_animation_helpers.dart.old @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:info_tren/train_info_page/train_info_constants.dart'; +import 'package:info_tren/pages/train_info_page/train_info_constants.dart'; import 'dart:io' show Platform; diff --git a/lib/train_info_page/train_info_constants.dart b/lib/pages/train_info_page/train_info_constants.dart similarity index 100% rename from lib/train_info_page/train_info_constants.dart rename to lib/pages/train_info_page/train_info_constants.dart diff --git a/lib/pages/train_info_page/view_train/train_info.dart b/lib/pages/train_info_page/view_train/train_info.dart new file mode 100644 index 0000000..0ad578f --- /dev/null +++ b/lib/pages/train_info_page/view_train/train_info.dart @@ -0,0 +1,69 @@ + +import 'package:flutter/material.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/api/train_data.dart'; +import 'package:info_tren/components/loading/loading.dart'; +import 'package:info_tren/components/refresh_future_builder.dart'; +import 'package:info_tren/models/train_data.dart'; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info_cupertino.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info_material.dart'; +import 'package:info_tren/utils/default_ui_design.dart'; + + +class TrainInfo extends StatelessWidget { + static String routeName = "/trainInfo/display"; + + final UiDesign? uiDesign; + final int trainNumber; + + TrainInfo({Key? key, required this.trainNumber, this.uiDesign}): super(key: key); + + @override + Widget build(BuildContext context) { + final uiDesign = this.uiDesign ?? defaultUiDesign; + + return RefreshFutureBuilder( + futureCreator: () => getTrain(trainNumber), + builder: (context, refresh, snapshot) { + + switch (uiDesign) { + case UiDesign.MATERIAL: + if ([RefreshFutureBuilderState.none, RefreshFutureBuilderState.waiting].contains(snapshot.state)) { + return TrainInfoLoadingMaterial(title: trainNumber.toString(),); + } + else if (snapshot.state == RefreshFutureBuilderState.error) { + return TrainInfoErrorMaterial(title: '$trainNumber - Error', error: snapshot.error!,); + } + + return TrainInfoMaterial(trainData: snapshot.data!,); + case UiDesign.CUPERTINO: + if ([RefreshFutureBuilderState.none, RefreshFutureBuilderState.waiting].contains(snapshot.state)) { + return TrainInfoLoadingCupertino(title: trainNumber.toString(),); + } + else if (snapshot.state == RefreshFutureBuilderState.error) { + return TrainInfoErrorCupertino(title: '$trainNumber - Error', error: snapshot.error!,); + } + + return TrainInfoCupertino(trainData: snapshot.data!,); + default: + throw UnmatchedUiDesignException(uiDesign); + } + }, + ); + } +} + +abstract class TrainInfoLoading extends StatelessWidget { + final String title; + final Widget loadingWidget; + + TrainInfoLoading({required this.title, String? loadingText, UiDesign? uiDesign}) : loadingWidget = Loading(uiDesign: uiDesign, text: loadingText,); +} + +abstract class TrainInfoError extends StatelessWidget { + final String title; + final Object error; + + TrainInfoError({required this.title, required this.error}); +} diff --git a/lib/pages/train_info_page/view_train/train_info_cupertino.dart b/lib/pages/train_info_page/view_train/train_info_cupertino.dart new file mode 100644 index 0000000..4961637 --- /dev/null +++ b/lib/pages/train_info_page/view_train/train_info_cupertino.dart @@ -0,0 +1,741 @@ +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/components/cupertino_divider.dart'; +import 'package:info_tren/models/train_data.dart' hide State; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/train_info_page/train_info_constants.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart'; +import 'package:info_tren/utils/state_to_string.dart'; + +class TrainInfoLoadingCupertino extends TrainInfoLoading { + TrainInfoLoadingCupertino({required String title, String? loadingText}) : super(title: title, loadingText: loadingText, uiDesign: UiDesign.CUPERTINO); + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + navigationBar: CupertinoNavigationBar( + middle: Text(title), + ), + child: Center( + child: loadingWidget, + ), + ); + } +} + +class TrainInfoErrorCupertino extends TrainInfoError { + TrainInfoErrorCupertino({required Object error, required String title,}) : super(error: error, title: title,); + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + navigationBar: CupertinoNavigationBar( + middle: Text(title), + ), + child: Center( + child: Text(error.toString()), + ), + ); + } +} + +class TrainInfoCupertino extends StatelessWidget { + final TrainData trainData; + + TrainInfoCupertino({required this.trainData}); + + @override + Widget build(BuildContext context) { + return CupertinoPageScaffold( + navigationBar: CupertinoNavigationBar( + middle: Text("Informații despre ${trainData.rank} ${trainData.number}"), + ), + child: SafeArea( + top: false, + bottom: false, + child: Builder( + builder: (context) { + final topPadding = MediaQuery.of(context).padding.top; + + return CustomScrollView( + slivers: [ + SliverToBoxAdapter( + child: Padding( + padding: EdgeInsets.only( + top: topPadding, + ), + child: Container(), + ), + ), + DisplayTrainID(trainData: trainData,), + DisplayTrainOperator(trainData: trainData,), + DisplayTrainRoute(trainData: trainData,), + DisplayTrainDeparture(trainData: trainData,), + SliverToBoxAdapter( + child: CupertinoDivider( + color: FOREGROUND_WHITE, + ), + ), + DisplayTrainLastInfo(trainData: trainData,), + SliverToBoxAdapter( + child: CupertinoDivider(), + ), + SliverToBoxAdapter( + child: IntrinsicHeight( + child: Row( + children: [ + // Expanded( + // child: DisplayTrainNextStop(trainData: trainData,), + // ), + Expanded( + child: DisplayTrainDestination(trainData: trainData,), + ), + SizedBox( + height: double.infinity, + child: CupertinoVerticalDivider(), + ), + Expanded(child: DisplayTrainRouteDistance(trainData: trainData,),), + ], + ), + ), + ), + // SliverToBoxAdapter( + // child: CupertinoDivider(), + // ), + // SliverToBoxAdapter( + // child: IntrinsicHeight( + // child: Row( + // children: [ + // // Expanded( + // // child: DisplayTrainRouteDuration(trainData: trainData,), + // // ), + // Expanded(child: Container(),), + // SizedBox( + // height: double.infinity, + // child: CupertinoVerticalDivider(), + // ), + // Expanded( + // child: DisplayTrainRouteDistance(trainData: trainData,), + // ) + // ], + // ), + // ), + // ), + SliverToBoxAdapter( + child: CupertinoDivider( + color: FOREGROUND_WHITE, + ), + ), + DisplayTrainStations( + trainData: trainData, + ), + SliverToBoxAdapter( + child: Container( + height: MediaQuery.of(context).viewPadding.bottom, + ), + ), + ], + ); + } + ), + ), + ); + + // return CupertinoPageScaffold( + // navigationBar: CupertinoNavigationBar( + // middle: Text(title ?? ""), + // ), + // child: SafeArea( + // bottom: false, + // child: FutureBuilder( + // future: TrainDataWebViewAdapter.of(context).trainData(onInvalidation: () { + // Navigator.of(context).pop(); + // }), + // builder: (context, snapshot) { + // if (!snapshot.hasData) { + // return Center( + // child: CupertinoActivityIndicator(), + // ); + // } + + // try { + // Future.wait([ + // snapshot.data.rang, + // snapshot.data.trainNumber + // ]).then((values) { + // setState(() { + // title = "Informații despre ${values[0]} ${values[1]}"; + // }); + // }); + + // return CustomScrollView( + // slivers: [ + // DisplayTrainID(data: snapshot.data,), + // DisplayTrainOperator(data: snapshot.data,), + // DisplayTrainRoute(data: snapshot.data,), + // DisplayTrainDeparture(data: snapshot.data,), + // SliverToBoxAdapter( + // child: CupertinoDivider( + // color: FOREGROUND_WHITE, + // ), + // ), + // DisplayTrainLastInfo(data: snapshot.data,), + // SliverToBoxAdapter( + // child: CupertinoDivider(), + // ), + // SliverToBoxAdapter( + // child: IntrinsicHeight( + // child: Row( + // children: [ + // Expanded( + // child: DisplayTrainNextStop(data: snapshot.data,), + // ), + // SizedBox( + // height: double.infinity, + // child: CupertinoVerticalDivider(), + // ), + // Expanded( + // child: DisplayTrainDestination(data: snapshot.data,), + // ) + // ], + // ), + // ), + // ), + // SliverToBoxAdapter( + // child: CupertinoDivider(), + // ), + // SliverToBoxAdapter( + // child: IntrinsicHeight( + // child: Row( + // children: [ + // Expanded( + // child: DisplayTrainRouteDuration(data: snapshot.data,), + // ), + // SizedBox( + // height: double.infinity, + // child: CupertinoVerticalDivider(), + // ), + // Expanded( + // child: DisplayTrainRouteDistance(data: snapshot.data,), + // ) + // ], + // ), + // ), + // ), + // SliverToBoxAdapter( + // child: CupertinoDivider( + // color: FOREGROUND_WHITE, + // ), + // ), + // DisplayTrainStations( + // data: snapshot.data, + // pageLoadFuture: TrainDataWebViewAdapter.of(context).nextLoadFuture, + // ), + // ], + // ); + // } + // on OnDemandInvalidatedException { + // Navigator.of(context).pop(); + // print("Got OnDemandInvalidatedException!"); + // return Container(); + // } + // }, + // ), + // ), + // ); + } +} + +class DisplayTrainID extends StatelessWidget { + final TrainData trainData; + DisplayTrainID({required this.trainData}); + + @override + Widget build(BuildContext context) { + return SliverToBoxAdapter( + child: Center( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "${trainData.rank} ${trainData.number}", + style: CupertinoTheme.of(context).textTheme.navLargeTitleTextStyle, + ), + ), + ), + ); + } +} + +class DisplayTrainRoute extends StatelessWidget { + final TrainData trainData; + + DisplayTrainRoute({required this.trainData}); + + @override + Widget build(BuildContext context) { + return SliverToBoxAdapter( + child: Row( + children: [ + Center( + child: Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.route.from, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 16, + ), + ), + ), + ), + Expanded(child: Container(),), + Center(child: Text("-")), + Expanded(child: Container(),), + Center( + child: Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.route.to, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 16, + ), + textAlign: TextAlign.right, + ), + ), + ), + ], + ), + ); + } +} + +class DisplayTrainOperator extends StatelessWidget { + final TrainData trainData; + + DisplayTrainOperator({required this.trainData}); + + @override + Widget build(BuildContext context) { + return SliverToBoxAdapter( + child: Center( + child: Text( + trainData.operator, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 14, + fontStyle: FontStyle.italic, + ), + ), + ), + ); + } +} + +class DisplayTrainDeparture extends StatelessWidget { + final TrainData trainData; + + DisplayTrainDeparture({required this.trainData}); + + @override + Widget build(BuildContext context) { + return SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.all(2), + child: Text( + // "Plecare în ${dataPlecare.day.toString().padLeft(2, '0')}.${dataPlecare.month.toString().padLeft(2, '0')}.${dataPlecare.year.toString().padLeft(4, '0')}", + "Plecare în ${trainData.date}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontStyle: FontStyle.italic, + fontWeight: FontWeight.w200, + ), + textAlign: TextAlign.center, + ), + ), + ); + } +} + +class DisplayTrainLastInfo extends StatelessWidget { + final TrainData trainData; + + DisplayTrainLastInfo({required this.trainData}); + + @override + Widget build(BuildContext context) { + if (trainData.status == null) { + return SliverToBoxAdapter(child: Container(),); + } + + return SliverToBoxAdapter( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Center( + child: Padding( + padding: const EdgeInsets.all(2), + child: Text( + "Ultima informație", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + Row( + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.status!.station, + style: CupertinoTheme.of(context).textTheme.textStyle, + textAlign: TextAlign.left, + ), + ), + Expanded(child: Container(),), + Padding( + padding: const EdgeInsets.all(4), + child: Text( + stateToString(trainData.status!.state), + style: CupertinoTheme.of(context).textTheme.textStyle, + textAlign: TextAlign.right, + ), + ), + ], + ), + // FutureDisplay( + // future: trainData.lastInfo.dateAndTime, + // builder: (context, dt) { + // return Text( + // "Raportat în ${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')}.${dt.year.toString().padLeft(4, '0')}, la ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}", + // textAlign: TextAlign.center, + // ); + // }, + // ), + Builder( + builder: (context) { + final data = trainData.status!.delay; + + if (data == 0) { + return Container(); + } + + if (data > 0) { + return Text( + "$data minute întârziere", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 14, + color: CupertinoColors.destructiveRed, + ), + ); + } + else { + return Text( + "${-data} minute mai devreme", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 12, + color: CupertinoColors.activeGreen, + ), + ); + } + }, + ) + ], + ), + ); + } +} + +// class DisplayTrainNextStop extends StatelessWidget { +// final TrainData trainData; +// +// DisplayTrainNextStop({required this.trainData}); +// +// @override +// Widget build(BuildContext context) { +// return FutureBuilder( +// future: trainData.nextStop.stationName, +// builder: (context, snapshot) { +// if (!snapshot.hasData) return Container(); +// +// return Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Padding( +// padding: const EdgeInsets.all(4), +// child: Text( +// "Următoarea oprire", +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 20, +// fontWeight: FontWeight.bold, +// ), +// textAlign: TextAlign.center, +// ), +// ), +// CupertinoDivider( +// color: Color.fromRGBO(15, 15, 15, 1), +// ), +// FutureDisplay( +// future: trainData.nextStop.stationName, +// builder: (context, station) { +// return Padding( +// padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), +// child: Text( +// station, +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 18, +// fontWeight: FontWeight.w500, +// ), +// textAlign: TextAlign.center, +// ), +// ); +// }, +// ), +// FutureDisplay( +// future: trainData.nextStop.arrival, +// builder: (context, arrival) { +// const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; +// +// return Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Text( +// "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 14, +// ), +// textAlign: TextAlign.center, +// ), +// Text( +// "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 14, +// ), +// textAlign: TextAlign.center, +// ), +// ], +// ); +// }, +// ) +// ], +// ); +// } +// ); +// } +// } + +class DisplayTrainDestination extends StatelessWidget { + final TrainData trainData; + + DisplayTrainDestination({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: Text( + "Destinația", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 20, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + ), + CupertinoDivider( + color: Color.fromRGBO(15, 15, 15, 1), + ), + Padding( + padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), + child: Text( + trainData.stations.last.name, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 18, + fontWeight: FontWeight.w500, + ), + textAlign: TextAlign.center, + ), + ), + Builder( + builder: (context) { + final arrival = trainData.stations.last.arrival!.scheduleTime; + final delay = trainData.stations.last.arrival!.status?.delay ?? 0; + final parts = arrival.split(':'); + final arrivalDT = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day, int.parse(parts[0]), int.parse(parts[1])); + final arrivalWithDelay = arrivalDT.add(Duration(minutes: delay)); + final arrivalWithDelayString = '${arrivalWithDelay.hour}:${arrivalWithDelay.minute.toString().padLeft(2, "0")}'; + // const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + // Text( + // "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", + // style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + // fontSize: 14, + // ), + // textAlign: TextAlign.center, + // ), + Text.rich( + TextSpan( + text: 'la', + children: [ + TextSpan(text: ' '), + TextSpan( + text: '$arrival', + style: delay == 0 ? null : TextStyle( + decoration: TextDecoration.lineThrough, + ), + ), + if (delay != 0) ...[ + TextSpan(text: ' '), + TextSpan( + text: '$arrivalWithDelayString', + style: TextStyle( + color: delay > 0 ? CupertinoColors.destructiveRed : CupertinoColors.activeGreen, + ), + ), + ] + ], + ), + // "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 14, + ), + textAlign: TextAlign.center, + ), + ], + ); + }, + ) + ], + ); + } +} + +class DisplayTrainRouteDistance extends StatelessWidget { + final TrainData trainData; + + DisplayTrainRouteDistance({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "Distanța rutei", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 18, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + Text( + "${trainData.stations.last.km} km", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 16, + ), + textAlign: TextAlign.center, + ), + ], + ); + } +} + +// class DisplayTrainRouteDuration extends StatelessWidget { +// final TrainData trainData; +// +// DisplayTrainRouteDuration({required this.trainData}); +// +// @override +// Widget build(BuildContext context) { +// return Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Text( +// "Durata rutei", +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 18, +// fontWeight: FontWeight.bold, +// ), +// textAlign: TextAlign.center, +// ), +// FutureDisplay( +// future: trainData.routeDuration, +// builder: (context, duration) { +// var durationString = StringBuffer(); +// +// bool firstWritten = false; +// +// if (duration.inDays > 0) { +// firstWritten = true; +// if (duration.inDays == 1) durationString.write("1 zi"); +// else durationString.write("${duration.inDays} zile"); +// duration -= Duration(days: duration.inDays); +// } +// +// if (duration.inHours > 0) { +// if (firstWritten) { +// durationString.write(", "); +// } +// firstWritten = true; +// if (duration.inHours == 1) durationString.write("1 oră"); +// else durationString.write("${duration.inHours} ore"); +// duration -= Duration(hours: duration.inHours); +// } +// +// if (duration.inMinutes > 0) { +// if (firstWritten) { +// durationString.write(", "); +// } +// firstWritten = true; +// if (duration.inMinutes == 1) durationString.write("1 minut"); +// else durationString.write("${duration.inMinutes} minute"); +// duration -= Duration(minutes: duration.inMinutes); +// } +// +// return Text( +// durationString.toString(), +// style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( +// fontSize: 16, +// ), +// textAlign: TextAlign.center, +// ); +// }, +// ), +// ], +// ); +// } +// } + +class DisplayTrainStations extends StatelessWidget { + final TrainData trainData; + + DisplayTrainStations({required this.trainData,}); + + @override + Widget build(BuildContext context) { + return SliverList( + delegate: SliverChildBuilderDelegate( + (context, index) { + if (index.isOdd) { + return CupertinoDivider(); + } + else { + final itemIndex = index ~/ 2; + return IndexedSemantics( + child: DisplayTrainStation( + station: trainData.stations[itemIndex], + ), + index: itemIndex, + ); + } + }, + childCount: trainData.stations.length * 2 - 1, + addSemanticIndexes: false, + ), + ); + } +} diff --git a/lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart b/lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart new file mode 100644 index 0000000..864cc30 --- /dev/null +++ b/lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart @@ -0,0 +1,466 @@ +import 'package:flutter/cupertino.dart'; +import 'package:info_tren/models/train_data.dart'; +import 'package:info_tren/pages/train_info_page/train_info_constants.dart'; + +class DisplayTrainStation extends StatelessWidget { + final Station station; + + DisplayTrainStation({required this.station}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Builder( + builder: (context) { + final delay = station.departure?.status?.delay ?? station.arrival?.status?.delay; + final real = station.departure?.status?.real ?? station.arrival?.status?.real; + + final isDelayed = delay != null && delay > 0 && real == true; + final isOnTime = delay != null && delay <= 0 && real == true; + final isNotScheduled = false; + + return KmBadge( + station: station, + isNotScheduled: isNotScheduled, + isDelayed: isDelayed, + isOnTime: isOnTime, + ); + } + ), + Expanded( + child: Title( + station: station, + ), + ) + ], + ), + Time( + station: station, + ), + Delay( + station: station, + ), + ], + ); + } +} + +class KmBadge extends StatelessWidget { + final Station station; + final bool isNotScheduled; + final bool isOnTime; + final bool isDelayed; + + KmBadge({ + required this.station, + this.isNotScheduled = false, + this.isOnTime = false, + this.isDelayed = false, + }); + + @override + Widget build(BuildContext context) { + Color foregroundColor = FOREGROUND_WHITE; + Color? backgroundColor; + + if (isNotScheduled) { + foregroundColor = Color.fromRGBO(225, 175, 30, 1); + backgroundColor = Color.fromRGBO(80, 40, 10, 1); + } + else if (isOnTime) { + foregroundColor = Color.fromRGBO(130, 175, 65, 1); + backgroundColor = Color.fromRGBO(40, 80, 10, 1); + } + else if (isDelayed) { + foregroundColor = Color.fromRGBO(225, 75, 30, 1); + backgroundColor = Color.fromRGBO(80, 20, 10, 1); + } + + return Padding( + padding: const EdgeInsets.all(8), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + width: 2, + color: foregroundColor, + ), + color: backgroundColor, + // color: CupertinoColors.activeOrange, + ), + width: 48, + height: 48, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: Center( + child: Text( + station.km.toString(), + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 20, + fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, + color: MediaQuery.of(context).boldText ? FOREGROUND_WHITE : foregroundColor, + ), + textAlign: TextAlign.center, + ), + ), + ), + Text( + "km", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 10, + color: MediaQuery.of(context).boldText ? FOREGROUND_WHITE : foregroundColor, + ), + ), + ], + ), + ), + ); + } +} + +class Title extends StatelessWidget { + final Station station; + + Title({ + required this.station + }); + + @override + Widget build(BuildContext context) { + return Text( + station.name, + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 22, + fontWeight: MediaQuery.of(context).boldText ? FontWeight.w500 : FontWeight.w300, + // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal, + ), + textAlign: TextAlign.center, + ); + } +} + +class Time extends StatelessWidget { + final Station station; + + Time({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + if (station.arrival == null) { + // Plecare + return DepartureTime( + station: station, + firstStation: true, + ); + } + + if (station.departure == null) { + // Sosire + return ArrivalTime( + station: station, + finalStation: true, + ); + } + + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "→", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 22, + ), + ), + Container(width: 2,), + ArrivalTime(station: station,), + Expanded(child: Container(),), + StopTime(station: station,), + Expanded(child: Container(),), + DepartureTime(station: station,), + Container(width: 2,), + Text( + "→", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 22, + ), + ), + ], + ); + } +} + +class ArrivalTime extends StatelessWidget { + final Station station; + final bool finalStation; + + ArrivalTime({ + required this.station, + this.finalStation = false, + }); + + @override + Widget build(BuildContext context) { + if (finalStation) { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "→", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 22, + ), + ), + Container(width: 2,), + Text("sosire la "), + ArrivalTime(station: station,), + Expanded(child: Container(),), + ], + ); + } + else { + final delay = station.arrival!.status?.delay ?? 0; + final time = station.arrival!.scheduleTime; + + if (delay == 0) { + return Text("$time"); + } + else if (delay > 0) { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.destructiveRed, + ), + ), + ], + ); + } + else { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.subtract(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.activeGreen, + ), + ), + ], + ); + } + } + } +} + +class StopTime extends StatelessWidget { + final Station station; + + StopTime({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + final stopsFor = station.stoppingTime!; + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "staționează pentru", + textAlign: TextAlign.center, + ), + Builder( + builder: (context) { + int stopsForInt = stopsFor; + if (stopsForInt == 1) { + return Text( + "1 minut", + textAlign: TextAlign.center, + ); + } + else if (stopsForInt < 20) { + return Text( + "$stopsFor minute", + textAlign: TextAlign.center, + ); + } + else { + return Text( + "$stopsFor de minute", + textAlign: TextAlign.center, + ); + } + }, + ) + ], + ); + } +} + +class DepartureTime extends StatelessWidget { + final Station station; + final bool firstStation; + + DepartureTime({ + required this.station, + this.firstStation = false, + }); + + @override + Widget build(BuildContext context) { + if (firstStation) { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded(child: Container(),), + Text("plecare la "), + DepartureTime(station: station,), + Container(width: 2,), + Text( + "→", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + fontSize: 22, + ), + ), + ], + ); + } + else { + final delay = station.departure!.status?.delay ?? 0; + final time = station.departure!.scheduleTime; + + if (delay == 0) { + return Text("$time"); + } + else if (delay > 0) { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.destructiveRed, + ), + ), + ], + ); + } + else { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.subtract(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.activeGreen, + ), + ), + ], + ); + } + } + } +} + +class Delay extends StatelessWidget { + final Station station; + + Delay({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + if (station.arrival?.status == null && station.departure?.status == null) { + return Container(); + } + var delay = station.arrival?.status?.delay; + if (station.departure?.status?.real == true) { + delay = station.departure?.status?.delay; + } + + if (delay == 0 || delay == null) return Container(); + else if (delay > 0) { + return Text( + "$delay minute întârziere", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.destructiveRed, + fontSize: 14, + fontStyle: FontStyle.italic, + ), + ); + } + else if (delay < 0) { + return Text( + "${-delay} minute mai devreme", + style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( + color: CupertinoColors.activeGreen, + fontSize: 14, + fontStyle: FontStyle.italic, + ), + ); + } + + return Container(); + } +} diff --git a/lib/pages/train_info_page/view_train/train_info_material.dart b/lib/pages/train_info_page/view_train/train_info_material.dart new file mode 100644 index 0000000..8b2060d --- /dev/null +++ b/lib/pages/train_info_page/view_train/train_info_material.dart @@ -0,0 +1,659 @@ +import 'package:flutter/material.dart'; +import 'package:info_tren/components/slim_app_bar.dart'; +import 'package:info_tren/models/train_data.dart' hide State; +import 'package:info_tren/models/ui_design.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart'; +import 'package:info_tren/utils/state_to_string.dart'; + +class TrainInfoLoadingMaterial extends TrainInfoLoading { + TrainInfoLoadingMaterial({required String title, String? loadingText}) : super(title: title, loadingText: loadingText, uiDesign: UiDesign.MATERIAL); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(title), + ), + body: Center( + child: loadingWidget, + ), + ); + } +} + +class TrainInfoErrorMaterial extends TrainInfoError { + TrainInfoErrorMaterial({required Object error, required String title,}) : super(error: error, title: title,); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(title), + ), + body: Center( + child: Text(error.toString()), + ), + ); + } +} + +bool isSmallScreen(BuildContext context) => MediaQuery.of(context).size.height <= 425; + +class TrainInfoMaterial extends StatelessWidget { + final TrainData trainData; + + TrainInfoMaterial({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Builder( + builder: (context) { + return Scaffold( + appBar: isSmallScreen(context) ? null : AppBar( + centerTitle: true, + title: Text("Informații despre ${trainData.rank} ${trainData.number}"), + ), + body: Column( + children: [ + if (isSmallScreen(context)) + SlimAppBar( + title: 'INFO TREN - ${trainData.rank} ${trainData.number}' + ), + Expanded( + child: SafeArea( + bottom: false, + child: CustomScrollView( + slivers: [ + SliverToBoxAdapter( + child: DisplayTrainID(trainData: trainData,), + ), + SliverToBoxAdapter( + child: DisplayTrainOperator(trainData: trainData,), + ), + SliverPadding( + padding: const EdgeInsets.only(left: 2, right: 2), + sliver: SliverToBoxAdapter( + child: DisplayTrainRoute(trainData: trainData,), + ), + ), + SliverToBoxAdapter( + child: DisplayTrainDeparture(trainData: trainData,), + ), + // SliverToBoxAdapter( + // child: Divider( + // color: Colors.white70, + // height: isSmallScreen(context) ? 8 : 16, + // ), + // ), + SliverToBoxAdapter( + child: DisplayTrainLastInfo(trainData: trainData,), + ), + SliverToBoxAdapter( + child: IntrinsicHeight( + child: Row( + children: [ + // Expanded(child: DisplayTrainNextStop(trainData: trainData,)), + Expanded(child: DisplayTrainDestination(trainData: trainData,)), + Expanded(child: DisplayTrainRouteDistance(trainData: trainData,),), + ], + ), + ), + ), + // SliverToBoxAdapter( + // child: IntrinsicHeight( + // child: Row( + // children: [ + // // Expanded(child: DisplayTrainRouteDuration(trainData: trainData,)), + // Expanded(child: Container(),), + // Expanded(child: DisplayTrainRouteDistance(trainData: trainData,)), + // ], + // ), + // ), + // ), + SliverToBoxAdapter( + child: Divider( + color: Colors.white70, + height: isSmallScreen(context) ? 8 : 16, + ), + ), + DisplayTrainStations( + trainData: trainData, + ), + SliverToBoxAdapter( + child: Container( + height: MediaQuery.of(context).viewPadding.bottom, + ), + ), + ], + ), + ), + ), + ], + ), + ); + }, + ); + } +} + +class DisplayTrainID extends StatelessWidget { + final TrainData trainData; + + DisplayTrainID({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Text( + "${trainData.rank} ${trainData.number}", + style: (isSmallScreen(context) + ? Theme.of(context).textTheme.headline4 + : Theme.of(context).textTheme.headline3)?.copyWith( + color: Theme.of(context).textTheme.bodyText2?.color, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ); + } +} + +class DisplayTrainOperator extends StatelessWidget { + final TrainData trainData; + + DisplayTrainOperator({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Text( + trainData.operator, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontStyle: FontStyle.italic, + fontSize: isSmallScreen(context) ? 12 : 14, + ), + textAlign: TextAlign.center, + ); + } +} + +class DisplayTrainRoute extends StatelessWidget { + final TrainData trainData; + + DisplayTrainRoute({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Center( + child: Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.route.from, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: 16, + ), + ), + ), + ), + Expanded(child: Container(),), + Center(child: Text("-")), + Expanded(child: Container(),), + Center( + child: Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.route.to, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: 16, + ), + textAlign: TextAlign.right, + ), + ), + ), + ], + ); + } +} + +class DisplayTrainDeparture extends StatelessWidget { + final TrainData trainData; + + DisplayTrainDeparture({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(2), + child: Text( + // "Plecare în ${dataPlecare.day.toString().padLeft(2, '0')}.${dataPlecare.month.toString().padLeft(2, '0')}.${dataPlecare.year.toString().padLeft(4, '0')}", + "Plecare în ${trainData.date}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontStyle: FontStyle.italic, + fontWeight: FontWeight.w200, + fontSize: isSmallScreen(context) ? 14 : 16, + ), + textAlign: TextAlign.center, + ), + ); + } +} + +class DisplayTrainLastInfo extends StatelessWidget { + final TrainData trainData; + + DisplayTrainLastInfo({required this.trainData}); + + @override + Widget build(BuildContext context) { + if (trainData.status == null) { + return Container(); + } + + return Card( + child: Padding( + padding: const EdgeInsets.all(2), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Center( + child: Padding( + padding: const EdgeInsets.all(2), + child: Text( + "Ultima informație", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 20 : 22, + fontWeight: FontWeight.bold, + ), + ), + ), + ), + Row( + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: Text( + trainData.status!.station, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 16 : 18, + ), + textAlign: TextAlign.left, + ), + ), + Expanded(child: Container(),), + Padding( + padding: const EdgeInsets.all(4), + child: Text( + stateToString(trainData.status!.state), + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 16 : 18, + ), + textAlign: TextAlign.right, + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.all(2), + child: Row( + children: [ + // FutureDisplay( + // future: trainData.lastInfo.dateAndTime, + // builder: (context, dt) { + // return Text( + // "Raportat în ${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')}.${dt.year.toString().padLeft(4, '0')}, la ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}", + // textAlign: TextAlign.center, + // ); + // }, + // ), + Expanded(child: Container(),), + Builder( + builder: (context) { + final data = trainData.status!.delay; + if (data == 0) { + return Container(); + } + + if (data > 0) { + return Text( + "$data minute întârziere", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 14 : 16, + color: Colors.red.shade300, + ), + ); + } + else { + return Text( + "${-data} minute mai devreme", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 14 : 16, + color: Colors.green.shade300, + ), + ); + } + }, + ), + ], + ), + ), + ], + ), + ), + ); + } +} + +// class DisplayTrainNextStop extends StatelessWidget { +// final OnDemandTrainData trainData; +// +// DisplayTrainNextStop({@required this.trainData}); +// +// @override +// Widget build(BuildContext context) { +// return FutureBuilder( +// future: trainData.nextStop.stationName, +// builder: (context, snapshot) { +// if (!snapshot.hasData) return Container(height: 0,); +// +// return Card( +// child: Center( +// child: Padding( +// padding: const EdgeInsets.all(2), +// child: Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Padding( +// padding: const EdgeInsets.all(4), +// child: Text( +// "Următoarea oprire", +// style: Theme.of(context).textTheme.bodyText2.copyWith( +// fontSize: isSmallScreen(context) ? 18 : 20, +// fontWeight: FontWeight.bold, +// ), +// textAlign: TextAlign.center, +// ), +// ), +// FutureDisplay( +// future: trainData.nextStop.stationName, +// builder: (context, station) { +// return Padding( +// padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), +// child: Text( +// station, +// style: Theme.of(context).textTheme.bodyText2.copyWith( +// fontSize: isSmallScreen(context) ? 16 : 18, +// fontWeight: FontWeight.w500, +// ), +// textAlign: TextAlign.center, +// ), +// ); +// }, +// ), +// FutureDisplay( +// future: trainData.nextStop.arrival, +// builder: (context, arrival) { +// const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; +// +// return Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Text( +// "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", +// style: Theme.of(context).textTheme.bodyText2.copyWith( +// fontSize: isSmallScreen(context) ? 12 : 14, +// ), +// textAlign: TextAlign.center, +// ), +// Text( +// "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", +// style: Theme.of(context).textTheme.bodyText2.copyWith( +// fontSize: isSmallScreen(context) ? 12 : 14, +// ), +// textAlign: TextAlign.center, +// ), +// ], +// ); +// }, +// ) +// ], +// ), +// ), +// ), +// ); +// } +// ); +// } +// } + +class DisplayTrainDestination extends StatelessWidget { + final TrainData trainData; + + DisplayTrainDestination({required this.trainData}); + + @override + Widget build(BuildContext context) { + final destination = trainData.stations.last; + + return Card( + child: Center( + child: Padding( + padding: const EdgeInsets.all(2), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.all(4), + child: Text( + "Destinația", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 20 : 22, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + ), + Padding( + padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), + child: Text( + destination.name, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 20, + fontWeight: FontWeight.w500, + ), + textAlign: TextAlign.center, + ), + ), + Builder( + builder: (context) { + final arrival = destination.arrival!.scheduleTime; + final delay = trainData.stations.last.arrival!.status?.delay ?? 0; + final parts = arrival.split(':'); + final arrivalDT = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day, int.parse(parts[0]), int.parse(parts[1])); + final arrivalWithDelay = arrivalDT.add(Duration(minutes: delay)); + final arrivalWithDelayString = '${arrivalWithDelay.hour}:${arrivalWithDelay.minute.toString().padLeft(2, "0")}'; + // const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + // Text( + // "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", + // style: Theme.of(context).textTheme.bodyText2?.copyWith( + // fontSize: isSmallScreen(context) ? 12 : 14, + // ), + // textAlign: TextAlign.center, + // ), + Text.rich( + // "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", + TextSpan( + text: 'la', + children: [ + TextSpan(text: ' '), + TextSpan( + text: '$arrival', + style: delay == 0 ? null : TextStyle( + decoration: TextDecoration.lineThrough, + ), + ), + if (delay != 0) ...[ + TextSpan(text: ' '), + TextSpan( + text: '$arrivalWithDelayString', + style: TextStyle( + color: delay > 0 ? Colors.red.shade300 : Colors.green.shade300, + ), + ), + ] + ], + ), + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 14 : 16, + ), + textAlign: TextAlign.center, + ), + ], + ); + }, + ) + ], + ), + ), + ), + ); + } +} + +class DisplayTrainRouteDistance extends StatelessWidget { + final TrainData trainData; + + DisplayTrainRouteDistance({required this.trainData}); + + @override + Widget build(BuildContext context) { + return Card( + child: Center( + child: Padding( + padding: const EdgeInsets.all(2), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "Distanța rutei", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 20 : 22, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + Text( + "${trainData.stations.last.km} km", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 20, + ), + textAlign: TextAlign.center, + ), + ], + ), + ), + ), + ); + } +} + +// class DisplayTrainRouteDuration extends StatelessWidget { +// final TrainData trainData; +// +// DisplayTrainRouteDuration({required this.trainData}); +// +// @override +// Widget build(BuildContext context) { +// return Card( +// child: Center( +// child: Padding( +// padding: const EdgeInsets.all(2), +// child: Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Text( +// "Durata rutei", +// style: Theme.of(context).textTheme.bodyText2?.copyWith( +// fontSize: isSmallScreen(context) ? 16 : 18, +// fontWeight: FontWeight.bold, +// ), +// textAlign: TextAlign.center, +// ), +// FutureDisplay( +// future: trainData.routeDuration, +// builder: (context, duration) { +// var durationString = StringBuffer(); +// +// bool firstWritten = false; +// +// if (duration.inDays > 0) { +// firstWritten = true; +// if (duration.inDays == 1) durationString.write("1 zi"); +// else durationString.write("${duration.inDays} zile"); +// duration -= Duration(days: duration.inDays); +// } +// +// if (duration.inHours > 0) { +// if (firstWritten) { +// durationString.write(", "); +// } +// firstWritten = true; +// if (duration.inHours == 1) durationString.write("1 oră"); +// else durationString.write("${duration.inHours} ore"); +// duration -= Duration(hours: duration.inHours); +// } +// +// if (duration.inMinutes > 0) { +// if (firstWritten) { +// durationString.write(", "); +// } +// firstWritten = true; +// if (duration.inMinutes == 1) durationString.write("1 minut"); +// else durationString.write("${duration.inMinutes} minute"); +// duration -= Duration(minutes: duration.inMinutes); +// } +// +// return Text( +// durationString.toString(), +// style: Theme.of(context).textTheme.bodyText2?.copyWith( +// fontSize: isSmallScreen(context) ? 14 : 16, +// ), +// textAlign: TextAlign.center, +// ); +// }, +// ), +// ], +// ), +// ), +// ), +// ); +// } +// } + +class DisplayTrainStations extends StatelessWidget { + final TrainData trainData; + + DisplayTrainStations({required this.trainData}); + + @override + Widget build(BuildContext context) { + return SliverList( + delegate: SliverChildBuilderDelegate( + (context, index) { + return IndexedSemantics( + child: DisplayTrainStation( + station: trainData.stations[index], + ), + index: index, + ); + }, + childCount: trainData.stations.length, + addSemanticIndexes: true, + ), + ); + } +} + diff --git a/lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart b/lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart new file mode 100644 index 0000000..01f6ac4 --- /dev/null +++ b/lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart @@ -0,0 +1,476 @@ +import 'package:flutter/material.dart'; +import 'package:info_tren/models/train_data.dart'; +import 'package:info_tren/pages/train_info_page/view_train/train_info_material.dart' show isSmallScreen; + +class DisplayTrainStation extends StatelessWidget { + final Station station; + + DisplayTrainStation({required this.station}); + + @override + Widget build(BuildContext context) { + return Card( + child: Padding( + padding: const EdgeInsets.all(2), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Builder( + builder: (context) { + final delay = station.departure?.status?.delay ?? station.arrival?.status?.delay; + final real = station.departure?.status?.real ?? station.arrival?.status?.real; + + final isDelayed = delay != null && delay > 0 && real == true; + final isOnTime = delay != null && delay <= 0 && real == true; + final isNotScheduled = false; + + return KmBadge( + station: station, + isNotScheduled: isNotScheduled, + isDelayed: isDelayed, + isOnTime: isOnTime, + ); + } + ), + Expanded( + child: Title( + station: station, + ), + ), + ], + ), + Time( + station: station, + ), + Delay( + station: station, + ), + ], + ), + ), + ); + } +} + +class KmBadge extends StatelessWidget { + final Station station; + final bool isNotScheduled; + final bool isOnTime; + final bool isDelayed; + + KmBadge({ + required this.station, + this.isNotScheduled = false, + this.isOnTime = false, + this.isDelayed = false, + }); + + @override + Widget build(BuildContext context) { + Color foregroundColor = Colors.white70; + Color? backgroundColor; + + if (isNotScheduled) { + foregroundColor = Colors.orange.shade300; + backgroundColor = Colors.orange.shade900.withOpacity(0.3); + } + else if (isOnTime) { + foregroundColor = Colors.green.shade300; + backgroundColor = Colors.green.shade900.withOpacity(0.3); + } + else if (isDelayed) { + foregroundColor = Colors.red.shade300; + backgroundColor = Colors.red.shade900.withOpacity(0.3); + } + + return Padding( + padding: const EdgeInsets.all(8), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + width: 2, + color: foregroundColor, + ), + color: backgroundColor, + ), + width: isSmallScreen(context) ? 42 : 48, + height: isSmallScreen(context) ? 42 : 48, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: Center( + child: Text( + station.km.toString(), + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 16 : 20, + fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, + color: MediaQuery.of(context).boldText ? Colors.white70 : foregroundColor, + ), + textAlign: TextAlign.center, + ), + ), + ), + Text( + "km", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: 10, + color: MediaQuery.of(context).boldText ? Colors.white70 : foregroundColor, + ), + ), + ], + ), + ), + ); + } +} + +class Title extends StatelessWidget { + final Station station; + + Title({ + required this.station + }); + + @override + Widget build(BuildContext context) { + return Text( + station.name, + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 22, + fontWeight: MediaQuery.of(context).boldText ? FontWeight.w500 : FontWeight.w300, + // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal, + ), + textAlign: TextAlign.center, + ); + } +} + +class Time extends StatelessWidget { + final Station station; + + Time({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + if (station.arrival == null) { + // Plecare + return DepartureTime( + station: station, + firstStation: true, + ); + } + + if (station.departure == null) { + // Sosire + return ArrivalTime( + station: station, + finalStation: true, + ); + } + + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "→", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 22, + ), + ), + Container(width: 2,), + ArrivalTime(station: station,), + Expanded(child: Container(),), + StopTime(station: station,), + Expanded(child: Container(),), + DepartureTime(station: station,), + Container(width: 2,), + Text( + "→", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 22, + ), + ), + ], + ); + } +} + +class ArrivalTime extends StatelessWidget { + final Station station; + final bool finalStation; + + ArrivalTime({ + required this.station, + this.finalStation = false, + }); + + @override + Widget build(BuildContext context) { + if (station.arrival == null) { + return Container(); + } + if (finalStation) { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "→", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: isSmallScreen(context) ? 18 : 22, + ), + ), + Container(width: 2,), + Text("sosire la "), + ArrivalTime(station: station,), + Expanded(child: Container(),), + ], + ); + } + else { + final delay = station.arrival!.status?.delay ?? 0; + final time = station.arrival!.scheduleTime; + + if (delay == 0) { + return Text("$time"); + } + else if (delay > 0) { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.red.shade300, + ), + ), + ], + ); + } + else { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.green.shade300, + ), + ), + ], + ); + } + } + } +} + +class StopTime extends StatelessWidget { + final Station station; + + StopTime({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "staționează pentru", + textAlign: TextAlign.center, + ), + Builder( + builder: (context) { + int stopsForInt = station.stoppingTime!; + if (stopsForInt == 1) { + return Text( + "1 minut", + textAlign: TextAlign.center, + ); + } + else if (stopsForInt < 20) { + return Text( + "${station.stoppingTime} minute", + textAlign: TextAlign.center, + ); + } + else { + return Text( + "${station.stoppingTime} de minute", + textAlign: TextAlign.center, + ); + } + }, + ) + ], + ); + } +} + +class DepartureTime extends StatelessWidget { + final Station station; + final bool firstStation; + + DepartureTime({ + required this.station, + this.firstStation = false, + }); + + @override + Widget build(BuildContext context) { + if (station.departure == null) { + return Container(); + } + if (firstStation) { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded(child: Container(),), + Text("plecare la "), + DepartureTime(station: station,), + Container(width: 2,), + Text( + "→", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + fontSize: 22, + ), + ), + ], + ); + } + else { + final delay = station.departure!.status?.delay ?? 0; + final time = station.departure!.scheduleTime; + + if (delay == 0) { + return Text("$time"); + } + else if (delay > 0) { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.red.shade300, + ), + ), + ], + ); + } + else { + final splits = time.split(":").map((s) => int.parse(s)).toList(); + + final now = DateTime.now(); + final oldDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); + final newDate = oldDate.add(Duration(minutes: delay)); + + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + decoration: TextDecoration.lineThrough, + ), + ), + Text( + "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.green.shade300, + ), + ), + ], + ); + } + } + } +} + + +class Delay extends StatelessWidget { + final Station station; + + Delay({ + required this.station, + }); + + @override + Widget build(BuildContext context) { + if (station.arrival?.status == null && station.departure?.status == null) { + return Container(); + } + var delay = station.arrival?.status?.delay; + if (station.departure?.status?.real == true) { + delay = station.departure?.status?.delay; + } + + if (delay == 0 || delay == null) return Container(); + else if (delay > 0) { + return Text( + "$delay minute întârziere", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.red.shade300, + fontSize: 14, + fontStyle: FontStyle.italic, + ), + ); + } + else if (delay < 0) { + return Text( + "${-delay} minute mai devreme", + style: Theme.of(context).textTheme.bodyText2?.copyWith( + color: Colors.green.shade300, + fontSize: 14, + fontStyle: FontStyle.italic, + ), + ); + } + + return Container(); + } +} diff --git a/lib/stations_list.dart b/lib/stations_list.dart.old similarity index 78% rename from lib/stations_list.dart rename to lib/stations_list.dart.old index a69964d..6f8129f 100644 --- a/lib/stations_list.dart +++ b/lib/stations_list.dart.old @@ -40,7 +40,7 @@ enum NotchStyle { } class StopListLine extends StatelessWidget { - final StationEntry station; + final Station station; final int width; StopListLine(this.station, {this.width = 32}) : assert(width.isEven); @@ -151,7 +151,7 @@ class StopListLinePainter extends CustomPainter { } class StopOnLineDetails extends StatelessWidget { - final StationEntry station; + final Station station; StopOnLineDetails(this.station); @override @@ -172,11 +172,11 @@ class StopOnLineDetails extends StatelessWidget { textAlign: TextAlign.center, ), ), - if (station.observations == "ONI") - Padding( - padding: const EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.5), - child: Text("oprire ne-itinerarică", style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.red.shade700),), - ), + // if (station.observations == "ONI") + // Padding( + // padding: const EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.5), + // child: Text("oprire ne-itinerarică", style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.red.shade700),), + // ), Padding( padding: const EdgeInsets.fromLTRB(8.0, 0.5, 8.0, 8.0), child: Text( @@ -186,11 +186,12 @@ class StopOnLineDetails extends StatelessWidget { ), ), StopOnLineTimeDetails(station), - if (station.real) - Padding( - padding: const EdgeInsets.all(2.0), - child: StopOnLineDelayDetails(station), - ), + // TODO: Figure out how to display delay info + // if (station.arrival != null && station.arrival.status != null || station.departure != null && station.departure.status != null) + // Padding( + // padding: const EdgeInsets.all(2.0), + // child: StopOnLineDelayDetails(station), + // ), Divider( height: 0, ), @@ -201,14 +202,14 @@ class StopOnLineDetails extends StatelessWidget { } class StopOnLineTimeDetails extends StatelessWidget { - final StationEntry station; + final Station station; StopOnLineTimeDetails(this.station); @override Widget build(BuildContext context) { return Row( children: [ - if (station.arrivalTime.isNotEmpty) + if (station.arrival != null) Padding( padding: const EdgeInsets.all(4.0), child: Align( @@ -221,14 +222,14 @@ class StopOnLineTimeDetails extends StatelessWidget { textAlign: TextAlign.left, ), Text( - station.arrivalTime, + station.arrival.scheduleTime, textAlign: TextAlign.left, ) ], ), ), ), - if (station.waitTime.isNotEmpty) + if (station.stoppingTime != null) Expanded( child: Padding( padding: const EdgeInsets.all(4.0), @@ -242,7 +243,7 @@ class StopOnLineTimeDetails extends StatelessWidget { textAlign: TextAlign.center, ), Text( - "${station.waitTime} ${station.waitTime == "1" ? "minut" : "minute"}", + "${station.stoppingTime} ${station.stoppingTime == 1 ? "minut" : "minute"}", textAlign: TextAlign.center, ) ], @@ -252,7 +253,7 @@ class StopOnLineTimeDetails extends StatelessWidget { ) else Expanded(child: Container(),), - if (station.departureTime.isNotEmpty) + if (station.departure != null) Padding( padding: const EdgeInsets.all(4.0), child: Align( @@ -265,7 +266,7 @@ class StopOnLineTimeDetails extends StatelessWidget { textAlign: TextAlign.right, ), Text( - station.departureTime, + station.departure.scheduleTime, textAlign: TextAlign.right, ) ], @@ -277,32 +278,32 @@ class StopOnLineTimeDetails extends StatelessWidget { } } -class StopOnLineDelayDetails extends StatelessWidget { - final StationEntry station; - StopOnLineDelayDetails(this.station); +// class StopOnLineDelayDetails extends StatelessWidget { +// final Station station; +// StopOnLineDelayDetails(this.station); - @override - Widget build(BuildContext context) { - if (station.delay == 0) { - return Text( - "Fără întârziere", - style: Theme.of(context).textTheme.caption, - textAlign: TextAlign.center, - ); - } - else if (station.delay < 0) { - return Text( - "${-(station.delay)} minute mai devreme", - style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.green.shade700), - textAlign: TextAlign.center, - ); - } - else { - return Text( - "${station.delay} minute întârziere", - style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.red.shade700), - textAlign: TextAlign.center, - ); - } - } -} \ No newline at end of file +// @override +// Widget build(BuildContext context) { +// if (station.delay == 0) { +// return Text( +// "Fără întârziere", +// style: Theme.of(context).textTheme.caption, +// textAlign: TextAlign.center, +// ); +// } +// else if (station.delay < 0) { +// return Text( +// "${-(station.delay)} minute mai devreme", +// style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.green.shade700), +// textAlign: TextAlign.center, +// ); +// } +// else { +// return Text( +// "${station.delay} minute întârziere", +// style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.red.shade700), +// textAlign: TextAlign.center, +// ); +// } +// } +// } \ No newline at end of file diff --git a/lib/train_info_display.dart b/lib/train_info_display.dart index 6f298dc..abf88fb 100644 --- a/lib/train_info_display.dart +++ b/lib/train_info_display.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:info_tren/stations_list.dart'; +import 'package:info_tren/stations_list.dart.old'; import 'models/train_data.dart'; @@ -29,33 +29,30 @@ class TrainInfoDisplayData extends StatelessWidget { padding: const EdgeInsets.all(4.0), child: TotalDetails(trainData), ), - if (trainData.destination.station.isNotEmpty) - ...[ - CustomDivider(), - Padding( - padding: const EdgeInsets.all(4.0), - child: Destination(trainData), - ), - ], + CustomDivider(), + Padding( + padding: const EdgeInsets.all(4.0), + child: Destination(trainData), + ), CustomDivider(), Padding( padding: const EdgeInsets.all(4.0), child: LastUpdate(trainData), ), - if (trainData.nextStop.station.isNotEmpty) - ...[ - CustomDivider(), - Padding( - padding: const EdgeInsets.all(4.0), - child: NextStop(trainData), - ), - ], + // if (trainData.nextStop.station.isNotEmpty) + // ...[ + // CustomDivider(), + // Padding( + // padding: const EdgeInsets.all(4.0), + // child: NextStop(trainData), + // ), + // ], CustomDivider(), Padding( padding: const EdgeInsets.all(4.0), child: TrainStatus(trainData), ), - Divider(color: Theme.of(context).accentColor,), + Divider(color: Theme.of(context).colorScheme.secondary,), Padding( padding: const EdgeInsets.all(4.0), child: StationsList(trainData), @@ -81,7 +78,7 @@ class TrainName extends StatelessWidget { @override Widget build(BuildContext context) { return Text( - "${trainData.rang} ${trainData.trainNumber}", + "${trainData.rank} ${trainData.number}", style: Theme.of(context).textTheme.headline3, ); } @@ -98,20 +95,20 @@ class TrainRoute extends StatelessWidget { children: [ Expanded( child: Text( - "${trainData.route.split("-")[0]}", - style: Theme.of(context).textTheme.bodyText1.copyWith(fontStyle: FontStyle.italic), + trainData.route.from, + style: Theme.of(context).textTheme.bodyText1?.copyWith(fontStyle: FontStyle.italic), textAlign: TextAlign.left, ), ), Text( "-", - style: Theme.of(context).textTheme.bodyText1.copyWith(fontStyle: FontStyle.italic), + style: Theme.of(context).textTheme.bodyText1?.copyWith(fontStyle: FontStyle.italic), textAlign: TextAlign.center, ), Expanded( child: Text( - "${trainData.route.split("-")[1]}", - style: Theme.of(context).textTheme.bodyText1.copyWith(fontStyle: FontStyle.italic), + trainData.route.to, + style: Theme.of(context).textTheme.bodyText1?.copyWith(fontStyle: FontStyle.italic), textAlign: TextAlign.right, ), ), @@ -141,7 +138,7 @@ class TrainStatus extends StatelessWidget { @override Widget build(BuildContext context) { return Text( - trainData.state, + trainData.status.toString(), textAlign: TextAlign.center, style: Theme.of(context).textTheme.headline5, ); @@ -154,16 +151,16 @@ class Destination extends StatelessWidget { @override Widget build(BuildContext context) { - if (trainData.destination.station.isEmpty) return Container(); + final destinationStation = trainData.stations.last; return Column( children: [ Text( - "Destinația: ${trainData.destination.station}", + "Destinația: ${destinationStation.name}", textAlign: TextAlign.center, ), Text( - "Sosește în ${trainData.destination.dateAndTime.split(" ")[0]} la ${trainData.destination.dateAndTime.split(" ")[1]}", + "Sosește la ${destinationStation.arrival!.scheduleTime}", textAlign: TextAlign.center, ), ], @@ -177,6 +174,9 @@ class LastUpdate extends StatelessWidget { @override Widget build(BuildContext context) { + if (trainData.status == null) { + return Container(); + } return Column( mainAxisSize: MainAxisSize.min, children: [ @@ -188,62 +188,63 @@ class LastUpdate extends StatelessWidget { children: [ Padding( padding: const EdgeInsets.all(2.0), - child: Text(trainData.lastInfo.station, textAlign: TextAlign.left,), + child: Text(trainData.status!.station, textAlign: TextAlign.left,), ), Expanded(child: Container(),), Padding( padding: const EdgeInsets.all(2.0), - child: Text(trainData.lastInfo.event, textAlign: TextAlign.right,), + child: Text(trainData.status!.state.toString(), textAlign: TextAlign.right,), ) ], ), Padding( padding: const EdgeInsets.all(2.0), - child: trainData.lastInfo.delay == 0 + child: trainData.status!.delay == 0 ? Text("Fără întârziere", style: Theme.of(context).textTheme.caption,) - : trainData.lastInfo.delay > 0 - ? Text("${trainData.lastInfo.delay} minute întârziere", style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.red.shade700),) - : Text("${-(trainData.lastInfo.delay)} minute mai devreme", style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.green.shade700),) - ), - Padding( - padding: const EdgeInsets.all(2.0), - child: Text("Raportat la ${trainData.lastInfo.dateAndTime}"), + : trainData.status!.delay > 0 + ? Text("${trainData.status!.delay} minute întârziere", style: Theme.of(context).textTheme.bodyText2?.copyWith(color: Colors.red.shade700),) + : Text("${-(trainData.status!.delay)} minute mai devreme", style: Theme.of(context).textTheme.bodyText2?.copyWith(color: Colors.green.shade700),) ), + // TODO: Implement status report time detection + // Padding( + // padding: const EdgeInsets.all(2.0), + // child: Text("Raportat la ${trainData.lastInfo.dateAndTime}"), + // ), ], ); } } -class NextStop extends StatelessWidget { - final TrainData trainData; - NextStop(this.trainData); +// class NextStop extends StatelessWidget { +// final TrainData trainData; +// NextStop(this.trainData); - @override - Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(2.0), - child: Text("Următoarea oprire", style: Theme.of(context).textTheme.headline5,), - ), - Row( - children: [ - Padding( - padding: const EdgeInsets.all(2.0), - child: Text(trainData.nextStop.station, textAlign: TextAlign.left,), - ), - Expanded(child: Container(),), - Padding( - padding: const EdgeInsets.all(2.0), - child: Text(trainData.nextStop.dateAndTime, textAlign: TextAlign.right,), - ) - ], - ), - ], - ); - } -} +// @override +// Widget build(BuildContext context) { +// return Column( +// mainAxisSize: MainAxisSize.min, +// children: [ +// Padding( +// padding: const EdgeInsets.all(2.0), +// child: Text("Următoarea oprire", style: Theme.of(context).textTheme.headline5,), +// ), +// Row( +// children: [ +// Padding( +// padding: const EdgeInsets.all(2.0), +// child: Text(trainData.nextStop.station, textAlign: TextAlign.left,), +// ), +// Expanded(child: Container(),), +// Padding( +// padding: const EdgeInsets.all(2.0), +// child: Text(trainData.nextStop.dateAndTime, textAlign: TextAlign.right,), +// ) +// ], +// ), +// ], +// ); +// } +// } class TotalDetails extends StatelessWidget { final TrainData trainData; @@ -254,18 +255,18 @@ class TotalDetails extends StatelessWidget { return Row( children: [ Text( - trainData.distance, + '${trainData.stations.last.km} km', style: Theme.of(context).textTheme.caption, textAlign: TextAlign.left, ), Expanded( child: Container() ), - Text( - trainData.tripLength, - style: Theme.of(context).textTheme.caption, - textAlign: TextAlign.right, - ) + // Text( + // trainData.tripLength, + // style: Theme.of(context).textTheme.caption, + // textAlign: TextAlign.right, + // ) ], ); } diff --git a/lib/train_info_page/train_info.dart b/lib/train_info_page/train_info.dart deleted file mode 100644 index 7b25a21..0000000 --- a/lib/train_info_page/train_info.dart +++ /dev/null @@ -1,72 +0,0 @@ -import 'dart:io' show Platform; - -import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; - -import 'package:info_tren/models/train_data.dart'; -import 'package:info_tren/train_info_page/train_info_cupertino.dart'; -import 'package:info_tren/train_info_page/train_info_material.dart'; - -mixin TrainInfoMixin { - String title; - bool showTrainData; - TrainLookupResult lookupResult; - bool requestedData; -} - -class TrainInfo extends StatelessWidget { - static String routeName = "/trainInfo/display"; - - final int trainNumber; - - TrainInfo({@required this.trainNumber}); - - @override - Widget build(BuildContext context) { - return TrainDataWebViewAdapter( - builder: (context) { - if (Platform.isAndroid) { - return TrainInfoMaterial(trainNumber: trainNumber,); - } - else if (Platform.isIOS) { - return TrainInfoCupertino(trainNumber: trainNumber,); - } - - return null; - }, - ); - } -} - -typedef FutureDisplayCallback(BuildContext context, T data); - -class FutureDisplay extends StatelessWidget { - final Future future; - final FutureDisplayCallback builder; - - FutureDisplay({Key key, @required this.future, @required this.builder}): super(key: key); - - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: future, - builder: (context, snapshot) { - if (snapshot.hasData) return builder(context, snapshot.data); - if (snapshot.hasError) throw snapshot.error; - if (snapshot.connectionState == ConnectionState.done) return Container(); - - Widget loadingWidget; - if (Platform.isAndroid) { - loadingWidget = CircularProgressIndicator(); - } - else if (Platform.isIOS) { - loadingWidget = CupertinoActivityIndicator(); - } - - return Center( - child: loadingWidget, - ); - }, - ); - } -} \ No newline at end of file diff --git a/lib/train_info_page/train_info_cupertino.dart b/lib/train_info_page/train_info_cupertino.dart deleted file mode 100644 index 93aa3ec..0000000 --- a/lib/train_info_page/train_info_cupertino.dart +++ /dev/null @@ -1,1022 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:info_tren/models/train_data.dart'; -import 'package:info_tren/train_info_page/train_info.dart'; -import 'package:info_tren/train_info_page/train_info_animation_helpers.dart'; -import 'package:info_tren/train_info_page/train_info_constants.dart'; -import 'package:info_tren/train_info_page/train_info_cupertino_DisplayTrainStation.dart'; -import 'package:info_tren/utils/stream_list.dart'; - -class TrainInfoCupertino extends StatefulWidget { - final int trainNumber; - - TrainInfoCupertino({@required this.trainNumber}); - - @override - _TrainInfoCupertinoState createState() => _TrainInfoCupertinoState(); -} - -class _TrainInfoCupertinoState extends State with TrainInfoMixin { - @override - void initState() { - super.initState(); - - title = widget.trainNumber.toString(); - showTrainData = false; - requestedData = false; - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - - if (!requestedData) { - requestedData = true; - - TrainDataWebViewAdapter.of(context).loadTrain(widget.trainNumber).then((value) { - setState(() { - lookupResult = value; - }); - - if (lookupResult == TrainLookupResult.NOT_FOUND) { - Future.delayed(Duration(seconds: 5), () { - Navigator.of(context).pop(); - }); - } - else if (lookupResult == TrainLookupResult.FOUND) { - Future.delayed(Duration(seconds: 1, milliseconds: 500), () { - setState(() { - showTrainData = true; - }); - }); - } - }); - } - } - - @override - Widget build(BuildContext context) { - if (!showTrainData) { - return _TrainDataCupertinoBefore( - title: title, - lookupResult: lookupResult, - ); - } - else { - return _TrainDataCupertinoAfter( - title: title, - ); - } - } -} - -class _TrainDataCupertinoBefore extends StatefulWidget { - final String title; - final TrainLookupResult lookupResult; - - _TrainDataCupertinoBefore({ - @required this.title, - @required this.lookupResult, - }); - - @override - __TrainDataCupertinoBeforeState createState() => __TrainDataCupertinoBeforeState(); -} - -class __TrainDataCupertinoBeforeState extends State<_TrainDataCupertinoBefore> { - @override - Widget build(BuildContext context) { - return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - middle: Text(widget.title ?? ""), - ), - child: SafeArea( - child: StreamBuilder( - stream: TrainDataWebViewAdapter.of(context).progressStream, - builder: (context, snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.none: - return Container(); - case ConnectionState.waiting: - return Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - CupertinoActivityIndicator(), - Text( - "Conectare...", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: FontWeight.bold, - ), - ), - ], - ), - ); - case ConnectionState.active: - break; - case ConnectionState.done: - Navigator.of(context).pop(); - return Container(); - } - - return Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ProgressReportDisplayEntry( - key: ValueKey(1), - completed: 1 <= snapshot.data.current, - waitingText: "Se crează WebView", - completedText: "WebView a fost creat", - ), - ProgressReportDisplayEntry( - key: ValueKey(2), - completed: 2 <= snapshot.data.current, - waitingText: "Se încarcă pagina Informatica Feroviară", - completedText: "Pagina Informatica Feroviară a fost încărcată", - ), - ProgressReportDisplayEntry( - key: ValueKey(3), - completed: 3 <= snapshot.data.current, - waitingText: "Se încarcă informațiile despre tren", - completedText: "Informațiile despre tren au fost încărcate", - ), - if (widget.lookupResult != null) - ...[ - Container(height: 20,), - SizedBox( - width: double.infinity, - child: AnimatedBackground( - animationDuration: Duration(milliseconds: 250), - initialColor: CupertinoTheme.of(context).scaffoldBackgroundColor, - backgroundColor: - widget.lookupResult == TrainLookupResult.FOUND - ? BACKGROUND_GREEN - : BACKGROUND_RED, - child: Center( - child: Row( - children: [ - Expanded(child: Container(),), - if (widget.lookupResult == TrainLookupResult.FOUND) - Padding( - padding: const EdgeInsets.fromLTRB(8, 8, 0, 8), - child: Center( - child: CupertinoActivityIndicator() - ), - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - widget.lookupResult == TrainLookupResult.FOUND - ? "Trenul a fost găsit" - : widget.lookupResult == TrainLookupResult.NOT_FOUND - ? "Trenul nu a fost găsit" - : "A apărut o eroare în căutarea trenului", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(fontSize: 20), - ), - ), - Expanded(child: Container(),), - ], - ), - ), - ), - ), - ], - ], - ), - ); - } - ), - ), - ); - } -} - -class _TrainDataCupertinoAfter extends StatefulWidget { - final String title; - - _TrainDataCupertinoAfter({ - @required this.title, - }); - - @override - __TrainDataCupertinoAfterState createState() => __TrainDataCupertinoAfterState(); -} - -class __TrainDataCupertinoAfterState extends State<_TrainDataCupertinoAfter> { - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: TrainDataWebViewAdapter.of(context).trainData(onInvalidation: () { - Navigator.of(context).pop(); - }), - builder: (context, snapshot) { - if (!snapshot.hasData) { - return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - middle: Text(widget.title ?? ""), - ), - child: SafeArea( - child: Center( - child: CupertinoActivityIndicator(), - ), - ), - ); - } - - return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - middle: FutureBuilder>( - future: Future.wait([ - snapshot.data.rang, - snapshot.data.trainNumber - ]), - builder: (context, snapshot) { - if (snapshot.hasData) { - return Text("Informații despre ${snapshot.data[0]} ${snapshot.data[1]}"); - } - else { - return Text(widget.title ?? ""); - } - }, - ), - ), - child: SafeArea( - top: false, - bottom: false, - child: Builder( - builder: (context) { - final topPadding = MediaQuery.of(context).padding.top; - - return CustomScrollView( - slivers: [ - SliverToBoxAdapter( - child: Padding( - padding: EdgeInsets.only( - top: topPadding, - ), - child: Container(), - ), - ), - DisplayTrainID(trainData: snapshot.data,), - DisplayTrainOperator(trainData: snapshot.data,), - DisplayTrainRoute(trainData: snapshot.data,), - DisplayTrainDeparture(trainData: snapshot.data,), - SliverToBoxAdapter( - child: CupertinoDivider( - color: FOREGROUND_WHITE, - ), - ), - DisplayTrainLastInfo(trainData: snapshot.data,), - SliverToBoxAdapter( - child: CupertinoDivider(), - ), - SliverToBoxAdapter( - child: IntrinsicHeight( - child: Row( - children: [ - Expanded( - child: DisplayTrainNextStop(trainData: snapshot.data,), - ), - SizedBox( - height: double.infinity, - child: CupertinoVerticalDivider(), - ), - Expanded( - child: DisplayTrainDestination(trainData: snapshot.data,), - ) - ], - ), - ), - ), - SliverToBoxAdapter( - child: CupertinoDivider(), - ), - SliverToBoxAdapter( - child: IntrinsicHeight( - child: Row( - children: [ - Expanded( - child: DisplayTrainRouteDuration(trainData: snapshot.data,), - ), - SizedBox( - height: double.infinity, - child: CupertinoVerticalDivider(), - ), - Expanded( - child: DisplayTrainRouteDistance(trainData: snapshot.data,), - ) - ], - ), - ), - ), - SliverToBoxAdapter( - child: CupertinoDivider( - color: FOREGROUND_WHITE, - ), - ), - DisplayTrainStations( - trainData: snapshot.data, - pageLoadFuture: TrainDataWebViewAdapter.of(context).nextLoadFuture, - ), - SliverToBoxAdapter( - child: Container( - height: MediaQuery.of(context).viewPadding.bottom, - ), - ), - ], - ); - } - ), - ), - ); - }, - ); - - // return CupertinoPageScaffold( - // navigationBar: CupertinoNavigationBar( - // middle: Text(title ?? ""), - // ), - // child: SafeArea( - // bottom: false, - // child: FutureBuilder( - // future: TrainDataWebViewAdapter.of(context).trainData(onInvalidation: () { - // Navigator.of(context).pop(); - // }), - // builder: (context, snapshot) { - // if (!snapshot.hasData) { - // return Center( - // child: CupertinoActivityIndicator(), - // ); - // } - - // try { - // Future.wait([ - // snapshot.data.rang, - // snapshot.data.trainNumber - // ]).then((values) { - // setState(() { - // title = "Informații despre ${values[0]} ${values[1]}"; - // }); - // }); - - // return CustomScrollView( - // slivers: [ - // DisplayTrainID(data: snapshot.data,), - // DisplayTrainOperator(data: snapshot.data,), - // DisplayTrainRoute(data: snapshot.data,), - // DisplayTrainDeparture(data: snapshot.data,), - // SliverToBoxAdapter( - // child: CupertinoDivider( - // color: FOREGROUND_WHITE, - // ), - // ), - // DisplayTrainLastInfo(data: snapshot.data,), - // SliverToBoxAdapter( - // child: CupertinoDivider(), - // ), - // SliverToBoxAdapter( - // child: IntrinsicHeight( - // child: Row( - // children: [ - // Expanded( - // child: DisplayTrainNextStop(data: snapshot.data,), - // ), - // SizedBox( - // height: double.infinity, - // child: CupertinoVerticalDivider(), - // ), - // Expanded( - // child: DisplayTrainDestination(data: snapshot.data,), - // ) - // ], - // ), - // ), - // ), - // SliverToBoxAdapter( - // child: CupertinoDivider(), - // ), - // SliverToBoxAdapter( - // child: IntrinsicHeight( - // child: Row( - // children: [ - // Expanded( - // child: DisplayTrainRouteDuration(data: snapshot.data,), - // ), - // SizedBox( - // height: double.infinity, - // child: CupertinoVerticalDivider(), - // ), - // Expanded( - // child: DisplayTrainRouteDistance(data: snapshot.data,), - // ) - // ], - // ), - // ), - // ), - // SliverToBoxAdapter( - // child: CupertinoDivider( - // color: FOREGROUND_WHITE, - // ), - // ), - // DisplayTrainStations( - // data: snapshot.data, - // pageLoadFuture: TrainDataWebViewAdapter.of(context).nextLoadFuture, - // ), - // ], - // ); - // } - // on OnDemandInvalidatedException { - // Navigator.of(context).pop(); - // print("Got OnDemandInvalidatedException!"); - // return Container(); - // } - // }, - // ), - // ), - // ); - } -} - -class DisplayTrainID extends StatelessWidget { - final OnDemandTrainData trainData; - DisplayTrainID({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: FutureDisplay( - future: Future.wait([ - trainData.rang, - trainData.trainNumber - ]), - builder: (context, datas) { - return Center( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - "${datas[0]} ${datas[1]}", - style: CupertinoTheme.of(context).textTheme.navLargeTitleTextStyle, - ), - ), - ); - }, - ), - ); - } -} - -class DisplayTrainRoute extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRoute({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: FutureDisplay( - future: Future.wait([trainData.route.from, trainData.route.to]), - builder: (context, routePieces) { - return Row( - children: [ - Center( - child: Padding( - padding: const EdgeInsets.all(4), - child: Text( - routePieces[0], - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 16, - ), - ), - ), - ), - Expanded(child: Container(),), - Center(child: Text("-")), - Expanded(child: Container(),), - Center( - child: Padding( - padding: const EdgeInsets.all(4), - child: Text( - routePieces[1], - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 16, - ), - textAlign: TextAlign.right, - ), - ), - ), - ], - ); - }, - ), - ); - } -} - -class DisplayTrainOperator extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainOperator({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: FutureDisplay( - future: trainData.operator, - builder: (context, operator) { - return Center( - child: Text( - operator, - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - fontStyle: FontStyle.italic, - ), - ), - ); - }, - ), - ); - } -} - -class DisplayTrainDeparture extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainDeparture({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: Padding( - padding: const EdgeInsets.all(2), - child: FutureDisplay( - future: trainData.departureDate, - builder: (context, dataPlecare) { - return Text( - "Plecare în ${dataPlecare.day.toString().padLeft(2, '0')}.${dataPlecare.month.toString().padLeft(2, '0')}.${dataPlecare.year.toString().padLeft(4, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontStyle: FontStyle.italic, - fontWeight: FontWeight.w200, - ), - textAlign: TextAlign.center, - ); - }, - ), - ), - ); - } -} - -class DisplayTrainLastInfo extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainLastInfo({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return SliverToBoxAdapter( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Text( - "Ultima informație", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ), - Row( - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: FutureDisplay( - future: trainData.lastInfo.station, - builder: (context, station) { - return Text( - station, - style: CupertinoTheme.of(context).textTheme.textStyle, - textAlign: TextAlign.left, - ); - }, - ), - ), - Expanded(child: Container(),), - Padding( - padding: const EdgeInsets.all(4), - child: FutureDisplay( - future: trainData.lastInfo.event, - builder: (context, event) { - return Text( - event, - style: CupertinoTheme.of(context).textTheme.textStyle, - textAlign: TextAlign.right, - ); - }, - ), - ), - ], - ), - FutureDisplay( - future: trainData.lastInfo.dateAndTime, - builder: (context, dt) { - return Text( - "Raportat în ${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')}.${dt.year.toString().padLeft(4, '0')}, la ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}", - textAlign: TextAlign.center, - ); - }, - ), - FutureBuilder( - initialData: 0, - future: trainData.lastInfo.delay, - builder: (context, snapshot) { - if (snapshot.data == 0) { - return Container(); - } - - if (snapshot.data > 0) { - return Text( - "${snapshot.data} minute întârziere", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - color: Color.fromRGBO(200, 30, 15, 1), - ), - ); - } - else { - return Text( - "${-snapshot.data} minute mai devreme", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 12, - color: Color.fromRGBO(15, 200, 15, 1), - ), - ); - } - }, - ) - ], - ), - ); - } -} - -class DisplayTrainNextStop extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainNextStop({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: trainData.nextStop.stationName, - builder: (context, snapshot) { - if (!snapshot.hasData) return Container(); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: Text( - "Următoarea oprire", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - ), - CupertinoDivider( - color: Color.fromRGBO(15, 15, 15, 1), - ), - FutureDisplay( - future: trainData.nextStop.stationName, - builder: (context, station) { - return Padding( - padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), - child: Text( - station, - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ); - }, - ), - FutureDisplay( - future: trainData.nextStop.arrival, - builder: (context, arrival) { - const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - ), - textAlign: TextAlign.center, - ), - Text( - "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - ), - textAlign: TextAlign.center, - ), - ], - ); - }, - ) - ], - ); - } - ); - } -} - -class DisplayTrainDestination extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainDestination({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: trainData.destination.stationName, - builder: (context, snapshot) { - if (!snapshot.hasData) return Container(); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: Text( - "Destinația", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - ), - CupertinoDivider( - color: Color.fromRGBO(15, 15, 15, 1), - ), - FutureDisplay( - future: trainData.destination.stationName, - builder: (context, station) { - return Padding( - padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), - child: Text( - station, - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ); - }, - ), - FutureDisplay( - future: trainData.destination.arrival, - builder: (context, arrival) { - const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - ), - textAlign: TextAlign.center, - ), - Text( - "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 14, - ), - textAlign: TextAlign.center, - ), - ], - ); - }, - ) - ], - ); - } - ); - } -} - -class DisplayTrainRouteDistance extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRouteDistance({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "Distanța rutei", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - FutureDisplay( - future: trainData.routeDistance, - builder: (context, distance) { - return Text( - "$distance km", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 16, - ), - textAlign: TextAlign.center, - ); - }, - ), - ], - ); - } -} - -class DisplayTrainRouteDuration extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRouteDuration({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "Durata rutei", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - FutureDisplay( - future: trainData.routeDuration, - builder: (context, duration) { - var durationString = StringBuffer(); - - bool firstWritten = false; - - if (duration.inDays > 0) { - firstWritten = true; - if (duration.inDays == 1) durationString.write("1 zi"); - else durationString.write("${duration.inDays} zile"); - duration -= Duration(days: duration.inDays); - } - - if (duration.inHours > 0) { - if (firstWritten) { - durationString.write(", "); - } - firstWritten = true; - if (duration.inHours == 1) durationString.write("1 oră"); - else durationString.write("${duration.inHours} ore"); - duration -= Duration(hours: duration.inHours); - } - - if (duration.inMinutes > 0) { - if (firstWritten) { - durationString.write(", "); - } - firstWritten = true; - if (duration.inMinutes == 1) durationString.write("1 minut"); - else durationString.write("${duration.inMinutes} minute"); - duration -= Duration(minutes: duration.inMinutes); - } - - return Text( - durationString.toString(), - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 16, - ), - textAlign: TextAlign.center, - ); - }, - ), - ], - ); - } -} - -class DisplayTrainStations extends StatelessWidget { - final OnDemandTrainData trainData; - final Future pageLoadFuture; - - DisplayTrainStations({@required this.trainData, @required this.pageLoadFuture}); - - @override - Widget build(BuildContext context) { - return StreamBuilder>( - stream: listifyStream(trainData.stations(pageLoadFuture: pageLoadFuture)), - builder: (context, snapshot) { - if (!snapshot.hasData) { - return SliverToBoxAdapter( - child: Container(), - ); - } - - return SliverList( - delegate: SliverChildBuilderDelegate( - (context, index) { - if (index.isOdd) { - return CupertinoDivider(); - } - else { - final itemIndex = index ~/ 2; - return IndexedSemantics( - child: DisplayTrainStation( - station: snapshot.data[itemIndex], - ), - index: itemIndex, - ); - } - }, - childCount: snapshot.data.length * 2 - 1, - addSemanticIndexes: false, - ), - ); - }, - ); - } -} - -class CupertinoDivider extends StatelessWidget { - final Color color; - - CupertinoDivider({Key key, Color color}): - color = color ?? FOREGROUND_DARK_GREY, - super(key: key); - - @override - Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - height: 1, - ), - Container( - height: 1, - decoration: BoxDecoration( - color: color, - ), - ), - Container( - height: 1, - ), - ], - ); - } -} - -class CupertinoVerticalDivider extends StatelessWidget { - final Color color; - - CupertinoVerticalDivider({Key key, Color color}): - color = color ?? FOREGROUND_DARK_GREY, - super(key: key); - - @override - Widget build(BuildContext context) { - return Row( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - width: 1, - ), - Container( - width: 1, - decoration: BoxDecoration( - color: color, - ), - ), - Container( - width: 1, - ), - ], - ); - } -} \ No newline at end of file diff --git a/lib/train_info_page/train_info_cupertino_DisplayTrainStation.dart b/lib/train_info_page/train_info_cupertino_DisplayTrainStation.dart deleted file mode 100644 index bf6b360..0000000 --- a/lib/train_info_page/train_info_cupertino_DisplayTrainStation.dart +++ /dev/null @@ -1,506 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:info_tren/models/train_data.dart'; -import 'package:info_tren/train_info_page/train_info.dart'; -import 'package:info_tren/train_info_page/train_info_constants.dart'; - -class DisplayTrainStation extends StatelessWidget { - final OnDemandStation station; - - DisplayTrainStation({@required this.station}); - - @override - Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - mainAxisSize: MainAxisSize.max, - children: [ - FutureDisplay( - future: Future.wait([ - station.delay, - station.realOrEstimate, - station.observations, - ]), - builder: (context, data) { - final isDelayed = (data[0] as int) > 0 && (data[1] as RealOrEstimate) == RealOrEstimate.real; - final isOnTime = (data[0] as int) <= 0 && (data[1] as RealOrEstimate) == RealOrEstimate.real; - final isNotScheduled = data[2] == "ONI"; - - return KmBadge( - station: station, - isNotScheduled: isNotScheduled, - isDelayed: isDelayed, - isOnTime: isOnTime, - ); - } - ), - Expanded( - child: Title( - station: station, - ), - ) - ], - ), - Time( - station: station, - ), - Delay( - station: station, - ), - ], - ); - } -} - -class KmBadge extends StatelessWidget { - final OnDemandStation station; - final bool isNotScheduled; - final bool isOnTime; - final bool isDelayed; - - KmBadge({ - @required this.station, - this.isNotScheduled = false, - this.isOnTime = false, - this.isDelayed = false, - }); - - @override - Widget build(BuildContext context) { - Color foregroundColor = FOREGROUND_WHITE; - Color backgroundColor; - - if (isNotScheduled) { - foregroundColor = Color.fromRGBO(225, 175, 30, 1); - backgroundColor = Color.fromRGBO(80, 40, 10, 1); - } - else if (isOnTime) { - foregroundColor = Color.fromRGBO(130, 175, 65, 1); - backgroundColor = Color.fromRGBO(40, 80, 10, 1); - } - else if (isDelayed) { - foregroundColor = Color.fromRGBO(225, 75, 30, 1); - backgroundColor = Color.fromRGBO(80, 20, 10, 1); - } - - return Padding( - padding: const EdgeInsets.all(8), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - border: Border.all( - width: 2, - color: foregroundColor, - ), - color: backgroundColor, - // color: CupertinoColors.activeOrange, - ), - width: 48, - height: 48, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: Center( - child: FutureDisplay( - future: station.km, - builder: (context, value) { - return Text( - value.toString(), - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 18, - fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, - color: MediaQuery.of(context).boldText ? FOREGROUND_WHITE : foregroundColor, - ), - textAlign: TextAlign.center, - ); - }, - ), - ), - ), - Text( - "km", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 10, - color: MediaQuery.of(context).boldText ? FOREGROUND_WHITE : foregroundColor, - ), - ), - ], - ), - ), - ); - } -} - -class Title extends StatelessWidget { - final OnDemandStation station; - - Title({ - @required this.station - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.stationName, - station.observations - ]), - builder: (context, items) { - return Text( - items[0], - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 22, - fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, - fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal, - ), - textAlign: TextAlign.center, - ); - }, - ); - } -} - -class Time extends StatelessWidget { - final OnDemandStation station; - - Time({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.arrivalTime, - station.stopsFor, - station.departureTime, - ]), - builder: (context, items) { - if (items[0].isEmpty) { - // Plecare - return DepartureTime( - station: station, - firstStation: true, - ); - } - - if (items[2].isEmpty) { - // Sosire - return ArrivalTime( - station: station, - finalStation: true, - ); - } - - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "→", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 22, - ), - ), - Container(width: 2,), - ArrivalTime(station: station,), - Expanded(child: Container(),), - StopTime(station: station,), - Expanded(child: Container(),), - DepartureTime(station: station,), - Container(width: 2,), - Text( - "→", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 22, - ), - ), - ], - ); - }, - ); - } -} - -class ArrivalTime extends StatelessWidget { - final OnDemandStation station; - final bool finalStation; - - ArrivalTime({ - @required this.station, - this.finalStation = false, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.arrivalTime, - station.delay, - ]), - builder: (context, data) { - if (finalStation) { - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "→", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 22, - ), - ), - Container(width: 2,), - Text("sosire la "), - ArrivalTime(station: station,), - Expanded(child: Container(),), - ], - ); - } - else { - if (data[1] == 0) { - return Text("${data[0]}"); - } - else if (data[1] as int > 0) { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.destructiveRed, - ), - ), - ], - ); - } - else { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.activeGreen, - ), - ), - ], - ); - } - } - }, - ); - } -} - -class StopTime extends StatelessWidget { - final OnDemandStation station; - - StopTime({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: station.stopsFor, - builder: (context, stopsFor) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "staționează pentru", - textAlign: TextAlign.center, - ), - Builder( - builder: (context) { - int stopsForInt = int.parse(stopsFor); - if (stopsForInt == 1) { - return Text( - "1 minut", - textAlign: TextAlign.center, - ); - } - else if (stopsForInt < 20) { - return Text( - "$stopsFor minute", - textAlign: TextAlign.center, - ); - } - else { - return Text( - "$stopsFor de minute", - textAlign: TextAlign.center, - ); - } - }, - ) - ], - ); - }, - ); - } -} - -class DepartureTime extends StatelessWidget { - final OnDemandStation station; - final bool firstStation; - - DepartureTime({ - @required this.station, - this.firstStation = false, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.departureTime, - station.delay, - ]), - builder: (context, data) { - if (firstStation) { - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded(child: Container(),), - Text("plecare la "), - DepartureTime(station: station,), - Container(width: 2,), - Text( - "→", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - fontSize: 22, - ), - ), - ], - ); - } - else { - if (data[1] == 0) { - return Text("${data[0]}"); - } - else if (data[1] as int > 0) { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.destructiveRed, - ), - ), - ], - ); - } - else { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.activeGreen, - ), - ), - ], - ); - } - } - }, - ); - } -} - - -class Delay extends StatelessWidget { - final OnDemandStation station; - - Delay({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: station.delay, - builder: (context, delay) { - if (delay == 0) return Container(); - - else if (delay > 0) { - return Text( - "$delay minute întârziere", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.destructiveRed, - fontSize: 12, - fontStyle: FontStyle.italic, - ), - ); - } - - else if (delay < 0) { - return Text( - "${-delay} minute mai devreme", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith( - color: CupertinoColors.activeGreen, - fontSize: 12, - fontStyle: FontStyle.italic, - ), - ); - } - - return Container(); - }, - ); - } -} - diff --git a/lib/train_info_page/train_info_material.dart b/lib/train_info_page/train_info_material.dart deleted file mode 100644 index 3f8e39d..0000000 --- a/lib/train_info_page/train_info_material.dart +++ /dev/null @@ -1,944 +0,0 @@ -import 'package:info_tren/train_info_page/train_info_animation_helpers.dart'; -import 'package:info_tren/train_info_page/train_info_material_DisplayTrainStation.dart'; -import 'package:info_tren/utils/stream_list.dart'; - -import '../models/train_data.dart'; -import './train_info.dart'; - -import 'package:flutter/material.dart'; - -class TrainInfoMaterial extends StatefulWidget { - final int trainNumber; - - TrainInfoMaterial({@required this.trainNumber}); - - @override - _TrainInfoMaterialState createState() => _TrainInfoMaterialState(); -} - -class _TrainInfoMaterialState extends State with TrainInfoMixin { - @override - void initState() { - super.initState(); - - title = widget.trainNumber.toString(); - showTrainData = false; - requestedData = false; - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - - if (!requestedData) { - requestedData = true; - - TrainDataWebViewAdapter.of(context).loadTrain(widget.trainNumber).then((value) { - setState(() { - lookupResult = value; - }); - - if (lookupResult == TrainLookupResult.NOT_FOUND) { - Future.delayed(Duration(seconds: 5), () { - Navigator.of(context).pop(); - }); - } - else if (lookupResult == TrainLookupResult.FOUND) { - Future.delayed(Duration(seconds: 1, milliseconds: 500), () { - setState(() { - showTrainData = true; - }); - }); - } - }); - } - } - - @override - Widget build(BuildContext context) { - if (!showTrainData) { - return _TrainInfoMaterialBefore( - title: title, - lookupResult: lookupResult, - ); - } - else { - return _TrainDataMaterialAfter( - title: title, - ); - } - } -} - -class _TrainInfoMaterialBefore extends StatefulWidget { - final String title; - final TrainLookupResult lookupResult; - - _TrainInfoMaterialBefore({@required this.title, @required this.lookupResult}); - - @override - _TrainInfoMaterialBeforeState createState() => _TrainInfoMaterialBeforeState(); -} - -class _TrainInfoMaterialBeforeState extends State<_TrainInfoMaterialBefore> { - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text(widget.title ?? ""), - ), - body: SafeArea( - bottom: false, - child: StreamBuilder( - stream: TrainDataWebViewAdapter.of(context).progressStream, - builder: (context, snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.none: - return Container(); - case ConnectionState.waiting: - return Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - CircularProgressIndicator(), - Text( - "Conectare...", - style: Theme.of(context).textTheme.headline6, - ), - ], - ), - ); - case ConnectionState.active: - break; - case ConnectionState.done: - Navigator.of(context).pop(); - return Container(); - } - - return Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ProgressReportDisplayEntry( - key: ValueKey(1), - completed: 1 <= snapshot.data.current, - waitingText: "Se crează WebView", - completedText: "WebView a fost creat", - ), - ProgressReportDisplayEntry( - key: ValueKey(2), - completed: 2 <= snapshot.data.current, - waitingText: "Se încarcă pagina Informatica Feroviară", - completedText: "Pagina Informatica Feroviară a fost încărcată", - ), - ProgressReportDisplayEntry( - key: ValueKey(3), - completed: 3 <= snapshot.data.current, - waitingText: "Se încarcă informațiile despre tren", - completedText: "Informațiile despre tren au fost încărcate", - ), - if (widget.lookupResult != null) - ...[ - Container(height: 20,), - SizedBox( - width: double.infinity, - child: AnimatedBackground( - animationDuration: Duration(milliseconds: 250), - initialColor: Theme.of(context).scaffoldBackgroundColor, - backgroundColor: - widget.lookupResult == TrainLookupResult.FOUND - ? Colors.green - : Colors.red, - child: Center( - child: Row( - children: [ - Expanded(child: Container(),), - if (widget.lookupResult == TrainLookupResult.FOUND) - Padding( - padding: const EdgeInsets.fromLTRB(8, 8, 0, 8), - child: Center( - child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.greenAccent), - ) - ), - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - widget.lookupResult == TrainLookupResult.FOUND - ? "Trenul a fost găsit" - : widget.lookupResult == TrainLookupResult.NOT_FOUND - ? "Trenul nu a fost găsit" - : "A apărut o eroare în căutarea trenului", - style: Theme.of(context).textTheme.headline6, - ), - ), - Expanded(child: Container(),), - ], - ), - ), - ), - ), - ], - ], - ), - ); - }, - ), - ), - ); - } -} - -bool isSmallScreen(BuildContext context) => MediaQuery.of(context).size.height <= 425; - -class _TrainDataMaterialAfter extends StatefulWidget { - final String title; - - _TrainDataMaterialAfter({@required this.title}); - - @override - _TrainDataMaterialAfterState createState() => _TrainDataMaterialAfterState(); -} - -class _TrainDataMaterialAfterState extends State<_TrainDataMaterialAfter> { - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: TrainDataWebViewAdapter.of(context).trainData(onInvalidation: () { - Navigator.of(context).pop(); - }), - builder: (context, snapshot) { - if (!snapshot.hasData) { - return Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text(widget.title ?? ""), - ), - body: SafeArea( - child: Center( - child: CircularProgressIndicator(), - ), - ), - ); - } - - return Scaffold( - appBar: isSmallScreen(context) ? null : AppBar( - centerTitle: true, - title: FutureBuilder>( - future: Future.wait([ - snapshot.data.rang, - snapshot.data.trainNumber - ]), - builder: (context, snapshot) { - if (snapshot.hasData) { - return Text("Informații despre ${snapshot.data[0]} ${snapshot.data[1]}"); - } - else { - return Text(widget.title ?? ""); - } - }, - ), - ), - body: Column( - children: [ - if (isSmallScreen(context)) - FutureBuilder>( - future: Future.wait([ - snapshot.data.rang, - snapshot.data.trainNumber, - ]), - builder: (context, snapshot) { - var title = "INFO TREN"; - if (snapshot.hasData) title = "INFO TREN ─ ${snapshot.data[0]} ${snapshot.data[1]}"; - - return SlimAppBar( - title: title, - ); - } - ), - Expanded( - child: SafeArea( - bottom: false, - child: CustomScrollView( - slivers: [ - SliverToBoxAdapter( - child: DisplayTrainID(trainData: snapshot.data,), - ), - SliverToBoxAdapter( - child: DisplayTrainOperator(trainData: snapshot.data,), - ), - SliverPadding( - padding: const EdgeInsets.only(left: 2, right: 2), - sliver: SliverToBoxAdapter( - child: DisplayTrainRoute(trainData: snapshot.data,), - ), - ), - SliverToBoxAdapter( - child: DisplayTrainDeparture(trainData: snapshot.data,), - ), - SliverToBoxAdapter( - child: Divider( - color: Colors.white70, - height: isSmallScreen(context) ? 8 : 16, - ), - ), - SliverToBoxAdapter( - child: DisplayTrainLastInfo(trainData: snapshot.data,), - ), - SliverToBoxAdapter( - child: IntrinsicHeight( - child: Row( - children: [ - Expanded(child: DisplayTrainNextStop(trainData: snapshot.data,)), - Expanded(child: DisplayTrainDestination(trainData: snapshot.data,)), - ], - ), - ), - ), - SliverToBoxAdapter( - child: IntrinsicHeight( - child: Row( - children: [ - Expanded(child: DisplayTrainRouteDuration(trainData: snapshot.data,)), - Expanded(child: DisplayTrainRouteDistance(trainData: snapshot.data,)), - ], - ), - ), - ), - SliverToBoxAdapter( - child: Divider( - color: Colors.white70, - height: isSmallScreen(context) ? 8 : 16, - ), - ), - DisplayTrainStations( - trainData: snapshot.data, - pageLoadFuture: TrainDataWebViewAdapter.of(context).nextLoadFuture, - ), - SliverToBoxAdapter( - child: Container( - height: MediaQuery.of(context).viewPadding.bottom, - ), - ), - ], - ), - ), - ), - ], - ), - ); - }, - ); - } -} - -class DisplayTrainID extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainID({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - trainData.rang, - trainData.trainNumber, - ]), - builder: (context, list) { - return Text( - "${list[0]} ${list[1]}", - style: (isSmallScreen(context) - ? Theme.of(context).textTheme.headline4 - : Theme.of(context).textTheme.headline3).copyWith( - color: Theme.of(context).textTheme.bodyText2.color, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ); - }, - ); - } -} - -class DisplayTrainOperator extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainOperator({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: trainData.operator, - builder: (context, op) { - return Text( - op, - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontStyle: FontStyle.italic, - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ); - }, - ); - } -} - -class DisplayTrainRoute extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRoute({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: Future.wait([trainData.route.from, trainData.route.to]), - builder: (context, routePieces) { - return Row( - children: [ - Center( - child: Padding( - padding: const EdgeInsets.all(4), - child: Text( - routePieces[0], - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 16, - ), - ), - ), - ), - Expanded(child: Container(),), - Center(child: Text("-")), - Expanded(child: Container(),), - Center( - child: Padding( - padding: const EdgeInsets.all(4), - child: Text( - routePieces[1], - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 16, - ), - textAlign: TextAlign.right, - ), - ), - ), - ], - ); - }, - ); - } -} - -class DisplayTrainDeparture extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainDeparture({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.all(2), - child: FutureDisplay( - future: trainData.departureDate, - builder: (context, dataPlecare) { - return Text( - "Plecare în ${dataPlecare.day.toString().padLeft(2, '0')}.${dataPlecare.month.toString().padLeft(2, '0')}.${dataPlecare.year.toString().padLeft(4, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontStyle: FontStyle.italic, - fontWeight: FontWeight.w200, - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ); - }, - ), - ); - } -} - -class DisplayTrainLastInfo extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainLastInfo({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Card( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Text( - "Ultima informație", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ), - Row( - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: FutureDisplay( - future: trainData.lastInfo.station, - builder: (context, station) { - return Text( - station, - style: Theme.of(context).textTheme.bodyText2, - textAlign: TextAlign.left, - ); - }, - ), - ), - Expanded(child: Container(),), - Padding( - padding: const EdgeInsets.all(4), - child: FutureDisplay( - future: trainData.lastInfo.event, - builder: (context, event) { - return Text( - event, - style: Theme.of(context).textTheme.bodyText2, - textAlign: TextAlign.right, - ); - }, - ), - ), - ], - ), - Padding( - padding: const EdgeInsets.all(2), - child: Row( - children: [ - FutureDisplay( - future: trainData.lastInfo.dateAndTime, - builder: (context, dt) { - return Text( - "Raportat în ${dt.day.toString().padLeft(2, '0')}.${dt.month.toString().padLeft(2, '0')}.${dt.year.toString().padLeft(4, '0')}, la ${dt.hour.toString().padLeft(2, '0')}:${dt.minute.toString().padLeft(2, '0')}", - textAlign: TextAlign.center, - ); - }, - ), - Expanded(child: Container(),), - FutureBuilder( - initialData: 0, - future: trainData.lastInfo.delay, - builder: (context, snapshot) { - if (snapshot.data == 0) { - return Container(); - } - - if (snapshot.data > 0) { - return Text( - "${snapshot.data} minute întârziere", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 14, - color: Color.fromRGBO(200, 30, 15, 1), - ), - ); - } - else { - return Text( - "${-snapshot.data} minute mai devreme", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 12, - color: Color.fromRGBO(15, 200, 15, 1), - ), - ); - } - }, - ), - ], - ), - ), - ], - ), - ), - ); - } -} - -class DisplayTrainNextStop extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainNextStop({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: trainData.nextStop.stationName, - builder: (context, snapshot) { - if (!snapshot.hasData) return Container(height: 0,); - - return Card( - child: Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: Text( - "Următoarea oprire", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 20, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - ), - FutureDisplay( - future: trainData.nextStop.stationName, - builder: (context, station) { - return Padding( - padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), - child: Text( - station, - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 16 : 18, - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ); - }, - ), - FutureDisplay( - future: trainData.nextStop.arrival, - builder: (context, arrival) { - const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ), - Text( - "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ), - ], - ); - }, - ) - ], - ), - ), - ), - ); - } - ); - } -} - -class DisplayTrainDestination extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainDestination({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: trainData.destination.stationName, - builder: (context, snapshot) { - if (!snapshot.hasData) return Container(height: 0,); - - return Card( - child: Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: Text( - "Destinația", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 20, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - ), - FutureDisplay( - future: trainData.destination.stationName, - builder: (context, station) { - return Padding( - padding: const EdgeInsets.fromLTRB(4, 0, 4, 0), - child: Text( - station, - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 16 : 18, - fontWeight: FontWeight.w500, - ), - textAlign: TextAlign.center, - ), - ); - }, - ), - FutureDisplay( - future: trainData.destination.arrival, - builder: (context, arrival) { - const months = ["ian", "feb", "mar", "apr", "mai", "iun", "iul", "aug", "sep", "oct", "noi", "dec"]; - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "în ${arrival.day} ${months[arrival.month - 1]} ${arrival.year}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ), - Text( - "la ${arrival.hour.toString().padLeft(2, '0')}:${arrival.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 12 : 14, - ), - textAlign: TextAlign.center, - ), - ], - ); - }, - ) - ], - ), - ), - ), - ); - } - ); - } -} - -class DisplayTrainRouteDistance extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRouteDistance({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Card( - child: Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "Distanța rutei", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 16 : 18, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - FutureDisplay( - future: trainData.routeDistance, - builder: (context, distance) { - return Text( - "$distance km", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 14 : 16, - ), - textAlign: TextAlign.center, - ); - }, - ), - ], - ), - ), - ), - ); - } -} - -class DisplayTrainRouteDuration extends StatelessWidget { - final OnDemandTrainData trainData; - - DisplayTrainRouteDuration({@required this.trainData}); - - @override - Widget build(BuildContext context) { - return Card( - child: Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "Durata rutei", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 16 : 18, - fontWeight: FontWeight.bold, - ), - textAlign: TextAlign.center, - ), - FutureDisplay( - future: trainData.routeDuration, - builder: (context, duration) { - var durationString = StringBuffer(); - - bool firstWritten = false; - - if (duration.inDays > 0) { - firstWritten = true; - if (duration.inDays == 1) durationString.write("1 zi"); - else durationString.write("${duration.inDays} zile"); - duration -= Duration(days: duration.inDays); - } - - if (duration.inHours > 0) { - if (firstWritten) { - durationString.write(", "); - } - firstWritten = true; - if (duration.inHours == 1) durationString.write("1 oră"); - else durationString.write("${duration.inHours} ore"); - duration -= Duration(hours: duration.inHours); - } - - if (duration.inMinutes > 0) { - if (firstWritten) { - durationString.write(", "); - } - firstWritten = true; - if (duration.inMinutes == 1) durationString.write("1 minut"); - else durationString.write("${duration.inMinutes} minute"); - duration -= Duration(minutes: duration.inMinutes); - } - - return Text( - durationString.toString(), - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 14 : 16, - ), - textAlign: TextAlign.center, - ); - }, - ), - ], - ), - ), - ), - ); - } -} - -class DisplayTrainStations extends StatelessWidget { - final OnDemandTrainData trainData; - final Future pageLoadFuture; - - DisplayTrainStations({@required this.trainData, @required this.pageLoadFuture}); - - @override - Widget build(BuildContext context) { - return StreamBuilder>( - stream: listifyStream(trainData.stations(pageLoadFuture: pageLoadFuture)), - builder: (context, snapshot) { - if (!snapshot.hasData) { - return SliverToBoxAdapter( - child: Container(), - ); - } - - return SliverList( - delegate: SliverChildBuilderDelegate( - (context, index) { - return IndexedSemantics( - child: DisplayTrainStation( - station: snapshot.data[index], - ), - index: index, - ); - }, - childCount: snapshot.data.length, - addSemanticIndexes: true, - ), - ); - }, - ); - } -} - -class SlimAppBar extends StatelessWidget { - final String title; - final double size; - // final Function onBackTap; - - SlimAppBar({ - @required this.title, - this.size = 24, - // this.onBackTap, - }); - - @override - Widget build(BuildContext context) { - return SizedBox( - width: double.infinity, - height: size, - child: Container( - color: - Theme.of(context).appBarTheme?.color ?? - Theme.of(context).primaryColor, - child: InkWell( - onTap: (ModalRoute.of(context)?.canPop ?? false) - ? () => Navigator.of(context).pop() - : null, - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Container( - height: size, - width: size, - child: (ModalRoute.of(context)?.canPop ?? false) - ? BackButtonIcon() - : null, - ), - Expanded( - child: Center( - child: Padding( - padding: const EdgeInsets.all(2), - child: Text( - title, - textAlign: TextAlign.center, - style: - Theme.of(context).appBarTheme.textTheme?.caption?.copyWith(color: Theme.of(context).appBarTheme.textTheme?.bodyText2?.color) ?? - Theme.of(context).textTheme.caption.copyWith(color: Theme.of(context).textTheme.bodyText2.color), - ), - ), - ), - ), - Container( - height: size, - width: size, - ), - ], - ), - ), - ), - ); - } -} diff --git a/lib/train_info_page/train_info_material_DisplayTrainStation.dart b/lib/train_info_page/train_info_material_DisplayTrainStation.dart deleted file mode 100644 index 31bff16..0000000 --- a/lib/train_info_page/train_info_material_DisplayTrainStation.dart +++ /dev/null @@ -1,509 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:info_tren/models/train_data.dart'; -import 'package:info_tren/train_info_page/train_info.dart'; -import 'package:info_tren/train_info_page/train_info_material.dart' show isSmallScreen; - -class DisplayTrainStation extends StatelessWidget { - final OnDemandStation station; - - DisplayTrainStation({@required this.station}); - - @override - Widget build(BuildContext context) { - return Card( - child: Padding( - padding: const EdgeInsets.all(2), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - mainAxisSize: MainAxisSize.max, - children: [ - FutureDisplay( - future: Future.wait([ - station.delay, - station.realOrEstimate, - station.observations, - ]), - builder: (context, data) { - final isDelayed = (data[0] as int) > 0 && (data[1] as RealOrEstimate) == RealOrEstimate.real; - final isOnTime = (data[0] as int) <= 0 && (data[1] as RealOrEstimate) == RealOrEstimate.real; - final isNotScheduled = data[2] == "ONI"; - - return KmBadge( - station: station, - isNotScheduled: isNotScheduled, - isDelayed: isDelayed, - isOnTime: isOnTime, - ); - } - ), - Expanded( - child: Title( - station: station, - ), - ), - ], - ), - Time( - station: station, - ), - Delay( - station: station, - ), - ], - ), - ), - ); - } -} - -class KmBadge extends StatelessWidget { - final OnDemandStation station; - final bool isNotScheduled; - final bool isOnTime; - final bool isDelayed; - - KmBadge({ - @required this.station, - this.isNotScheduled = false, - this.isOnTime = false, - this.isDelayed = false, - }); - - @override - Widget build(BuildContext context) { - Color foregroundColor = Colors.white70; - Color backgroundColor; - - if (isNotScheduled) { - foregroundColor = Colors.orange.shade300; - backgroundColor = Colors.orange.shade900.withOpacity(0.3); - } - else if (isOnTime) { - foregroundColor = Colors.green.shade300; - backgroundColor = Colors.green.shade900.withOpacity(0.3); - } - else if (isDelayed) { - foregroundColor = Colors.red.shade300; - backgroundColor = Colors.red.shade900.withOpacity(0.3); - } - - return Padding( - padding: const EdgeInsets.all(8), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - border: Border.all( - width: 2, - color: foregroundColor, - ), - color: backgroundColor, - ), - width: isSmallScreen(context) ? 42 : 48, - height: isSmallScreen(context) ? 42 : 48, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: Center( - child: FutureDisplay( - future: station.km, - builder: (context, value) { - return Text( - value.toString(), - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 14 : 18, - fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, - color: MediaQuery.of(context).boldText ? Colors.white70 : foregroundColor, - ), - textAlign: TextAlign.center, - ); - }, - ), - ), - ), - Text( - "km", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 10, - color: MediaQuery.of(context).boldText ? Colors.white70 : foregroundColor, - ), - ), - ], - ), - ), - ); - } -} - -class Title extends StatelessWidget { - final OnDemandStation station; - - Title({ - @required this.station - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.stationName, - station.observations - ]), - builder: (context, items) { - return Text( - items[0], - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 22, - fontWeight: MediaQuery.of(context).boldText ? FontWeight.w400 : FontWeight.w200, - fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal, - ), - textAlign: TextAlign.center, - ); - }, - ); - } -} - -class Time extends StatelessWidget { - final OnDemandStation station; - - Time({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.arrivalTime, - station.stopsFor, - station.departureTime, - ]), - builder: (context, items) { - if (items[0].isEmpty) { - // Plecare - return DepartureTime( - station: station, - firstStation: true, - ); - } - - if (items[2].isEmpty) { - // Sosire - return ArrivalTime( - station: station, - finalStation: true, - ); - } - - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "→", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 22, - ), - ), - Container(width: 2,), - ArrivalTime(station: station,), - Expanded(child: Container(),), - StopTime(station: station,), - Expanded(child: Container(),), - DepartureTime(station: station,), - Container(width: 2,), - Text( - "→", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 22, - ), - ), - ], - ); - }, - ); - } -} - -class ArrivalTime extends StatelessWidget { - final OnDemandStation station; - final bool finalStation; - - ArrivalTime({ - @required this.station, - this.finalStation = false, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.arrivalTime, - station.delay, - ]), - builder: (context, data) { - if (finalStation) { - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "→", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: isSmallScreen(context) ? 18 : 22, - ), - ), - Container(width: 2,), - Text("sosire la "), - ArrivalTime(station: station,), - Expanded(child: Container(),), - ], - ); - } - else { - if (data[1] == 0) { - return Text("${data[0]}"); - } - else if (data[1] as int > 0) { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.red.shade300, - ), - ), - ], - ); - } - else { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.green.shade300, - ), - ), - ], - ); - } - } - }, - ); - } -} - -class StopTime extends StatelessWidget { - final OnDemandStation station; - - StopTime({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: station.stopsFor, - builder: (context, stopsFor) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "staționează pentru", - textAlign: TextAlign.center, - ), - Builder( - builder: (context) { - int stopsForInt = int.parse(stopsFor); - if (stopsForInt == 1) { - return Text( - "1 minut", - textAlign: TextAlign.center, - ); - } - else if (stopsForInt < 20) { - return Text( - "$stopsFor minute", - textAlign: TextAlign.center, - ); - } - else { - return Text( - "$stopsFor de minute", - textAlign: TextAlign.center, - ); - } - }, - ) - ], - ); - }, - ); - } -} - -class DepartureTime extends StatelessWidget { - final OnDemandStation station; - final bool firstStation; - - DepartureTime({ - @required this.station, - this.firstStation = false, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay>( - future: Future.wait([ - station.departureTime, - station.delay, - ]), - builder: (context, data) { - if (firstStation) { - return Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded(child: Container(),), - Text("plecare la "), - DepartureTime(station: station,), - Container(width: 2,), - Text( - "→", - style: Theme.of(context).textTheme.bodyText2.copyWith( - fontSize: 22, - ), - ), - ], - ); - } - else { - if (data[1] == 0) { - return Text("${data[0]}"); - } - else if (data[1] as int > 0) { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.red.shade300, - ), - ), - ], - ); - } - else { - final splits = (data[0] as String).split(":").map((s) => int.parse(s)).toList(); - - final now = DateTime.now(); - final newDate = DateTime(now.year, now.month, now.day, splits[0], splits[1]); - final oldDate = newDate.subtract(Duration(minutes: data[1] as int)); - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - decoration: TextDecoration.lineThrough, - ), - ), - Text( - "${data[0]}", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.green.shade300, - ), - ), - ], - ); - } - } - }, - ); - } -} - - -class Delay extends StatelessWidget { - final OnDemandStation station; - - Delay({ - @required this.station, - }); - - @override - Widget build(BuildContext context) { - return FutureDisplay( - future: station.delay, - builder: (context, delay) { - if (delay == 0) return Container(); - - else if (delay > 0) { - return Text( - "$delay minute întârziere", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.red.shade300, - fontSize: 12, - fontStyle: FontStyle.italic, - ), - ); - } - - else if (delay < 0) { - return Text( - "${-delay} minute mai devreme", - style: Theme.of(context).textTheme.bodyText2.copyWith( - color: Colors.green.shade300, - fontSize: 12, - fontStyle: FontStyle.italic, - ), - ); - } - - return Container(); - }, - ); - } -} diff --git a/lib/train_info_page/train_info_prompt.dart b/lib/train_info_page/train_info_prompt.dart deleted file mode 100644 index 32dcca4..0000000 --- a/lib/train_info_page/train_info_prompt.dart +++ /dev/null @@ -1,385 +0,0 @@ -import 'dart:convert'; -import 'dart:io' show Platform; - -import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/services.dart'; -import 'package:info_tren/train_info_page/train_info.dart'; -import 'package:json_annotation/json_annotation.dart'; -import 'package:tuple/tuple.dart'; - -part 'train_info_prompt.g.dart'; - -typedef TrainSelectedCallback(int trainNumber); - -mixin TrainInfoPromptCommon { - static String routeName = "/trainInfo/chooseTrain"; - - onTrainSelected(BuildContext context, int selection) { - Navigator.of(context).pushNamed(TrainInfo.routeName, arguments: selection); - } -} - -mixin TrainInfoPromptListHandling { - List operators = []; - - Future loadOperators(BuildContext context) async { - operators = []; - - final operatorsString = await DefaultAssetBundle.of(context).loadString("assets/lines/files.txt"); - final operatorsFilesList = operatorsString.split("\n"); - - final decoder = JsonDecoder(); - - for (final operatorFile in operatorsFilesList) { - final operatorString = await DefaultAssetBundle.of(context).loadString("assets/lines/$operatorFile"); - final operatorData = decoder.convert(operatorString); - final _operator = TrainOperatorLines.fromJson(operatorData); - operators.add(_operator); - } - } - - Widget getOperatorsListView(BuildContext context, {String currentInput = "", @required TrainSelectedCallback onTrainSelected}) { - var sliversTuple = operators.map( - (op) => Tuple2( - getFilteredLines(op, currentInput), - getOperatorSliver(context, op, currentInput, onTrainSelected) - ) - ) - .where((tuple) => tuple.item1.isNotEmpty).toList(); - if (currentInput.isNotEmpty) sliversTuple.sort((a, b) { - final aTrain = a.item1.first; - final bTrain = b.item1.first; - - final inputAsRegExp = RegExp(currentInput); - - final matchOnA = inputAsRegExp.firstMatch(aTrain.number); - final matchOnB = inputAsRegExp.firstMatch(bTrain.number); - - if (matchOnA.start != matchOnB.start) return matchOnA.start - matchOnB.start; - - if (aTrain.number.length != bTrain.number.length) return aTrain.number.length - bTrain.number.length; - - return aTrain.number.compareTo(bTrain.number); - }); - var slivers = sliversTuple.map((tuple) => tuple.item2).toList(); - - return CustomScrollView( - slivers: [ - ...slivers, - SliverToBoxAdapter( - child: getUseCurrentInputWidget(currentInput, onTrainSelected), - ), - SliverToBoxAdapter( - child: Container( - height: MediaQuery.of(context).viewPadding.bottom, - ), - ), - ], - ); - } - - Widget getUseCurrentInputWidget(String currentInput, TrainSelectedCallback onTrainSelected) { - if (currentInput.isEmpty) { - return Container(); - } - - if (int.tryParse(currentInput) == null) { - return Container(); - } - - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - if (Platform.isAndroid) - ListTile( - title: Text("Caută trenul cu numărul $currentInput"), - onTap: () { - onTrainSelected(int.parse(currentInput)); - }, - ) - else if (Platform.isIOS) - GestureDetector( - onTap: () { - onTrainSelected(int.parse(currentInput)); - }, - child: Padding( - padding: const EdgeInsets.all(8), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text("Caută trenul cu numărul $currentInput") - ], - ) - ), - ), - Divider(), - ], - ); - } - - List<_TrainOperatorTrainDescription> getFilteredLines(TrainOperatorLines _operator, String currentInput) { - if (currentInput.isNotEmpty) { - final filteredLines = _operator.trains - .where((elem) => elem.number.contains(currentInput)) - .toList(); - - filteredLines.sort((a, b) { - final inputAsRegExp = RegExp(currentInput); - - final matchOnA = inputAsRegExp.firstMatch(a.number); - final matchOnB = inputAsRegExp.firstMatch(b.number); - - if (matchOnA.start != matchOnB.start) return matchOnA.start - matchOnB.start; - - if (a.number.length != b.number.length) return a.number.length - b.number.length; - - return a.number.compareTo(b.number); - }); - - return filteredLines; - } - else { - return _operator.trains; - } - } - - Widget getOperatorSliver(BuildContext context, TrainOperatorLines _operator, String currentInput, TrainSelectedCallback onTrainSelected) { - final filteredLines = getFilteredLines(_operator, currentInput); - - if (filteredLines.isEmpty) { - return SliverToBoxAdapter(child: Container(),); - } - - return SliverPrototypeExtentList( - prototypeItem: Column( - children: [ - getLineListItem( - context, - op: TrainOperatorLines(), - line: _TrainOperatorTrainDescription() - ), - Divider(), - ], - ), - delegate: SliverChildBuilderDelegate( - (context, index) { - return Column( - children: [ - getLineListItem( - context, - op: _operator, - line: filteredLines[index], - onTrainSelected: onTrainSelected - ), - Divider(), - ], - ); - }, - childCount: filteredLines.length, - addSemanticIndexes: true, - ), - ); - } - - Widget getLineListItem(BuildContext context, {TrainOperatorLines op, _TrainOperatorTrainDescription line, TrainSelectedCallback onTrainSelected}) { - if (Platform.isAndroid) { - return ListTile( - dense: true, - title: Text("${line.rang ?? ""} ${line.number ?? ""}"), - subtitle: Text(op.operator ?? ""), - onTap: () { - onTrainSelected(line.internalNumber); - }, - ); - } - else if (Platform.isIOS) { - return GestureDetector( - onTap: () { - onTrainSelected(line.internalNumber); - }, - child: Padding( - padding: const EdgeInsets.fromLTRB(16, 2, 16, 2), - child: SizedBox( - width: double.infinity, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - op.operator ?? "", - style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(fontSize: 10, fontWeight: FontWeight.w200), - textAlign: TextAlign.left, - ), - Text( - "${line.rang ?? ""} ${line.number ?? ""}", - textAlign: TextAlign.left, - ), - ], - ), - ), - ), - ); - } - - return null; - } -} - -class TrainInfoPromptMaterial extends StatefulWidget { - @override - _TrainInfoPromptMaterialState createState() => _TrainInfoPromptMaterialState(); -} - -class _TrainInfoPromptMaterialState extends State with TrainInfoPromptCommon, TrainInfoPromptListHandling { - TextEditingController trainNoController = TextEditingController(); - - @override - void initState() { - super.initState(); - - loadOperators(context).then((_) { - setState(() {}); - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text("Informații despre tren"), - centerTitle: true, - ), - body: SafeArea( - bottom: false, - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: TextField( - controller: trainNoController, - autofocus: true, - decoration: InputDecoration( - border: OutlineInputBorder(), - labelText: "Numărul trenului", - ), - inputFormatters: [ - FilteringTextInputFormatter.digitsOnly, - ], - textInputAction: TextInputAction.search, - keyboardType: TextInputType.number, - onChanged: (_) { - setState(() {}); - }, - ), - ), - Expanded( - child: getOperatorsListView(context, currentInput: trainNoController.text, onTrainSelected: (number) { - onTrainSelected(context, number); - }) - ) - ], - ), - ), - ); - } -} - -class TrainInfoPromptCupertino extends StatefulWidget { - @override - _TrainInfoPromptCupertinoState createState() => _TrainInfoPromptCupertinoState(); -} - -class _TrainInfoPromptCupertinoState extends State with TrainInfoPromptCommon, TrainInfoPromptListHandling { - TextEditingController trainNoController = TextEditingController(); - - @override - void initState() { - super.initState(); - - loadOperators(context).then((_) { - setState(() {}); - }); - } - - @override - Widget build(BuildContext context) { - return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - middle: Text("Informații despre tren"), - ), - child: SafeArea( - bottom: false, - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Padding( - padding: const EdgeInsets.all(4), - child: CupertinoTextField( - controller: trainNoController, - autofocus: true, - placeholder: "Numărul trenului", - textInputAction: TextInputAction.search, - keyboardType: TextInputType.number, - onChanged: (_) { - setState(() {}); - }, - inputFormatters: [ - FilteringTextInputFormatter.digitsOnly, - ], - ), - ), - Expanded( - child: getOperatorsListView( - context, - currentInput: trainNoController.text, onTrainSelected: (number) { - onTrainSelected(context, number); - } - ) - ) - ], - ), - ), - ); - } -} - -@JsonSerializable() -class TrainOperatorLines { - @JsonKey(name: "short_name") - final String shortName; - final String operator; - @JsonKey(name: "versiune") - final String version; - @JsonKey(name: "trenuri") - final List<_TrainOperatorTrainDescription> trains; - - TrainOperatorLines({ - this.operator, - this.shortName = "", - this.version, - this.trains, - }); - - factory TrainOperatorLines.fromJson(Map json) => _$TrainOperatorLinesFromJson(json); - Map toJson() => _$TrainOperatorLinesToJson(this); -} - -@JsonSerializable() -class _TrainOperatorTrainDescription { - final String rang; - @JsonKey(name: "numar") - final String number; - @JsonKey(name: "numar_intern") - final int internalNumber; - - _TrainOperatorTrainDescription({ - this.number, - this.rang, - this.internalNumber - }); - - factory _TrainOperatorTrainDescription.fromJson(Map json) => _$_TrainOperatorTrainDescriptionFromJson(json); - Map toJson() => _$_TrainOperatorTrainDescriptionToJson(this); -} \ No newline at end of file diff --git a/lib/train_info_page/train_info_prompt.g.dart b/lib/train_info_page/train_info_prompt.g.dart deleted file mode 100644 index fed6cd2..0000000 --- a/lib/train_info_page/train_info_prompt.g.dart +++ /dev/null @@ -1,44 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'train_info_prompt.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -TrainOperatorLines _$TrainOperatorLinesFromJson(Map json) { - return TrainOperatorLines( - operator: json['operator'] as String, - shortName: json['short_name'] as String, - version: json['versiune'] as String, - trains: (json['trenuri'] as List) - ?.map((e) => e == null - ? null - : _TrainOperatorTrainDescription.fromJson( - e as Map)) - ?.toList()); -} - -Map _$TrainOperatorLinesToJson(TrainOperatorLines instance) => - { - 'short_name': instance.shortName, - 'operator': instance.operator, - 'versiune': instance.version, - 'trenuri': instance.trains - }; - -_TrainOperatorTrainDescription _$_TrainOperatorTrainDescriptionFromJson( - Map json) { - return _TrainOperatorTrainDescription( - number: json['numar'] as String, - rang: json['rang'] as String, - internalNumber: json['numar_intern'] as int); -} - -Map _$_TrainOperatorTrainDescriptionToJson( - _TrainOperatorTrainDescription instance) => - { - 'rang': instance.rang, - 'numar': instance.number, - 'numar_intern': instance.internalNumber - }; diff --git a/lib/utils/default_ui_design.dart b/lib/utils/default_ui_design.dart new file mode 100644 index 0000000..5c9cd1e --- /dev/null +++ b/lib/utils/default_ui_design.dart @@ -0,0 +1,12 @@ +import 'dart:io'; + +import 'package:info_tren/models/ui_design.dart'; + +UiDesign get defaultUiDesign { + if (Platform.isIOS) { + return UiDesign.CUPERTINO; + } + else { + return UiDesign.MATERIAL; + } +} \ No newline at end of file diff --git a/lib/utils/state_to_string.dart b/lib/utils/state_to_string.dart new file mode 100644 index 0000000..7058d0f --- /dev/null +++ b/lib/utils/state_to_string.dart @@ -0,0 +1,12 @@ +import 'package:info_tren/models/train_data.dart'; + +String stateToString(State state) { + switch(state) { + case State.PASSING: + return 'trecere fără oprire'; + case State.ARRIVAL: + return 'sosire'; + case State.DEPARTURE: + return 'plecare'; + } +} \ No newline at end of file diff --git a/lib/utils/webview_invoke.dart b/lib/utils/webview_invoke.dart deleted file mode 100644 index 8dba886..0000000 --- a/lib/utils/webview_invoke.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'dart:convert'; -import 'dart:io' show Platform; - -import 'package:flutter/foundation.dart'; -import 'package:webview_flutter/webview_flutter.dart'; - -/// Evaluates a JavaScript function on the given WebView. -/// -/// The JavaScript function must return a String. -/// -/// On Android, the `String` resulted from the evaluation -/// is JSON parsed. On iOS, the `String` is returned as is. -/// -/// Other platforms are not supported. The returned value -/// in this case will be `null`. -Future wInvoke({ - @required WebViewController webViewController, - @required String jsFunctionContent, - bool isFunctionAlready = false -}) async { - final actualJS = isFunctionAlready ? - jsFunctionContent : - """ - (() => { - $jsFunctionContent - })() - """; - - final res = await webViewController.evaluateJavascript(actualJS); - - if (Platform.isAndroid) return JsonDecoder().convert(res) as String; - else if (Platform.isIOS) return res; - else return null; -} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index bd5cd45..31ac58e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,20 +1,27 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "24.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.36.4" + version: "2.1.0" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.5.2" + version: "2.2.0" async: dependency: transitive description: @@ -22,69 +29,62 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.6.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" build: dependency: transitive description: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "2.1.0" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "1.0.0" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "3.0.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.0.6" + version: "2.0.4" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.6.1" + version: "2.1.1" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "3.0.6" + version: "7.1.0" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "4.2.2" + version: "5.1.0" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "6.7.0" + version: "8.1.2" characters: dependency: transitive description: @@ -99,20 +99,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.0" - clock: + checked_yaml: dependency: transitive description: - name: clock + name: checked_yaml url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "2.0.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3" code_builder: dependency: transitive description: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "4.1.0" collection: dependency: transitive description: @@ -126,21 +133,14 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - csslib: - dependency: transitive - description: - name: csslib - url: "https://pub.dartlang.org" - source: hosted - version: "0.16.1" + version: "3.0.1" cupertino_icons: dependency: "direct main" description: @@ -154,122 +154,110 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.2.9" - fake_async: + version: "2.0.3" + file: dependency: transitive description: - name: fake_async + name: file url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "6.1.2" fixnum: dependency: transitive description: name: fixnum url: "https://pub.dartlang.org" source: hosted - version: "0.10.9" + version: "1.0.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - front_end: + flutter_redux: + dependency: "direct main" + description: + name: flutter_redux + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.2" + frontend_server_client: dependency: transitive description: - name: front_end + name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "0.1.19" + version: "2.1.2" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "2.0.1" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" - html: - dependency: transitive - description: - name: html - url: "https://pub.dartlang.org" - source: hosted - version: "0.14.0+2" + version: "2.0.0" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.0+2" + version: "0.13.3" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "3.0.1" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "4.0.0" io: dependency: transitive description: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.3" + version: "1.0.3" js: dependency: transitive description: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.1+1" + version: "0.6.3" json_annotation: - dependency: "direct main" + dependency: transitive description: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "4.1.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" - kernel: - dependency: transitive - description: - name: kernel - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.19" + version: "5.0.0" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+2" + version: "1.0.1" matcher: dependency: transitive description: @@ -283,28 +271,21 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "0.9.6+3" + version: "1.0.0" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - package_resolver: - dependency: transitive - description: - name: package_resolver - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.10" + version: "2.0.0" path: dependency: transitive description: @@ -318,35 +299,42 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.11.1" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "1.5.0" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "2.0.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "1.0.0" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "3.0.1" + redux: + dependency: transitive + description: + name: redux + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.0" rxdart: dependency: "direct main" description: @@ -360,14 +348,14 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.5" + version: "1.2.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -379,7 +367,14 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "0.9.4+2" + version: "1.1.0" + source_helper: + dependency: transitive + description: + name: source_helper + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" source_span: dependency: transitive description: @@ -407,7 +402,7 @@ packages: name: stream_transform url: "https://pub.dartlang.org" source: hosted - version: "0.0.19" + version: "2.0.0" string_scanner: dependency: transitive description: @@ -422,27 +417,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" timing: dependency: transitive description: name: timing url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+1" + version: "1.0.0" tuple: dependency: "direct main" description: name: tuple url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "2.0.0" typed_data: dependency: transitive description: @@ -463,28 +451,20 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+12" + version: "1.0.0" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.14" - webview_flutter: - dependency: "direct main" - description: - name: webview_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.11+2" + version: "2.1.0" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.16" + version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.5.0" diff --git a/pubspec.yaml b/pubspec.yaml index 48fd79e..166b160 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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.7.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: @@ -23,18 +23,17 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. # cupertino_icons: ^0.1.2 - json_annotation: ^2.0.0 rxdart: ^0.22.0 - http: ^0.12.0 - webview_flutter: ^0.3.0 + http: ^0.13.0 cupertino_icons: ^0.1.2 - tuple: ^1.0.2 + tuple: ^2.0.0 + flutter_redux: ^0.8.2 dev_dependencies: - flutter_test: - sdk: flutter - build_runner: ^1.0.0 - json_serializable: ^3.0.0 + # flutter_test: + # sdk: flutter + build_runner: ^2.1.0 + json_serializable: ^5.0.0 # For information on the generic Dart part of this file, see the @@ -64,7 +63,17 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: - # fonts: + fonts: + - family: Atkinson Hyperlegible + fonts: + - asset: fonts/ah/ah-Regular.ttf + - asset: fonts/ah/ah-Italic.ttf + style: italic + - asset: fonts/ah/ah-Bold.ttf + weight: 700 + - asset: fonts/ah/ah-BoldItalic.ttf + weight: 700 + style: italic # - family: Schyler # fonts: # - asset: fonts/Schyler-Regular.ttf diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..3022fe4 --- /dev/null +++ b/web/index.html @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + info_tren + + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..89f1a81 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "info_tren", + "short_name": "info_tren", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +}