From 8f38538a32d2e62e4d921ec14bfd4cbbca20f691 Mon Sep 17 00:00:00 2001 From: Rodrigo Carvalho Date: Fri, 11 Aug 2017 21:30:07 +0100 Subject: [PATCH] Renamed LayerUtils.isBikeshareLayerActive() to LayerUtils.isBikeshareEnabled() --- .../android/directions/util/TripRequestBuilder.java | 3 +-- .../android/map/bike/BikeshareMapController.java | 5 +---- .../java/org/onebusaway/android/ui/HomeActivity.java | 2 +- .../java/org/onebusaway/android/ui/TripPlanFragment.java | 2 +- .../java/org/onebusaway/android/util/LayerUtils.java | 9 ++++----- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/directions/util/TripRequestBuilder.java b/onebusaway-android/src/main/java/org/onebusaway/android/directions/util/TripRequestBuilder.java index 2ad832a40..2675674dd 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/directions/util/TripRequestBuilder.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/directions/util/TripRequestBuilder.java @@ -36,7 +36,6 @@ import java.net.URL; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Date; @@ -155,7 +154,7 @@ public TripRequestBuilder setModeSetById(int id) { switch (id) { case R.string.transit_mode_transit: - if (LayerUtils.isBikeshareLayerActive()) { + if (LayerUtils.isBikeshareEnabled()) { modes = Arrays.asList(TraverseMode.TRANSIT.toString(), TraverseMode.WALK.toString(), Application.get().getString(R.string.traverse_mode_bicycle_rent)); diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/map/bike/BikeshareMapController.java b/onebusaway-android/src/main/java/org/onebusaway/android/map/bike/BikeshareMapController.java index 0a5dde00c..81c9a0865 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/map/bike/BikeshareMapController.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/map/bike/BikeshareMapController.java @@ -16,8 +16,6 @@ */ package org.onebusaway.android.map.bike; -import org.onebusaway.android.R; -import org.onebusaway.android.app.Application; import org.onebusaway.android.map.BaseMapController; import org.onebusaway.android.map.MapParams; import org.onebusaway.android.util.LayerUtils; @@ -26,7 +24,6 @@ import org.opentripplanner.api.model.VertexType; import org.opentripplanner.routing.core.TraverseMode; -import android.content.SharedPreferences; import android.os.Bundle; import android.support.v4.content.Loader; @@ -104,7 +101,7 @@ protected Loader getLoader() { @Override protected void updateData() { - boolean isBikeActivated = LayerUtils.isBikeshareLayerActive(); + boolean isBikeActivated = LayerUtils.isBikeshareEnabled(); if (isBikeActivated) { if (mapMode != null) { if (mapMode.equals(MapParams.MODE_DIRECTIONS) && diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/HomeActivity.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/HomeActivity.java index d92fa5886..6c7399d7f 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/HomeActivity.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/HomeActivity.java @@ -1474,7 +1474,7 @@ private void setupLayersSpeedDial() { LAYERS_FAB_DEFAULT_BOTTOM_MARGIN = p.bottomMargin; - if (LayerUtils.isBikeshareLayerActive()) { + if (LayerUtils.isBikeshareEnabled()) { mLayersFab.setVisibility(View.VISIBLE); diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java index 9b71bb623..6186fc734 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/ui/TripPlanFragment.java @@ -456,7 +456,7 @@ public void onClick(DialogInterface dialogInterface, int which) { ArrayList travelByOptions = new ArrayList(Arrays.asList(getResources().getStringArray(R.array.transit_mode_array))); - if (!LayerUtils.isBikeshareLayerActive()) { + if (!LayerUtils.isBikeshareEnabled()) { travelByOptions.remove(getString(R.string.transit_mode_bikeshare)); } diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/util/LayerUtils.java b/onebusaway-android/src/main/java/org/onebusaway/android/util/LayerUtils.java index 0fcac434b..e36127458 100644 --- a/onebusaway-android/src/main/java/org/onebusaway/android/util/LayerUtils.java +++ b/onebusaway-android/src/main/java/org/onebusaway/android/util/LayerUtils.java @@ -21,7 +21,6 @@ import org.onebusaway.android.R; import org.onebusaway.android.app.Application; import org.onebusaway.android.map.googlemapsv2.LayerInfo; -import org.onebusaway.android.map.googlemapsv2.bike.BikeStationOverlay; /** * Utility methods related to creating layers. Currently only methods related to the bikeshare layer @@ -71,12 +70,12 @@ public String getSharedPreferenceKey() { }; /** - * Method to check whether bikeshare layer is active or not. + * Method to check whether bikeshare layer is enabled or not. * * @return true if the bikeshare layer is an option that can be toggled on/off */ - public static boolean isBikeshareLayerActive() { - // Bike layer is active if either the current region + public static boolean isBikeshareEnabled() { + // Bike layer is enabled if either the current region // supports it or a custom otp url is set. The custom otp url is used to make the testing // process easier return ((Application.get().getCurrentRegion() != null @@ -88,7 +87,7 @@ public static boolean isBikeshareLayerActive() { * @return true if the bikeshare layer is active and visible */ public static boolean isBikeshareLayerVisible() { - return isBikeshareLayerActive() && Application.getPrefs().getBoolean( + return isBikeshareEnabled() && Application.getPrefs().getBoolean( Application.get().getString(R.string.preference_key_layer_bikeshare_visible), true); } }