Renamed LayerUtils.isBikeshareLayerActive() to LayerUtils.isBikeshare…

…Enabled()
carvalhorr · Aug 11, 2017 · 8f38538 · barbeau · Aug 12, 2017 · 8f38538
1 parent 80c9ba9
commit 8f38538
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/...away-android/src/main/java/org/onebusaway/android/directions/util/TripRequestBuilder.java b/...away-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
@@ -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
@@ -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
@@ -456,7 +456,7 @@ public void onClick(DialogInterface dialogInterface, int which) {
 
         ArrayList<String> travelByOptions = new ArrayList<String>(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
@@ -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);
     }
 }