mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 22:58:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PlanActivity: Mark selection as nullable.

Browse source
This commit is contained in:
Andreas Schildbach 2018-10-14 10:25:34 +02:00
parent 8413e6cc8c
commit 513b2b1609
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
View file

@ -109,7 +109,8 @@ public class PlanActivity extends Activity {
private LineView bubbleLinesView;
private ZoomControls zoom;
private TiledImageDrawable drawable;
private Station selection;
@Nullable
private Station selection = null;
private List<Station> stations = new LinkedList<>();
private final Handler handler = new Handler();
@ -150,6 +151,7 @@ public class PlanActivity extends Activity {
bubble.setVisibility(View.GONE);
bubble.setOnClickListener(new OnClickListener() {
public void onClick(final View v) {
final Station selection = checkNotNull(PlanActivity.this.selection);
final PopupMenu contextMenu = new StationContextMenu(PlanActivity.this, v, selection.network,
selection.location, null, false, false, false, false, false);
contextMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@ -278,10 +280,10 @@ public class PlanActivity extends Activity {
return false;
}
private void selectStation(final Station station) {
selection = station;
private void selectStation(final Station selection) {
this.selection = selection;
plan.animatePlanIntoView(station.location.lon, station.location.lat);
plan.animatePlanIntoView(selection.location.lon, selection.location.lat);
bubble.setVisibility(View.VISIBLE);
bubbleName.setText(selection.location.name);
@ -327,6 +329,7 @@ public class PlanActivity extends Activity {
}
private void updateBubble() {
final Station selection = this.selection;
if (selection != null) {
final int[] coords = new int[] { selection.location.lon, selection.location.lat };
plan.translateToViewCoordinates(coords);
@ -390,6 +393,7 @@ public class PlanActivity extends Activity {
}
public boolean isSelectedStation(final String stationId) {
final Station selection = PlanActivity.this.selection;
return selection != null && selection.location.hasId()
&& stationId.equals(selection.location.id);
}