diff --git a/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java b/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java index c37c981b2..002c35226 100644 --- a/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java +++ b/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java @@ -11,7 +11,7 @@ import au.id.micolous.metrodroid.card.ultralight.UltralightCard; import au.id.micolous.metrodroid.card.ultralight.UltralightPage; import au.id.micolous.metrodroid.transit.TransitData; -import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData; +import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData; import au.id.micolous.metrodroid.util.Utils; /** diff --git a/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java b/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java index 31fac60e9..e5f365c0b 100644 --- a/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java +++ b/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java @@ -33,7 +33,7 @@ import au.id.micolous.metrodroid.fragment.UltralightCardRawDataFragment; import au.id.micolous.metrodroid.transit.TransitData; import au.id.micolous.metrodroid.transit.TransitIdentity; -import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData; +import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData; import au.id.micolous.metrodroid.transit.troika.TroikaUltralightTransitData; import au.id.micolous.metrodroid.transit.unknown.BlankUltralightTransitData; import au.id.micolous.metrodroid.transit.unknown.UnauthorizedUltralightTransitData; diff --git a/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java b/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java index 7ff5478d1..86670ed73 100644 --- a/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java +++ b/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java @@ -32,7 +32,7 @@ import au.id.micolous.farebot.R; import au.id.micolous.metrodroid.card.CardType; import au.id.micolous.metrodroid.transit.chc_metrocard.ChcMetrocardTransitData; -import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData; +import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData; import au.id.micolous.metrodroid.transit.kmt.KMTTransitData; import au.id.micolous.metrodroid.transit.lax_tap.LaxTapTransitData; import au.id.micolous.metrodroid.transit.manly_fast_ferry.ManlyFastFerryTransitData; diff --git a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransaction.java b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransaction.java similarity index 98% rename from src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransaction.java rename to src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransaction.java index 57c2e5274..f783ac4bb 100644 --- a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransaction.java +++ b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransaction.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package au.id.micolous.metrodroid.transit.compass; +package au.id.micolous.metrodroid.transit.yvr_compass; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransitData.java b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransitData.java similarity index 98% rename from src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransitData.java rename to src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransitData.java index ff7b25426..7f9d648d5 100644 --- a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTransitData.java +++ b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTransitData.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package au.id.micolous.metrodroid.transit.compass; +package au.id.micolous.metrodroid.transit.yvr_compass; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +55,7 @@ public CompassUltralightTransitData[] newArray(int size) { return new CompassUltralightTransitData[size]; } }; - public static final String NAME = "Compass Ultralight"; + public static final String NAME = "Compass"; private final int mProductCode; private final long mSerial; private final byte mType; diff --git a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTrip.java b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTrip.java similarity index 98% rename from src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTrip.java rename to src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTrip.java index a2818cfeb..a89b14dd0 100644 --- a/src/main/java/au/id/micolous/metrodroid/transit/compass/CompassUltralightTrip.java +++ b/src/main/java/au/id/micolous/metrodroid/transit/yvr_compass/CompassUltralightTrip.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package au.id.micolous.metrodroid.transit.compass; +package au.id.micolous.metrodroid.transit.yvr_compass; import android.os.Parcel; import android.os.Parcelable;