kbruen/info_tren
1
0
Fork 0
Code Issues Pull requests Releases 21 Activity

Fixed badge

Browse source
This commit is contained in:
Dan Cojocaru 2021-08-23 17:26:36 +03:00
parent a955ecbfc0
commit e83f36eb86
Signed by: kbruen
GPG key ID: 818A889458EDC937
4 changed files with 48 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.TXT
View file

@ -1,3 +1,6 @@
v2.3.1
Fixed badge background when arrival is known but not departure
v2.3.0 v2.3.0
Added pull to refresh Added pull to refresh

26
lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart
View file

@ -18,11 +18,29 @@ class DisplayTrainStation extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Builder( Builder(
builder: (context) { builder: (context) {
final delay = station.departure?.status?.delay ?? station.arrival?.status?.delay; final departureStatus = station.departure?.status;
final real = station.departure?.status?.real ?? station.arrival?.status?.real; final arrivalStatus = station.arrival?.status;
int delay;
bool real;
if (departureStatus == null) {
delay = arrivalStatus?.delay ?? 0;
real = arrivalStatus?.real ?? false;
}
else if (arrivalStatus == null) {
delay = departureStatus.delay;
real = departureStatus.real;
}
else {
delay = departureStatus.delay;
real = departureStatus.real;
if (!real && arrivalStatus.real) {
delay = arrivalStatus.delay;
real = arrivalStatus.real;
}
}
final isDelayed = delay != null && delay > 0 && real == true; final isDelayed = delay > 0 && real == true;
final isOnTime = delay != null && delay <= 0 && real == true; final isOnTime = delay <= 0 && real == true;
final isNotScheduled = false; final isNotScheduled = false;
return KmBadge( return KmBadge(

26
lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart
View file

@ -21,11 +21,29 @@ class DisplayTrainStation extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Builder( Builder(
builder: (context) { builder: (context) {
final delay = station.departure?.status?.delay ?? station.arrival?.status?.delay; final departureStatus = station.departure?.status;
final real = station.departure?.status?.real ?? station.arrival?.status?.real; final arrivalStatus = station.arrival?.status;
int delay;
bool real;
if (departureStatus == null) {
delay = arrivalStatus?.delay ?? 0;
real = arrivalStatus?.real ?? false;
}
else if (arrivalStatus == null) {
delay = departureStatus.delay;
real = departureStatus.real;
}
else {
delay = departureStatus.delay;
real = departureStatus.real;
if (!real && arrivalStatus.real) {
delay = arrivalStatus.delay;
real = arrivalStatus.real;
}
}
final isDelayed = delay != null && delay > 0 && real == true; final isDelayed = delay > 0 && real == true;
final isOnTime = delay != null && delay <= 0 && real == true; final isOnTime = delay <= 0 && real == true;
final isNotScheduled = false; final isNotScheduled = false;
return KmBadge( return KmBadge(

2
pubspec.yaml
View file

@ -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. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 2.3.0 version: 2.3.1
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.12.0 <3.0.0"