Merge branch 'working_branch'

CHANGELOG.TXT

@@ -1,3 +1,10 @@
+v2.0.3
+- added km badge colour for iOS
+  + will be added for Android soon
+  + green for being on time
+  + yellow for a non planned stop
+  + red for a delay
+
 v2.0.2
 - added translucency to the navigation bar on iOS
 

lib/main.dart

@@ -2,6 +2,7 @@ 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';
@@ -32,8 +33,12 @@ class StartPoint extends StatelessWidget {
             return TrainInfoPromptMaterial();
           },
           TrainInfo.routeName: (context) {
-            return TrainInfoMaterial(
+            return TrainDataWebViewAdapter(
-              trainNumber: ModalRoute.of(context).settings.arguments as int,
+              builder: (context) {
+                return TrainInfoMaterial(
+                  trainNumber: ModalRoute.of(context).settings.arguments as int,
+                );
+              },
             );
           },
         },
@@ -55,8 +60,12 @@ class StartPoint extends StatelessWidget {
             return TrainInfoPromptCupertino();
           },
           TrainInfo.routeName: (context) {
-            return TrainInfoCupertino(
+            return TrainDataWebViewAdapter(
-              trainNumber: ModalRoute.of(context).settings.arguments as int,
+              builder: (context) {
+                return TrainInfoCupertino(
+                  trainNumber: ModalRoute.of(context).settings.arguments as int,
+                );
+              },
             );
           },
         }

lib/train_info_page/train_info_cupertino.dart

@@ -3,6 +3,7 @@ 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 {
@@ -962,223 +963,6 @@ class DisplayTrainStations extends StatelessWidget {
   }
 }
 
