Skip to content

Commit

Permalink
Renamed TransitData to TransitInfo
Browse files Browse the repository at this point in the history 
I don't love this name either but it's less ambiguous with other unrelated classes
like ClipperData.
  • Loading branch information
@codebutler
codebutler committed Feb 6, 2017
1 parent 23b817c commit c4d9544
Show file tree
Hide file tree
Showing 52 changed files with 245 additions and 245 deletions.
6 changes: 3 additions & 3 deletions farebot-app/src/main/java/com/codebutler/farebot/TransitFactoryRegistry.java
View file
Expand Up @@ -9,7 +9,7 @@
import com.codebutler.farebot.card.classic.ClassicCard;
import com.codebutler.farebot.card.desfire.DesfireCard;
import com.codebutler.farebot.card.felica.FelicaCard;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;
import com.codebutler.farebot.transit.TransitFactory;
import com.codebutler.farebot.transit.TransitIdentity;
import com.codebutler.farebot.transit.bilhete_unico.BilheteUnicoSPTransitFactory;
Expand Down Expand Up @@ -75,10 +75,10 @@ public TransitIdentity parseTransitIdentity(@NonNull Card card) {
}

@Nullable
public TransitData parseTransitData(@NonNull Card card) {
public TransitInfo parseTransitInfo(@NonNull Card card) {
for (TransitFactory factory : getFactories(card.getParentClass())) {
if (factory.check(card)) {
return factory.parseData(card);
return factory.parseInfo(card);
}
}
return null;
Expand Down
36 changes: 18 additions & 18 deletions farebot-app/src/main/java/com/codebutler/farebot/activity/CardInfoActivity.java
View file
Expand Up @@ -54,23 +54,23 @@
import com.codebutler.farebot.fragment.CardTripsFragment;
import com.codebutler.farebot.fragment.UnauthorizedCardFragment;
import com.codebutler.farebot.persist.CardPersister;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;
import com.codebutler.farebot.TransitFactoryRegistry;
import com.codebutler.farebot.transit.stub.UnauthorizedClassicTransitData;
import com.codebutler.farebot.transit.stub.UnauthorizedClassicTransitInfo;
import com.codebutler.farebot.ui.TabPagerAdapter;
import com.codebutler.farebot.util.Utils;

public class CardInfoActivity extends Activity {

public static final String EXTRA_TRANSIT_DATA = "transit_data";
public static final String EXTRA_TRANSIT_INFO = "transit_info";

static final String SPEAK_BALANCE_EXTRA = "com.codebutler.farebot.speak_balance";

private static final String KEY_SELECTED_TAB = "selected_tab";

private RawCard mRawCard;
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;
private TabPagerAdapter mTabsAdapter;
private TextToSpeech mTTS;
private CardPersister mCardPersister;
Expand All @@ -80,10 +80,10 @@ public class CardInfoActivity extends Activity {
private OnInitListener mTTSInitListener = new OnInitListener() {
@Override
public void onInit(int status) {
String balance = mTransitData.getBalanceString(getResources());
String balance = mTransitInfo.getBalanceString(getResources());
if (status == TextToSpeech.SUCCESS && balance != null) {
mTTS.speak(getString(R.string.balance_speech,
mTransitData.getBalanceString(getResources())),
mTransitInfo.getBalanceString(getResources())),
TextToSpeech.QUEUE_FLUSH, null);
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ protected Void doInBackground(Void... voids) {

mRawCard = mCardPersister.readCard(cursor);
mCard = mRawCard.parse();
mTransitData = mTransitFactoryRegistry.parseTransitData(mCard);
mTransitInfo = mTransitFactoryRegistry.parseTransitInfo(mCard);

SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(CardInfoActivity.this);
mSpeakBalanceEnabled = prefs.getBoolean("pref_key_speak_balance", false);
Expand All @@ -152,49 +152,49 @@ protected void onPostExecute(Void aVoid) {
return;
}

if (mTransitData == null) {
if (mTransitInfo == null) {
showAdvancedInfo(new UnsupportedCardException());
finish();
return;
}

String titleSerial = (mTransitData.getSerialNumber() != null)
? mTransitData.getSerialNumber()
String titleSerial = (mTransitInfo.getSerialNumber() != null)
? mTransitInfo.getSerialNumber()
: mCard.getTagId().hex();
actionBar.setTitle(mTransitData.getCardName(getResources()) + " " + titleSerial);
actionBar.setTitle(mTransitInfo.getCardName(getResources()) + " " + titleSerial);

Bundle args = new Bundle();
args.putParcelable(Constants.EXTRA_CARD, mCard);
args.putParcelable(EXTRA_TRANSIT_DATA, mTransitData);
args.putParcelable(EXTRA_TRANSIT_INFO, mTransitInfo);

if (mTransitData instanceof UnauthorizedClassicTransitData) {
if (mTransitInfo instanceof UnauthorizedClassicTransitInfo) {
mTabsAdapter.addTab(actionBar.newTab(), UnauthorizedCardFragment.class, args);
return;
}

if (mTransitData.getBalanceString(getResources()) != null) {
if (mTransitInfo.getBalanceString(getResources()) != null) {
mTabsAdapter.addTab(actionBar.newTab().setText(R.string.balance), CardBalanceFragment.class, args);
}

if (mTransitData.getTrips() != null || mTransitData.getRefills() != null) {
if (mTransitInfo.getTrips() != null || mTransitInfo.getRefills() != null) {
mTabsAdapter.addTab(actionBar.newTab().setText(R.string.history), CardTripsFragment.class, args);
}

if (mTransitData.getSubscriptions() != null) {
if (mTransitInfo.getSubscriptions() != null) {
mTabsAdapter.addTab(actionBar.newTab().setText(R.string.subscriptions),
CardSubscriptionsFragment.class,
args);
}

if (mTransitData.getInfo(getApplicationContext()) != null) {
if (mTransitInfo.getInfo(getApplicationContext()) != null) {
mTabsAdapter.addTab(actionBar.newTab().setText(R.string.info), CardInfoFragment.class, args);
}

if (mTabsAdapter.getCount() > 1) {
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
}

if (mTransitData.hasUnknownStations()) {
if (mTransitInfo.hasUnknownStations()) {
findViewById(R.id.need_stations).setVisibility(View.VISIBLE);
}

Expand Down
20 changes: 10 additions & 10 deletions farebot-app/src/main/java/com/codebutler/farebot/activity/SupportedCardsActivity.java
View file
Expand Up @@ -40,11 +40,11 @@

import com.codebutler.farebot.R;
import com.codebutler.farebot.card.CardType;
import com.codebutler.farebot.transit.manly_fast_ferry.ManlyFastFerryTransitData;
import com.codebutler.farebot.transit.myki.MykiTransitData;
import com.codebutler.farebot.transit.octopus.OctopusTransitData;
import com.codebutler.farebot.transit.opal.OpalTransitData;
import com.codebutler.farebot.transit.seq_go.SeqGoTransitData;
import com.codebutler.farebot.transit.manly_fast_ferry.ManlyFastFerryTransitInfo;
import com.codebutler.farebot.transit.myki.MykiTransitInfo;
import com.codebutler.farebot.transit.octopus.OctopusTransitInfo;
import com.codebutler.farebot.transit.opal.OpalTransitInfo;
import com.codebutler.farebot.transit.seq_go.SeqGoTransitInfo;

import java.util.ArrayList;

Expand Down Expand Up @@ -102,7 +102,7 @@ private class CardsAdapter extends ArrayAdapter<CardInfo> {
CardType.CEPAS
));

add(new CardInfo(R.drawable.seqgo_card, SeqGoTransitData.NAME,
add(new CardInfo(R.drawable.seqgo_card, SeqGoTransitInfo.NAME,
R.string.location_brisbane_seq_australia,
CardType.MifareClassic,
true,
Expand All @@ -120,13 +120,13 @@ private class CardsAdapter extends ArrayAdapter<CardInfo> {
CardType.FeliCa
));

add(new CardInfo(R.drawable.manly_fast_ferry_card, ManlyFastFerryTransitData.NAME,
add(new CardInfo(R.drawable.manly_fast_ferry_card, ManlyFastFerryTransitInfo.NAME,
R.string.location_sydney_australia,
CardType.MifareClassic,
true
));

add(new CardInfo(R.drawable.myki_card, MykiTransitData.NAME,
add(new CardInfo(R.drawable.myki_card, MykiTransitInfo.NAME,
R.string.location_victoria_australia,
CardType.MifareDesfire,
false,
Expand All @@ -139,12 +139,12 @@ private class CardsAdapter extends ArrayAdapter<CardInfo> {
CardType.CEPAS
));

add(new CardInfo(R.drawable.octopus_card, OctopusTransitData.OCTOPUS_NAME,
add(new CardInfo(R.drawable.octopus_card, OctopusTransitInfo.OCTOPUS_NAME,
R.string.location_hong_kong,
CardType.FeliCa
));

add(new CardInfo(R.drawable.opal_card, OpalTransitData.NAME,
add(new CardInfo(R.drawable.opal_card, OpalTransitInfo.NAME,
R.string.location_sydney_australia,
CardType.MifareDesfire
));
Expand Down
8 changes: 4 additions & 4 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/CardBalanceFragment.java
View file
Expand Up @@ -33,23 +33,23 @@
import com.codebutler.farebot.activity.CardInfoActivity;
import com.codebutler.farebot.card.Card;
import com.codebutler.farebot.core.Constants;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;

public class CardBalanceFragment extends Fragment {
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mCard = getArguments().getParcelable(Constants.EXTRA_CARD);
mTransitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
mTransitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_card_balance, container, false);
((TextView) view.findViewById(R.id.balance)).setText(mTransitData.getBalanceString(getResources()));
((TextView) view.findViewById(R.id.balance)).setText(mTransitInfo.getBalanceString(getResources()));
return view;
}
}
8 changes: 4 additions & 4 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/CardInfoFragment.java
View file
Expand Up @@ -35,24 +35,24 @@
import com.codebutler.farebot.core.Constants;
import com.codebutler.farebot.core.ui.ListItem;
import com.codebutler.farebot.core.ui.UriListItem;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;

public class CardInfoFragment extends ListFragment {
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mCard = getArguments().getParcelable(Constants.EXTRA_CARD);
mTransitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
mTransitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
}

@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);

setListAdapter(new ListItemAdapter(getActivity(), mTransitData.getInfo(getActivity())));
setListAdapter(new ListItemAdapter(getActivity(), mTransitInfo.getInfo(getActivity())));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/CardRefillsFragment.java
View file
Expand Up @@ -35,7 +35,7 @@
import com.codebutler.farebot.R;
import com.codebutler.farebot.activity.CardInfoActivity;
import com.codebutler.farebot.transit.Refill;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;

import java.text.DateFormat;
import java.util.Date;
Expand All @@ -46,8 +46,8 @@ public class CardRefillsFragment extends ListFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

TransitData transitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
setListAdapter(new RefillsListAdapter(getActivity(), transitData.getRefills()));
TransitInfo transitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
setListAdapter(new RefillsListAdapter(getActivity(), transitInfo.getRefills()));
}

private static class RefillsListAdapter extends ArrayAdapter<Refill> {
Expand Down
8 changes: 4 additions & 4 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/CardSubscriptionsFragment.java
View file
Expand Up @@ -37,26 +37,26 @@
import com.codebutler.farebot.card.Card;
import com.codebutler.farebot.core.Constants;
import com.codebutler.farebot.transit.Subscription;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;
import com.codebutler.farebot.util.Utils;

import java.util.List;

public class CardSubscriptionsFragment extends ListFragment {
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mCard = getArguments().getParcelable(Constants.EXTRA_CARD);
mTransitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
mTransitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
}

@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
setListAdapter(new SubscriptionsAdapter(getActivity(), mTransitData.getSubscriptions()));
setListAdapter(new SubscriptionsAdapter(getActivity(), mTransitInfo.getSubscriptions()));
}

private class SubscriptionsAdapter extends ArrayAdapter<Subscription> {
Expand Down
14 changes: 7 additions & 7 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/CardTripsFragment.java
View file
Expand Up @@ -47,7 +47,7 @@
import com.codebutler.farebot.core.Constants;
import com.codebutler.farebot.transit.Refill;
import com.codebutler.farebot.transit.RefillTrip;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;
import com.codebutler.farebot.transit.Trip;
import com.codebutler.farebot.transit.orca.OrcaTrip;
import com.codebutler.farebot.util.Utils;
Expand All @@ -61,29 +61,29 @@

public class CardTripsFragment extends ListFragment {
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mCard = getArguments().getParcelable(Constants.EXTRA_CARD);
mTransitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
mTransitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_card_trips, null);

List<Trip> trips = new ArrayList<>();
if (mTransitData.getTrips() != null && mTransitData.getTrips().size() > 0) {
for (Trip t : mTransitData.getTrips()) {
if (mTransitInfo.getTrips() != null && mTransitInfo.getTrips().size() > 0) {
for (Trip t : mTransitInfo.getTrips()) {
trips.add(t);
}
}

// This is for "legacy" implementations which have a separate list of refills.
if (mTransitData.getRefills() != null && mTransitData.getRefills().size() > 0) {
for (Refill r : mTransitData.getRefills()) {
if (mTransitInfo.getRefills() != null && mTransitInfo.getRefills().size() > 0) {
for (Refill r : mTransitInfo.getRefills()) {
trips.add(RefillTrip.create(r));
}
}
Expand Down
6 changes: 3 additions & 3 deletions farebot-app/src/main/java/com/codebutler/farebot/fragment/UnauthorizedCardFragment.java
View file
Expand Up @@ -33,17 +33,17 @@
import com.codebutler.farebot.activity.CardInfoActivity;
import com.codebutler.farebot.card.Card;
import com.codebutler.farebot.core.Constants;
import com.codebutler.farebot.transit.TransitData;
import com.codebutler.farebot.transit.TransitInfo;

public class UnauthorizedCardFragment extends Fragment {
private Card mCard;
private TransitData mTransitData;
private TransitInfo mTransitInfo;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mCard = getArguments().getParcelable(Constants.EXTRA_CARD);
mTransitData = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_DATA);
mTransitInfo = getArguments().getParcelable(CardInfoActivity.EXTRA_TRANSIT_INFO);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/com/codebutler/farebot/transit/bilhete_unico/BilheteUnicoSPTransitFactory.java
View file
Expand Up @@ -31,7 +31,7 @@

import java.util.Arrays;

public class BilheteUnicoSPTransitFactory implements TransitFactory<ClassicCard, BilheteUnicoSPTransitData> {
public class BilheteUnicoSPTransitFactory implements TransitFactory<ClassicCard, BilheteUnicoSPTransitInfo> {

private static final byte[] MANUFACTURER = {
(byte) 0x62,
Expand All @@ -53,13 +53,13 @@ public boolean check(@NonNull ClassicCard card) {
@NonNull
@Override
public TransitIdentity parseIdentity(@NonNull ClassicCard card) {
return TransitIdentity.create(BilheteUnicoSPTransitData.NAME, null);
return TransitIdentity.create(BilheteUnicoSPTransitInfo.NAME, null);
}

@NonNull
@Override
public BilheteUnicoSPTransitData parseData(@NonNull ClassicCard card) {
public BilheteUnicoSPTransitInfo parseInfo(@NonNull ClassicCard card) {
BilheteUnicoSPCredit credit = BilheteUnicoSPCredit.create(card.getSector(8).getBlock(1).getData().bytes());
return BilheteUnicoSPTransitData.create(credit);
return BilheteUnicoSPTransitInfo.create(credit);
}
}

0 comments on commit c4d9544

Please sign in to comment.