Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add information about the number of cars on Link Light Rail trains #1346

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add information about the number of cars on Link Light Rail trains #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c17aea
show car counts
millanp Mar 28, 2025
5ffeec3
Merge branch 'main' of https://github.com/OneBusAway/onebusaway-andro…
millanp Mar 28, 2025
97c581c
sameline
millanp Mar 28, 2025
7935c16
try smaller badge
millanp Mar 28, 2025
8aaee14
fix dimension
millanp Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions onebusaway-android/src/main/java/org/onebusaway/android/io/elements/ObaArrivalInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,4 +347,19 @@ public Occupancy getHistoricalOccupancy() {
public Occupancy getOccupancyStatus() {
return Occupancy.fromString(occupancyStatus);
}

/**
* @return a String indicating the number of cars, if this is a light rail arrival.
* Otherwise returns null.
*/
public String getNumCars() {
assert this.getVehicleId() != null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if(this.getVehicleId() == null) return null;

String[] splitByBracket = this.getVehicleId().split("\\[");
if (splitByBracket.length == 2) {
int numCars = splitByBracket[1].split("-").length;
return numCars + " " + "car";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ensure the string car is translated, and use cars when numCars > 1.

} else {
return null;
}
}
}
14 changes: 14 additions & 0 deletions onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListAdapterStyleA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ protected void initView(View view, ArrivalInfo stopInfo) {
TextView destination = (TextView) view.findViewById(R.id.destination);
TextView time = (TextView) view.findViewById(R.id.time);
TextView status = (TextView) view.findViewById(R.id.status);
TextView carCount = (TextView) view.findViewById(R.id.car_count);
TextView etaView = (TextView) view.findViewById(R.id.eta);
TextView minView = (TextView) view.findViewById(R.id.eta_min);
ViewGroup realtimeView = (ViewGroup) view.findViewById(R.id.eta_realtime_indicator);
Expand Down Expand Up @@ -103,6 +104,17 @@ protected void initView(View view, ArrivalInfo stopInfo) {
destination.setText(UIUtils.formatDisplayText(arrivalInfo.getHeadsign()));
status.setText(stopInfo.getStatusText());


String numCars = stopInfo.getInfo().getNumCars();
if (numCars != null) {
carCount.setBackgroundResource(R.drawable.round_corners_style_b_status);
carCount.setText(stopInfo.getInfo().getNumCars());
carCount.setVisibility(View.VISIBLE);
} else {
carCount.setVisibility(View.GONE);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can make it by default gone and when we have numCars just populate it 🤔

}


long eta = stopInfo.getEta();
if (eta == 0) {
etaView.setText(R.string.stop_info_eta_now);
Expand Down Expand Up @@ -130,6 +142,8 @@ protected void initView(View view, ArrivalInfo stopInfo) {
minView.setTextColor(color);
d.setColor(color);

((GradientDrawable) carCount.getBackground()).setColor(color);

// Set padding on status view
int pSides = UIUtils.dpToPixels(context, 5);
int pTopBottom = UIUtils.dpToPixels(context, 2);
Expand Down
12 changes: 12 additions & 0 deletions onebusaway-android/src/main/res/layout/arrivals_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@
android:layout_marginBottom="2dp"
app:layout_constraintTop_toBottomOf="@id/destination" />

<include
android:id="@+id/car_count"
layout="@layout/arrivals_list_tv_template_style_a_status_smallest"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
app:layout_constraintTop_toTopOf="@id/status"
app:layout_constraintBottom_toBottomOf="@id/status"
app:layout_constraintStart_toEndOf="@+id/status"
app_layout_constraintEnd_toEndOf="@+id/time"/>

<include
android:id="@+id/occupancy"
android:layout_width="wrap_content"
Expand Down
16 changes: 16 additions & 0 deletions onebusaway-android/src/main/res/layout/arrivals_list_tv_template_style_a_status_smallest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:minWidth="@dimen/arrival_style_b_status_min_width_small"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:text="12 min delay"
android:id="@+id/status3"
style="@style/ArrivalsListStatusSmallStyleA"
android:layout_span="2"
android:layout_alignParentEnd="true"
android:background="@drawable/round_corners_style_b_status"/>
1 change: 1 addition & 0 deletions onebusaway-android/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

<!-- Arrivals Style B -->
<dimen name="arrival_style_b_status_min_width">77dp</dimen>
<dimen name="arrival_style_b_status_min_width_small">55dp</dimen>

<!-- Trip details - transit stop and line -->
<dimen name="trip_details_transit_line_width">3dp</dimen>
Expand Down