-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: <Widget>[
-        Row(
-          mainAxisSize: MainAxisSize.max,
-          children: <Widget>[
-            Padding(
-              padding: const EdgeInsets.all(8),
-              child: Container(
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(10),
-                  border: Border.all(
-                    width: 2,
-                    color: FOREGROUND_WHITE,
-                  ),
-                  // color: CupertinoColors.activeOrange,
-                ),
-                width: 48,
-                height: 48,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    Expanded(
-                      child: Center(
-                        child: FutureDisplay<int>(
-                          future: station.km,
-                          builder: (context, value) {
-                            return Text(
-                              value.toString(),
-                              style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                                fontSize: 18,
-                                fontWeight: FontWeight.w100,
-                              ),
-                              textAlign: TextAlign.center,
-                            );
-                          },
-                        ),
-                      ),
-                    ),
-                    Text(
-                      "km",
-                      style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(fontSize: 10),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-            Expanded(
-              child: FutureDisplay<List<String>>(
-                future: Future.wait([
-                  station.stationName,
-                  station.observations
-                ]),
-                builder: (context, items) {
-                  return Text(
-                    items[0],
-                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                      fontSize: 22,
-                      fontWeight: FontWeight.w100,
-                      fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
-                    ),
-                    textAlign: TextAlign.center,
-                  );
-                },
-              )
-            )
-          ],
-        ),
-        FutureDisplay<List<String>>(
-          future: Future.wait([
-            station.arrivalTime,
-            station.stopsFor,
-            station.departureTime
-          ]),
-          builder: (context, items) {
-            if (items[0].isEmpty) {
-              // Plecare
-              return Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: <Widget>[
-                  Expanded(child: Container(),),
-                  Text("plecare la ${items[2]}"),
-                  Container(width: 2,),
-                  Text(
-                    "→",
-                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                      fontSize: 22,
-                    ),
-                  ),
-                ],
-              );
-            }
-
-            if (items[2].isEmpty) {
-              // Sosire
-              return Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: <Widget>[
-                  Text(
-                    "→",
-                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                      fontSize: 22,
-                    ),
-                  ),
-                  Container(width: 2,),
-                  Text("sosire la ${items[0]}"),
-                  Expanded(child: Container(),),
-                ],
-              );
-            }
-
-            return Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: <Widget>[
-                Text(
-                  "→",
-                  style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                    fontSize: 22,
-                  ),
-                ),
-                Container(width: 2,),
-                Text(items[0]),
-                Expanded(child: Container(),),
-                Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    Builder(
-                      builder: (context) {
-                        if (items[1].isEmpty || items[1] == "0") {
-                          return Container();
-                        }
-                        if (items[1] == "1") {
-                          return Text(
-                            "staționează pentru\n1 minut",
-                            textAlign: TextAlign.center,
-                          );
-                        }
-                        return Text(
-                          "staționează pentru\n${items[1]} minute",
-                          textAlign: TextAlign.center,
-                        );
-                      }
-                    ),
-                    FutureBuilder<String>(
-                      future: station.observations,
-                      builder: (context, snapshot) {
-                        if (snapshot.data == "ONI") {
-                          return Text(
-                            "oprire ne-itinerarică",
-                            style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                              fontStyle: FontStyle.italic,
-                            ),
-                            textAlign: TextAlign.center,
-                          );
-                        }
-
-                        return Container();
-                      },
-                    )
-                  ],
-                ),
-                Expanded(child: Container(),),
-                Text(items[2]),
-                Container(width: 2,),
-                Text(
-                  "→",
-                  style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                    fontSize: 22,
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
-        FutureDisplay<int>(
-          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();
-          },
-        )
-      ],
-    );
-  }
-}
-
 class CupertinoDivider extends StatelessWidget {
   final Color color;
 

lib/train_info_page/train_info_cupertino_DisplayTrainStation.dart

@@ -0,0 +1,279 @@
+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: <Widget>[
+        Row(
+          mainAxisSize: MainAxisSize.max,
+          children: <Widget>[
+            FutureDisplay(
+              future: Future.wait([
+                station.delay,
+                station.realOrEstimate,
+                station.observations,
+              ]),
+              builder: (context, data) {
+                final isDelayed = (data[0] as int) > 0;
+                final isOnTime = !isDelayed && (data[1] as RealOrEstimate) == RealOrEstimate.real;
+                final isNotScheduled = data[2] == "ONI";
+
+                return KmBadge(
+                  station: station,
+                  isNotScheduled: isNotScheduled,
+                  isDelayed: isDelayed,
+                  isOnTime: isOnTime,
+                );
+              }
+            ),
+            Expanded(
+              child: FutureDisplay<List<String>>(
+                future: Future.wait([
+                  station.stationName,
+                  station.observations
+                ]),
+                builder: (context, items) {
+                  return Text(
+                    items[0],
+                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                      fontSize: 22,
+                      fontWeight: FontWeight.w100,
+                      fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+                    ),
+                    textAlign: TextAlign.center,
+                  );
+                },
+              )
+            )
+          ],
+        ),
+        FutureDisplay<List<String>>(
+          future: Future.wait([
+            station.arrivalTime,
+            station.stopsFor,
+            station.departureTime
+          ]),
+          builder: (context, items) {
+            if (items[0].isEmpty) {
+              // Plecare
+              return Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: <Widget>[
+                  Expanded(child: Container(),),
+                  Text("plecare la ${items[2]}"),
+                  Container(width: 2,),
+                  Text(
+                    "→",
+                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                      fontSize: 22,
+                    ),
+                  ),
+                ],
+              );
+            }
+
+            if (items[2].isEmpty) {
+              // Sosire
+              return Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: <Widget>[
+                  Text(
+                    "→",
+                    style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                      fontSize: 22,
+                    ),
+                  ),
+                  Container(width: 2,),
+                  Text("sosire la ${items[0]}"),
+                  Expanded(child: Container(),),
+                ],
+              );
+            }
+
+            return Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                Text(
+                  "→",
+                  style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                    fontSize: 22,
+                  ),
+                ),
+                Container(width: 2,),
+                Text(items[0]),
+                Expanded(child: Container(),),
+                Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    Builder(
+                      builder: (context) {
+                        if (items[1].isEmpty || items[1] == "0") {
+                          return Container();
+                        }
+                        if (items[1] == "1") {
+                          return Text(
+                            "staționează pentru\n1 minut",
+                            textAlign: TextAlign.center,
+                          );
+                        }
+                        return Text(
+                          "staționează pentru\n${items[1]} minute",
+                          textAlign: TextAlign.center,
+                        );
+                      }
+                    ),
+                    FutureBuilder<String>(
+                      future: station.observations,
+                      builder: (context, snapshot) {
+                        if (snapshot.data == "ONI") {
+                          return Text(
+                            "oprire ne-itinerarică",
+                            style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                              fontStyle: FontStyle.italic,
+                            ),
+                            textAlign: TextAlign.center,
+                          );
+                        }
+
+                        return Container();
+                      },
+                    )
+                  ],
+                ),
+                Expanded(child: Container(),),
+                Text(items[2]),
+                Container(width: 2,),
+                Text(
+                  "→",
+                  style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                    fontSize: 22,
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+        FutureDisplay<int>(
+          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();
+          },
+        )
+      ],
+    );
+  }
+}
+
+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: <Widget>[
+            Expanded(
+              child: Center(
+                child: FutureDisplay<int>(
+                  future: station.km,
+                  builder: (context, value) {
+                    return Text(
+                      value.toString(),
+                      style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w100,
+                        color: foregroundColor
+                      ),
+                      textAlign: TextAlign.center,
+                    );
+                  },
+                ),
+              ),
+            ),
+            Text(
+              "km",
+              style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
+                fontSize: 10,
+                color: foregroundColor,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/train_info_page/train_info_prompt.dart

@@ -331,9 +331,12 @@ class _TrainInfoPromptCupertinoState extends State<TrainInfoPromptCupertino> wit
               ),
             ),
             Expanded(
-              child: getOperatorsListView(context, currentInput: trainNoController.text, onTrainSelected: (number) {
+              child: getOperatorsListView(
-                onTrainSelected(context, number);
+                context,
-              })
+                currentInput: trainNoController.text, onTrainSelected: (number) {
+                  onTrainSelected(context, number);
+                }
+              )
             )
           ],
         ),

pubspec.yaml

@@ -11,7 +11,7 @@ description: O aplicație de vizualizare a datelor puse la dispoziție de Inform
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.0.2
+version: 2.0.3
 
 environment:
   sdk: ">=2.3.0 <3.0.0"