diff --git a/res/drawable-xxxhdpi/bus_background.xml b/res/drawable-xxxhdpi/route_background_bus.xml
similarity index 100%
rename from res/drawable-xxxhdpi/bus_background.xml
rename to res/drawable-xxxhdpi/route_background_bus.xml
diff --git a/res/drawable-xxxhdpi/metro_background.xml b/res/drawable-xxxhdpi/route_background_bus_long_distance.xml
similarity index 74%
copy from res/drawable-xxxhdpi/metro_background.xml
copy to res/drawable-xxxhdpi/route_background_bus_long_distance.xml
index ed5991b..5cf8130 100644
--- a/res/drawable-xxxhdpi/metro_background.xml
+++ b/res/drawable-xxxhdpi/route_background_bus_long_distance.xml
@@ -1,8 +1,8 @@
-
+
\ No newline at end of file
diff --git a/res/drawable-xxxhdpi/metro_background.xml b/res/drawable-xxxhdpi/route_background_metro.xml
similarity index 100%
rename from res/drawable-xxxhdpi/metro_background.xml
rename to res/drawable-xxxhdpi/route_background_metro.xml
diff --git a/res/layout-v11/activity_main.xml b/res/layout-v11/activity_main.xml
index eb891f7..393b9f6 100644
--- a/res/layout-v11/activity_main.xml
+++ b/res/layout-v11/activity_main.xml
@@ -1,190 +1,190 @@
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 6f5806c..d1192fd 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,186 +1,186 @@
\ No newline at end of file
diff --git a/res/layout/entry_bus_line_passage.xml b/res/layout/entry_bus_line_passage.xml
index 0758878..4bdf967 100644
--- a/res/layout/entry_bus_line_passage.xml
+++ b/res/layout/entry_bus_line_passage.xml
@@ -1,51 +1,51 @@
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 627eef1..85b0725 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,17 +1,18 @@
#FF9800#F57C00#2196F3#1976D2#009688#4DB6AC#80cbc4#F5F5F5#757575#FFFFFF#009688#DE0908
+ #2060DD
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index f3cdd85..264a0c9 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,779 +1,755 @@
/*
BusTO - Arrival times for Turin public transports.
Copyright (C) 2014 Valerio Bozzolan
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.NavUtils;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.melnykov.fab.FloatingActionButton;
import java.io.UnsupportedEncodingException;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
+import it.reyboz.bustorino.backend.FiveTScraperFetcher;
import it.reyboz.bustorino.backend.GTTJSONFetcher;
import it.reyboz.bustorino.backend.Palina;
-import it.reyboz.bustorino.lab.GTTSiteSucker.BusLine;
import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop;
import it.reyboz.bustorino.lab.MyDB;
import it.reyboz.bustorino.lab.adapters.AdapterBusStops;
import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions;
import it.reyboz.bustorino.middleware.AsyncArrivalsFetcherAll;
import it.reyboz.bustorino.middleware.PalinaAdapter;
public class ActivityMain extends AppCompatActivity {
/*
* Layout elements
*/
private EditText busStopSearchByIDEditText;
private EditText busStopSearchByNameEditText;
private TextView busStopNameTextView;
private ProgressBar progressBar;
private TextView howDoesItWorkTextView;
private Button hideHintButton;
private MenuItem actionHelpMenuItem;
private SwipeRefreshLayout swipeRefreshLayout;
private ListView resultsListView;
private FloatingActionButton floatingActionButton;
/*
- * @see swipeRefreshLayout
+ * Serach mode
*/
- private Handler handler = new Handler();
- private final Runnable refreshing = new Runnable() {
- public void run() {
- showSpinner(DOUBLE_SPINNER);
- asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, 0);
- }
- };
-
- /*
- * To toggle alphabetical
- */
- private static final int SEARCH_BY_ID = 1;
private static final int SEARCH_BY_NAME = 0;
- private int searchMode; // int seems more appropriate (was boolean)
+ private static final int SEARCH_BY_ID = 1;
+ private static final int SEARCH_BY_ROUTE = 2; // TODO: implement this (bug #1512948)
+ private int searchMode;
/*
* Options
*/
private final String OPTION_SHOW_LEGEND = "show_legend";
/**
* Last successfully searched bus stop ID
*/
private String lastSuccessfullySearchedBusStopID = null;
AsyncWgetBusStopSuggestions asyncWgetBusStopSuggestions;
- //AsyncWgetBusStopFromBusStopID asyncWgetBusStopFromBusStopID;
+
+ /* // useful for testing:
+ public class MockFetcher implements ArrivalsFetcher {
+ @Override
+ public Palina ReadArrivalTimesAll(String routeID, AtomicReference res) {
+ SystemClock.sleep(5000);
+ res.set(result.SERVER_ERROR);
+ return new Palina();
+ }
+ }
+ private ArrivalsFetcher[] ArrivalFetchers = {new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher()};*/
/*
- * Arrays of fetchers, tryed in this order (slightly overengineered, maybe?)
+ * Arrays of fetchers, tryed in this order
*/
- private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher()};
- int ArrivalFetchersPos; // position in the array
- private AsyncArrivalsFetcherAll AsyncArrivalsFetcherRunningInstance;
+ private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher(), new FiveTScraperFetcher()};
+ private int ArrivalFetchersPos; // position in the array (don't set it manually!)
+ private AsyncArrivalsFetcherAll AsyncArrivalsFetcherRunningInstance; // the only one that hasn't been cancelled
private SQLiteDatabase db;
-
///////////////////////////////// EVENT HANDLERS ///////////////////////////////////////////////
+ /*
+ * @see swipeRefreshLayout
+ */
+ private Handler handler = new Handler();
+ private final Runnable refreshing = new Runnable() {
+ public void run() {
+ asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, 0);
+ }
+ };
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
busStopSearchByIDEditText = (EditText) findViewById(R.id.busStopSearchByIDEditText);
busStopSearchByNameEditText = (EditText) findViewById(R.id.busStopSearchByNameEditText);
busStopNameTextView = (TextView) findViewById(R.id.busStopNameTextView);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
howDoesItWorkTextView = (TextView) findViewById(R.id.howDoesItWorkTextView);
hideHintButton = (Button) findViewById(R.id.hideHintButton);
resultsListView = (ListView) findViewById(R.id.resultsListView);
swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
floatingActionButton = (FloatingActionButton) findViewById(R.id.floatingActionButton);
if (floatingActionButton != null) {
floatingActionButton.attachToListView(resultsListView);
}
busStopSearchByIDEditText.setSelectAllOnFocus(true);
busStopSearchByIDEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
busStopSearchByNameEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
// Get database in write mode
MyDB mDbHelper = new MyDB(this);
db = mDbHelper.getWritableDatabase();
// Called when the layout is pulled down
swipeRefreshLayout
.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
handler.post(refreshing);
}
});
/**
* @author Marco Gagino!!!
*/
swipeRefreshLayout.setColorSchemeColors(R.color.blue_500, R.color.orange_500); // setColorScheme is deprecated, setColorSchemeColors isn't
setSearchModeBusStopID();
//---------------------------- START INTENT CHECK QUEUE ------------------------------------
// Intercept calls from URL intent
boolean tryedFromIntent = false;
String busStopID = null;
Uri data = getIntent().getData();
if (data != null) {
busStopID = getBusStopIDFromUri(data);
tryedFromIntent = true;
}
// Intercept calls from other activities
if (!tryedFromIntent) {
Bundle b = getIntent().getExtras();
if (b != null) {
busStopID = b.getString("bus-stop-ID");
/**
* I'm not very sure if you are coming from an Intent.
* Some launchers work in strange ways.
*/
tryedFromIntent = busStopID != null;
}
}
//---------------------------- END INTENT CHECK QUEUE --------------------------------------
if (busStopID == null) {
// Show keyboard if can't start from intent
showKeyboard();
// You haven't obtained anything... from an intent?
if (tryedFromIntent) {
// This shows a luser warning
asyncWgetBusStopFromBusStopIDReset();
}
} else {
// If you are here an intent has worked successfully
setBusStopSearchByIDEditText(busStopID);
- showSpinner();
asyncWgetBusStopFromBusStopID(busStopID, 0);
}
Log.d("MainActivity", "Created");
}
/**
* Reload bus stop timetable when it's fulled resumed from background.
*/
@Override
protected void onPostResume() {
super.onPostResume();
Log.d("ActivityMain", "onPostResume fired. Last successfully bus stop ID: " + lastSuccessfullySearchedBusStopID);
if (searchMode == SEARCH_BY_ID && lastSuccessfullySearchedBusStopID != null && lastSuccessfullySearchedBusStopID.length() != 0) {
- showSpinner();
setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStopID);
asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, 0);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
actionHelpMenuItem = menu.findItem(R.id.action_help);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
switch (item.getItemId()) {
case android.R.id.home:
// Respond to the action bar's Up/Home button
NavUtils.navigateUpFromSameTask(this);
return true;
case R.id.action_help:
showHints();
return true;
case R.id.action_favorites:
startActivity(new Intent(ActivityMain.this, ActivityFavorites.class));
return true;
case R.id.action_about:
startActivity(new Intent(ActivityMain.this, ActivityAbout.class));
return true;
case R.id.action_news:
openIceweasel("http://blog.reyboz.it/tag/busto/");
return true;
case R.id.action_bugs:
openIceweasel("https://bugs.launchpad.net/bus-torino");
return true;
case R.id.action_source:
openIceweasel("https://code.launchpad.net/bus-torino");
return true;
case R.id.action_licence:
openIceweasel("http://www.gnu.org/licenses/gpl-3.0.html");
return true;
case R.id.action_author:
openIceweasel("http://boz.reyboz.it?lovebusto");
return true;
}
return super.onOptionsItemSelected(item);
}
- ///////////////////////////////// THIS NEEDS REFACTORING ///////////////////////////////////////
+ /**
+ * OK this is pure shit
+ *
+ * @param v View clicked
+ */
+ public void onSearchClick(View v) {
+ // TODO: do we need toggleSpinner(true) here?
+ if (searchMode == SEARCH_BY_ID) {
+ String busStopID = busStopSearchByIDEditText.getText().toString();
+ asyncWgetBusStopFromBusStopID(busStopID, 0);
+ } else { // searchMode == SEARCH_BY_NAME
+ String query = busStopSearchByNameEditText.getText().toString();
+ asyncWgetBusStopSuggestions(query);
+ }
+ }
+
+ /**
+ * QR scan button clicked
+ *
+ * @param v View QRButton clicked
+ */
+ public void onQRButtonClick(View v) {
+ IntentIntegrator integrator = new IntentIntegrator(this);
+ integrator.initiateScan();
+ }
+
+ /**
+ * Receive the Barcode Scanner Intent
+ *
+ */
+ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+
+ Uri uri;
+ try {
+ uri = Uri.parse(scanResult != null ? scanResult.getContents() : null); // this apparently prevents NullPointerException. Somehow.
+ } catch (NullPointerException e) {
+ Toast.makeText(getApplicationContext(),
+ R.string.no_qrcode, Toast.LENGTH_SHORT).show();
+ return;
+ }
+
+ String busStopID = getBusStopIDFromUri(uri);
+ busStopSearchByIDEditText.setText(busStopID);
+ asyncWgetBusStopFromBusStopID(busStopID, 0);
+ }
+
+ public void onHideHint(View v) {
+ hideHints();
+ setOption(OPTION_SHOW_LEGEND, false);
+ }
+
+ public void onToggleKeyboardLayout(View v) {
+ if (searchMode == SEARCH_BY_NAME) {
+ setSearchModeBusStopID();
+ if (busStopSearchByIDEditText.requestFocus()) {
+ showKeyboard();
+ }
+ } else { // searchMode == SEARCH_BY_ID
+ setSearchModeBusStopName();
+ if (busStopSearchByNameEditText.requestFocus()) {
+ showKeyboard();
+ }
+ }
+ }
+
+ ////////////////////// STOPS FINDER BY NAME (NEEDS REFACTORING) ////////////////////////////////
/**
* It's pure magic <3
*
* @param query Part of the busStopName
*/
private void asyncWgetBusStopSuggestions(String query) {
if (query == null || query.length() == 0) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show();
- hideSpinner();
+ toggleSpinner(false);
return;
}
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
- hideSpinner();
+ toggleSpinner(false);
return;
}
if (asyncWgetBusStopSuggestions != null) {
asyncWgetBusStopSuggestions.cancel(true);
asyncWgetBusStopSuggestions = null;
}
try {
asyncWgetBusStopSuggestions = new AsyncWgetBusStopSuggestions(query) {
public void onReceivedBusStopNames(BusStop[] busStops, int status) {
- hideSpinner();
+ toggleSpinner(false);
switch (status) {
case AsyncWgetBusStopSuggestions.ERROR_EMPTY_DOM:
case AsyncWgetBusStopSuggestions.ERROR_DOM:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
break;
case AsyncWgetBusStopSuggestions.ERROR_NONE:
if (busStops.length == 0) {
Toast.makeText(getApplicationContext(),
R.string.no_bus_stop_have_this_name, Toast.LENGTH_SHORT).show();
} else {
for (BusStop busStop : busStops) {
MyDB.DBBusStop.addBusStop(db, busStop);
}
populateBusStopsLayout(busStops);
}
break;
}
}
};
} catch (UnsupportedEncodingException e) {
Toast.makeText(getApplicationContext(),
R.string.encoding_error, Toast.LENGTH_SHORT).show();
}
}
+ private void populateBusStopsLayout(BusStop[] busStops) {
+ busStopNameTextView.setVisibility(View.GONE);
+
+ hideKeyboard();
+
+ prepareGUIForBusStops();
+
+ resultsListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops));
+ resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ @Override
+ public void onItemClick(AdapterView> parent, View view, int position, long id) {
+ /**
+ * Casting because of Javamerda
+ * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
+ */
+ BusStop busStop = (BusStop) parent.getItemAtPosition(position);
+
+ Intent intent = new Intent(ActivityMain.this,
+ ActivityMain.class);
+
+ Bundle b = new Bundle();
+ b.putString("bus-stop-ID", busStop.getBusStopID());
+ intent.putExtras(b);
+ startActivity(intent);
+
+ }
+ });
+ }
+
///////////////////////////////// ARRIVALS FETCHER /////////////////////////////////////////////
/**
* Try every fetcher until you get something usable.
*
* @param busStopID the ID
* @param whichArrivalsFetcher set to 0 if you want to live (used internally by the recursion)
*/
private void asyncWgetBusStopFromBusStopID(String busStopID, int whichArrivalsFetcher) {
- // TODO: move showSpinner here
+ toggleSpinner(true);
// using a "global" variable to avoid adding parameters to AsyncArrivalsFetcherAll: the fact
// that this method uses recursion is a mere implementation detail.
this.ArrivalFetchersPos = whichArrivalsFetcher;
if(busStopID == null || busStopID.length() == 0) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
- hideSpinner();
+ toggleSpinner(false);
return;
}
// TODO: remove this once we're sure fetchers can handle this case
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
- hideSpinner();
+ toggleSpinner(false);
return;
}
if(whichArrivalsFetcher >= ArrivalFetchers.length) {
// TODO: error message (tryed every fetcher and failed)
asyncWgetBusStopFromBusStopIDReset();
- hideSpinner();
+ toggleSpinner(false);
return;
}
// cancel whatever is still running
if(AsyncArrivalsFetcherRunningInstance != null) {
// cancel() should hopefully only kill the background thread, not the one we're using for this same recursion...
AsyncArrivalsFetcherRunningInstance.cancel(true);
}
AsyncArrivalsFetcherRunningInstance = new AsyncArrivalsFetcherAll(ArrivalFetchers[whichArrivalsFetcher], busStopID, new AsyncArrivalsFetcherAllCallbackImplementation());
AsyncArrivalsFetcherRunningInstance.execute();
}
private void asyncWgetBusStopFromBusStopIDReset() {
this.ArrivalFetchersPos = 0;
if(AsyncArrivalsFetcherRunningInstance != null) {
AsyncArrivalsFetcherRunningInstance.cancel(true);
}
}
private class AsyncArrivalsFetcherAllCallbackImplementation implements AsyncArrivalsFetcherAll.AsyncArrivalsFetcherAllCallback {
public void call(Palina p, Fetcher.result res, String stopID) {
- hideSpinner(); // TODO: remove this once showSpinner() is in asyncWgetBusStopFromBusStopID()
-
switch (res) {
case CLIENT_OFFLINE:
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
- hideSpinner();
}
break; // goto recursion
- case SERVER_ERROR: // TODO: better error message for these 2 cases
- case SERVER_OFFLINE:
+ case SERVER_ERROR: // TODO: better error message for this case
case PARSER_ERROR:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
break; // goto recursion
case EMPTY_RESULT_SET:
Toast.makeText(getApplicationContext(),
R.string.no_passages, Toast.LENGTH_SHORT).show();
break; // goto recursion
case OK:
lastSuccessfullySearchedBusStopID = stopID;
hideKeyboard();
//MyDB.DBBusStop.addBusStop(db, busStop); // TODO: determine why this was needed
populateBusLinesLayout(p, stopID);
+ toggleSpinner(false); // recursion terminated, remove spinner
return; // RETURN.
}
+ // TODO: what do we do if a fetcher says no such stop/route exists? try next fetcher or give up?
// indirect recursion through a callback. ...yeha.
asyncWgetBusStopFromBusStopID(stopID, ArrivalFetchersPos+1);
}
}
private void populateBusLinesLayout(Palina p, String stopID) {
- // should be already ordered, no need for this
- //busStop.orderBusLinesByFirstArrival();
-
- // Remember last successfully searched busStopID
- //String busStopID = busStop.getBusStopID();
-
- // Retrieve passages
- //BusLine[] busLines = busStop.getBusLines();
-
-
- /*
- * asyncWgetBusStopFromBusStopID was already checking for this (now it's done in
- * AsyncArrivalsFetcherAllCallbackImplementation)!
-
- // No passages?
- if(busLines.length == 0) {
- Toast.makeText(getApplicationContext(),
- R.string.no_arrival_times, Toast.LENGTH_SHORT).show();
- return;
- }*/
-
/* TODO: determine if there was a reason to store everything in the database, other than
* showing the last timetable when "resuming" the app (which wasn't currently done, I think
* it just fetches new timetables every time)
*/
//BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID());
- String busStopNameDisplay;
// TODO: implement favorites username
- // TODO: implement bus stop name (if can be fetched)
/*if(dbBusStop != null && dbBusStop.getBusStopUsername() != null) {
busStopNameDisplay = dbBusStop.getBusStopUsername();
} else if (busStop.getBusStopName() != null) {
busStopNameDisplay = busStop.getBusStopName();
} else {
busStopNameDisplay = String.valueOf(busStopID);
}*/
- busStopNameDisplay = stopID;
busStopNameTextView.setText(String.format(
- getString(R.string.passages), busStopNameDisplay));
+ getString(R.string.passages), p.getStopName().length() == 0 ? stopID : stopID.concat(" - ").concat(p.getStopName())));
// keyboard is already hidden, at this point
// Shows hints
if(getOption(OPTION_SHOW_LEGEND, true)) {
showHints();
} else {
hideHints();
}
prepareGUIForBusLines();
resultsListView.setAdapter(new PalinaAdapter(this, p));
- resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ // TODO: do something useful on click (e.g. refresh timetables and show only that route)
+ /*resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView> parent, View view, int position, long id) {
- /**
+ *//*
* Casting because of Javamerda
* @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
- */
+ *//*
BusLine busLine = (BusLine) parent.getItemAtPosition(position);
Log.i("ActivityMain", "Tapped busLine " + busLine.toString());
}
- });
- }
-
- ///////////////////////////////// OTHER STUFF? /////////////////////////////////////////////////
- // TODO: look into this stuff, possibly move handlers together with other handlers
-
- private void populateBusStopsLayout(BusStop[] busStops) {
- busStopNameTextView.setVisibility(View.GONE);
-
- hideKeyboard();
-
- prepareGUIForBusStops();
-
- resultsListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops));
- resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- /**
- * Casting because of Javamerda
- * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
- */
- BusStop busStop = (BusStop) parent.getItemAtPosition(position);
-
- Intent intent = new Intent(ActivityMain.this,
- ActivityMain.class);
-
- Bundle b = new Bundle();
- b.putString("bus-stop-ID", busStop.getBusStopID());
- intent.putExtras(b);
- startActivity(intent);
-
- }
- });
- }
-
- /**
- * OK this is pure shit
- *
- * @param v View clicked
- */
- public void onSearchClick(View v) {
- showSpinner();
- if (searchMode == SEARCH_BY_ID) {
- String busStopID = busStopSearchByIDEditText.getText().toString();
- asyncWgetBusStopFromBusStopID(busStopID, 0);
- } else { // searchMode == SEARCH_BY_NAME
- String query = busStopSearchByNameEditText.getText().toString();
- asyncWgetBusStopSuggestions(query);
- }
+ });*/
}
- /**
- * QR scan button clocked
- *
- * @param v View QRButton clicked
- */
- public void onQRButtonClick(View v) {
- IntentIntegrator integrator = new IntentIntegrator(this);
- integrator.initiateScan();
- }
-
- /**
- * Receive the Barcode Scanner Intent
- *
- */
- public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-
- Uri uri;
- try {
- uri = Uri.parse(scanResult != null ? scanResult.getContents() : null); // this apparently prevents NullPointerException. Somehow.
- } catch (NullPointerException e) {
- Toast.makeText(getApplicationContext(),
- R.string.no_qrcode, Toast.LENGTH_SHORT).show();
- return;
- }
-
- String busStopID = getBusStopIDFromUri(uri);
- busStopSearchByIDEditText.setText(busStopID);
- showSpinner();
- asyncWgetBusStopFromBusStopID(busStopID, 0);
- }
-
- public void onHideHint(View v) {
- hideHints();
- setOption(OPTION_SHOW_LEGEND, false);
- }
-
- public void onToggleKeyboardLayout(View v) {
- if (searchMode == SEARCH_BY_NAME) {
- setSearchModeBusStopID();
- if (busStopSearchByIDEditText.requestFocus()) {
- showKeyboard();
- }
- } else { // searchMode == SEARCH_BY_ID
- setSearchModeBusStopName();
- if (busStopSearchByNameEditText.requestFocus()) {
- showKeyboard();
- }
- }
- }
+ ///////////////////////////////// OTHER STUFF //////////////////////////////////////////////////
+ // TODO: try to move these 3 methods to a separate class
public void addInFavorites(View v) {
if (lastSuccessfullySearchedBusStopID != null) {
BusStop busStop = new BusStop(lastSuccessfullySearchedBusStopID);
busStop.setIsFavorite(true);
MyDB.DBBusStop.addBusStop(db, busStop);
BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID());
if (dbBusStop == null || dbBusStop.getBusStopLocality() == null) {
// This will also scrape the busStopLocality
try {
new AsyncWgetBusStopSuggestions(busStop.getBusStopID()) {
@Override
public void onReceivedBusStopNames(BusStop[] busStops, int status) {
if (status == AsyncWgetBusStopSuggestions.ERROR_NONE) {
for (BusStop busStop : busStops) {
MyDB.DBBusStop.addBusStop(db, busStop);
}
}
}
};
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
Toast.makeText(getApplicationContext(),
R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
}
}
private void setOption(String optionName, boolean value) {
SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
editor.putBoolean(optionName, value);
editor.commit();
}
private boolean getOption(String optionName, boolean optDefault) {
SharedPreferences preferences = getPreferences(MODE_PRIVATE);
return preferences.getBoolean(optionName, optDefault);
}
+ ////////////////////////////////////// GUI HELPERS /////////////////////////////////////////////
+
private void showKeyboard() {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View view = searchMode == SEARCH_BY_ID ? busStopSearchByIDEditText : busStopSearchByNameEditText;
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
}
private void hideKeyboard() {
View view = getCurrentFocus();
if (view != null) {
((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
.hideSoftInputFromWindow(view.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
}
private void setSearchModeBusStopID() {
searchMode = SEARCH_BY_ID;
busStopSearchByNameEditText.setVisibility(View.GONE);
busStopSearchByNameEditText.setText("");
busStopSearchByIDEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.alphabetical);
}
private void setSearchModeBusStopName() {
searchMode = SEARCH_BY_NAME;
busStopSearchByIDEditText.setVisibility(View.GONE);
busStopSearchByIDEditText.setText("");
busStopSearchByNameEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.numeric);
}
/**
* Having that cursor at the left of the edit text makes me cancer.
* @param busStopID bus stop ID
*/
private void setBusStopSearchByIDEditText(String busStopID) {
busStopSearchByIDEditText.setText(busStopID);
busStopSearchByIDEditText.setSelection(busStopID.length());
}
private void showHints() {
howDoesItWorkTextView.setVisibility(View.VISIBLE);
hideHintButton.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
private void hideHints() {
howDoesItWorkTextView.setVisibility(View.GONE);
hideHintButton.setVisibility(View.GONE);
actionHelpMenuItem.setVisible(true);
}
- private final static boolean DOUBLE_SPINNER = true;
- private final static boolean NORMAL_SPINNER = false;
-
- private void showSpinner(boolean swipeSpinner) {
- if (swipeSpinner) { // swipeSpinner == DOUBLE_SPINNER
- swipeRefreshLayout.setRefreshing(true);
- } else { // NORMAL_SPINNER
+ private void toggleSpinner(boolean enable) {
+ if (enable) {
+ //swipeRefreshLayout.setRefreshing(true);
progressBar.setVisibility(View.VISIBLE);
+ } else {
+ //swipeRefreshLayout.setRefreshing(false);
+ progressBar.setVisibility(View.GONE);
}
}
- private void showSpinner() {
- showSpinner(NORMAL_SPINNER);
- }
-
- private void hideSpinner() {
- swipeRefreshLayout.setRefreshing(false);
- progressBar.setVisibility(View.INVISIBLE);
- }
-
private void prepareGUIForBusLines() {
busStopNameTextView.setVisibility(View.VISIBLE);
busStopNameTextView.setClickable(true);
swipeRefreshLayout.setEnabled(true);
swipeRefreshLayout.setVisibility(View.VISIBLE);
resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(true);
}
private void prepareGUIForBusStops() {
busStopNameTextView.setText(getString(R.string.results));
busStopNameTextView.setClickable(false);
busStopNameTextView.setVisibility(View.VISIBLE);
swipeRefreshLayout.setEnabled(false);
swipeRefreshLayout.setVisibility(View.VISIBLE);
resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
/**
* Open an URL in the default browser.
*
* @param url URL
*/
public void openIceweasel(String url) {
Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(browserIntent1);
}
+ ///////////////////// INTENT HELPER ////////////////////////////////////////////////////////////
+
/**
* Try to extract the bus stop ID from a URi
*
* @param uri The URL
* @return bus stop ID or null
*/
public static String getBusStopIDFromUri(Uri uri) {
String busStopID;
switch (uri.getHost()) {
case "m.gtt.to.it":
// http://m.gtt.to.it/m/it/arrivi.jsp?n=1254
busStopID = uri.getQueryParameter("n");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?n from: " + uri);
}
break;
case "www.gtt.to.it":
case "gtt.to.it":
// http://www.gtt.to.it/cms/percorari/arrivi?palina=1254
busStopID = uri.getQueryParameter("palina");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?palina from: " + uri);
}
break;
default:
Log.e("ActivityMain", "Unexpected intent URL: " + uri);
busStopID = null;
}
return busStopID;
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/Fetcher.java b/src/it/reyboz/bustorino/backend/Fetcher.java
index 8b9527a..4ba084b 100644
--- a/src/it/reyboz/bustorino/backend/Fetcher.java
+++ b/src/it/reyboz/bustorino/backend/Fetcher.java
@@ -1,43 +1,40 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
-import java.util.concurrent.atomic.AtomicInteger;
-
public interface Fetcher {
/**
* Status codes.
*
* OK: got a response, parsed correctly, obtained some data
* CLIENT_OFFLINE: can't connect to the internet
- * SERVER_OFFLINE: the server is down for maintenance (apparently sometimes happens to the 5T website and they put a message on the home page, that can be parsed to set this state)
* SERVER_ERROR: the server replied anything other than HTTP 200, basically
* PARSER_ERROR: the server replied something that can't be parsed, probably it's not the data we're looking for (e.g. "PHP: Fatal Error")
* EMPTY_RESULT_SET: the response is valid and indicates there are no stops\routes\"passaggi"
*/
enum result {
- OK, CLIENT_OFFLINE, SERVER_OFFLINE, SERVER_ERROR, PARSER_ERROR, EMPTY_RESULT_SET
+ OK, CLIENT_OFFLINE, SERVER_ERROR, PARSER_ERROR, EMPTY_RESULT_SET
}
// moved to AsyncFetcher since shouldn't be reused on different runs
/*
* Reading this before doing anything is a bad idea, probably.
*/
//AtomicInteger result = new AtomicInteger(resultCodes.NULL.ordinal()); // how does this even work in an interface is a mystery to me.
}
diff --git a/src/it/reyboz/bustorino/backend/FiveTNormalizer.java b/src/it/reyboz/bustorino/backend/FiveTNormalizer.java
index c07aff6..76afcfe 100644
--- a/src/it/reyboz/bustorino/backend/FiveTNormalizer.java
+++ b/src/it/reyboz/bustorino/backend/FiveTNormalizer.java
@@ -1,150 +1,153 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
/**
* Converts some weird stop IDs found on the 5T website to the form used everywhere else (including GTT website).
*
* A stop ID in normalized form is:
* - a string containing a number without leading zeros
* - a string beginning with "ST" and then a number
* - whatever the GTT website uses.
*
* A bus route ID in normalized form is:
* - a string containing a number and optionally: "B", "CS", "CD", "N", "S", "C" at the end
* - the string "METRO"
* - "ST1" or "ST2" (Star 1 and Star 2)
* - a string beginning with E, N, S or W, followed by two digits (with a leading zero)
* - "RV2", "OB1"
* - "CAN" or "FTC" (railway lines)
* - ...screw it, let's just hope all the websites and APIs return something sane as route IDs.
*
- * This class exists because Java doesn't support traits.
+ * This class exists because Java doesn't support traits.
+ *
+ * Note: this class also just became useless, as 5T now uses the same format as GTT website.
*/
public abstract class FiveTNormalizer {
- private static String FiveTNormalizeRoute(String RouteID) {
+ public static String FiveTNormalizeRoute(String RouteID) {
while (RouteID.startsWith("0")) {
RouteID = RouteID.substring(1);
}
return RouteID;
}
- private static String FiveTNormalizeStop(String StopID) {
+ public static String FiveTNormalizeStop(String StopID) {
StopID = FiveTNormalizeRoute(StopID);
// is this faster than a regex?
if (StopID.length() == 5 && StopID.startsWith("ST") && Character.isLetter(StopID.charAt(2)) && Character.isLetter(StopID.charAt(3)) && Character.isLetter(StopID.charAt(4))) {
switch (StopID) {
case "STFER":
return "8210";
case "STPAR":
return "8211";
case "STMAR":
return "8212";
case "STMAS":
return "8213";
case "STPOS":
return "8214";
case "STMGR":
return "8215";
case "STRIV":
return "8216";
case "STRAC":
return "8217";
case "STBER":
return "8218";
case "STPDA":
return "8219";
case "STDOD":
return "8220";
case "STPSU":
return "8221";
case "STVIN":
return "8222";
case "STREU":
return "8223";
case "STPNU":
return "8224";
case "STMCI":
return "8225";
case "STNIZ":
return "8226";
case "STDAN":
return "8227";
case "STCAR":
return "8228";
case "STSPE":
return "8229";
case "STLGO":
return "8230";
}
}
return StopID;
}
- private static String NormalizedToFiveT(String StopID) {
- if (StopID.startsWith("82")) {
+ public static String NormalizedToFiveT(final String StopID) {
+ if(StopID.startsWith("82") && StopID.length() == 4) {
switch (StopID) {
case "8230":
return "STLGO";
case "8229":
return "STSPE";
case "8228":
return "STCAR";
case "8227":
return "STDAN";
case "8226":
return "STNIZ";
case "8225":
return "STMCI";
case "8224":
return "STPNU";
case "8223":
return "STREU";
case "8222":
return "STVIN";
case "8221":
return "STPSU";
case "8220":
return "STDOD";
case "8219":
return "STPDA";
case "8218":
return "STBER";
case "8217":
return "STRAC";
case "8216":
return "STRIV";
case "8215":
return "STMGR";
case "8214":
return "STPOS";
case "8213":
return "STMAS";
case "8212":
return "STMAR";
case "8211":
return "STPAR";
case "8210":
return "STFER";
}
}
return StopID;
}
+
}
diff --git a/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java b/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java
new file mode 100644
index 0000000..6c37aaa
--- /dev/null
+++ b/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java
@@ -0,0 +1,195 @@
+/*
+ BusTO - Arrival times for Turin public transports.
+ Copyright (C) 2014 Valerio Bozzolan
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ */
+
+package it.reyboz.bustorino.backend;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+//import android.util.Log;
+
+/**
+ * Contains large chunks of code taken from the old GTTSiteSucker, AsyncWget and AsyncWgetBusStopFromBusStopID classes.
+ *
+ * «BusTO, because sucking happens»
+ *
+ * @author Valerio Bozzolan
+ */
+public class FiveTScraperFetcher extends FiveTNormalizer implements ArrivalsFetcher {
+ /**
+ * Execute regexes.
+ *
+ * @param needle Regex
+ * @param haystack Entire string
+ * @return Matched string
+ */
+ public static String grep(String needle, String haystack) {
+ String matched = null;
+ Matcher matcher = Pattern.compile(
+ needle).matcher(haystack);
+ if (matcher.find()) {
+ matched = matcher.group(1);
+ }
+ return matched;
+ }
+
+ /**
+ * Javammerda! Lasciami null senza suicidarti!
+ */
+ public static Integer string2Integer(String str) {
+ try {
+ return Integer.parseInt(str);
+ } catch(NumberFormatException e) {
+ return null;
+ }
+ }
+
+ private String getDOM(final String routeID, final AtomicReference res) {
+ //Log.d("asyncwget", "Catching URL in background: " + uri[0]);
+ HttpURLConnection urlConnection;
+ StringBuilder result = null;
+ try {
+ URL url = new URL("http://www.5t.torino.it/5t/trasporto/arrival-times-byline.jsp?action=getTransitsByLine&shortName=" + routeID);
+ urlConnection = (HttpURLConnection) url.openConnection();
+ } catch(IOException e) {
+ res.set(Fetcher.result.CLIENT_OFFLINE);
+ return null;
+ }
+
+ try {
+ InputStream in = new BufferedInputStream(
+ urlConnection.getInputStream());
+ BufferedReader reader = new BufferedReader(
+ new InputStreamReader(in));
+ result = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ result.append(line);
+ }
+ } catch (Exception e) {
+ //Log.e("asyncwget", e.getMessage());
+ } finally {
+ if (urlConnection != null) {
+ urlConnection.disconnect();
+ }
+ }
+
+ if (result == null) {
+ res.set(Fetcher.result.PARSER_ERROR);
+ return null;
+ }
+
+ res.set(Fetcher.result.SERVER_ERROR); // will be set to "OK" later, this is a safety net in case StringBuilder returns null, the website returns an HTTP 204 or something like that.
+ return result.toString();
+ }
+
+ @Override
+ public Palina ReadArrivalTimesAll(final String routeID, final AtomicReference res) {
+ Palina p = new Palina();
+ int routeIndex;
+
+ String responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas = getDOM(routeID, res);
+ if(responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas == null) {
+ return p;
+ }
+
+ Document doc = Jsoup.parse(responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas);
+
+ Element span = doc.select("span").first();
+ String busStopID = grep("^(.+) ", span.html());
+ if (busStopID == null) {
+ //Log.e("BusStop", "Empty busStopID from " + span.html());
+ res.set(result.EMPTY_RESULT_SET);
+ return p;
+ }
+
+ // this also appears when no stops are found, but that case has already been handled above
+ Element error = doc.select("p.errore").first();
+ if (error != null) {
+ res.set(result.SERVER_ERROR);
+ return p;
+ }
+
+ String busStopName = grep("^.+ (.+)", span.html()); // The first "dot" is the single strange space character in the middle of "39{HERE→} {←HERE}PORTA NUOVA"
+ if (busStopName == null) {
+ //Log.e("BusStop", "Empty busStopName from " + span.html());
+ res.set(result.SERVER_ERROR);
+ return p;
+ }
+ p.setStopName(busStopName.trim());
+
+ // Every table row is a busLine
+ Elements trs = doc.select("table tr");
+ for (Element tr : trs) {
+ Element line = tr.select("td.line a").first();
+ if (!line.hasText()) {
+ res.set(result.SERVER_ERROR);
+ return p;
+ }
+
+ String busLineName = line.text();
+ // this is yet another ID, that has no known use so we can safely ignore it
+// Integer busLineID = string2Integer(
+// grep(
+// "([0-9]+)$",
+// line.attr("href")
+// )
+// );
+
+ if (busLineName == null) {
+ res.set(result.SERVER_ERROR);
+ return p;
+ }
+
+ if(busLineName.equals("METRO")) {
+ routeIndex = p.addRoute(busLineName, "", Route.Type.METRO);
+ } else {
+ routeIndex = p.addRoute(busLineName, "", Route.Type.BUS);
+ }
+
+ // Every busLine have passages
+ Elements tds = tr.select("td:not(.line)");
+ for (Element td : tds) {
+ //boolean isInRealTime = td.select("i").size() > 0;
+
+ //td.select("i").remove(); // Stripping "*"
+ String time = td.text().trim();
+ if (time.equals("")) {
+ // Yes... Sometimes there is an EMPTY td ._.
+ continue;
+ }
+ p.addPassaggio(time, routeIndex);
+ }
+ }
+
+ res.set(result.OK);
+ return p;
+ }
+}
diff --git a/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java b/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
index fd4456e..4dba025 100644
--- a/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
+++ b/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
@@ -1,138 +1,178 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Scanner;
import java.util.concurrent.atomic.AtomicReference;
public class GTTJSONFetcher implements ArrivalsFetcher {
// @Override
// public Palina ReadArrivalTimesRoute(String stopID, String routeID, AtomicReference res) {
// return this.ReadArrivalTimesAll(routeID, res); // TODO: implement this when it's needed (never?)
// }
@Override @NonNull
public Palina ReadArrivalTimesAll(String routeID, AtomicReference res) {
URL url;
Palina p = new Palina();
+ String routename;
+ String bacino;
JSONArray json;
int howManyRoutes, howManyPassaggi, i, j, pos; // il misto inglese-italiano è un po' ridicolo ma tanto vale...
JSONObject thisroute;
JSONArray passaggi;
try {
url = new URL("http://www.gtt.to.it/cms/index.php?option=com_gtt&task=palina.getTransiti&palina=" + routeID + "&realtime=true");
} catch (MalformedURLException e) {
res.set(result.PARSER_ERROR);
return p;
}
json = queryURL(url, res);
if(json == null) {
return p;
}
howManyRoutes = json.length();
if(howManyRoutes == 0) {
res.set(result.EMPTY_RESULT_SET);
return p;
}
try {
for(i = 0; i < howManyRoutes; i++) {
thisroute = json.getJSONObject(i);
- pos = p.addRoute(thisroute.getString("Linea"), thisroute.getString("Direzione"));
+ routename = thisroute.getString("Linea");
+ try {
+ bacino = thisroute.getString("Bacino");
+ } catch (JSONException ignored) { // if "Bacino" gets removed...
+ bacino = "U";
+ }
+
+ pos = p.addRoute(routename, thisroute.getString("Direzione"), decodeType(routename, bacino));
+
+ /*
+ * Okay, this is just absurd.
+ * The underground always has 4 non-real-time timetable entries; however, the first
+ * two are old\stale\bogus, as they're in the past. The other two are exactly the
+ * same ones that appear on the screens in the stations.
+ */
+ if(routename.equals("METRO")) {
+ j = 2;
+ } else {
+ j = 0;
+ }
passaggi = thisroute.getJSONArray("PassaggiRT");
howManyPassaggi = passaggi.length();
- for(j = 0; j < howManyPassaggi; j++) {
+ for(; j < howManyPassaggi; j++) {
p.addPassaggio(passaggi.getString(j).concat("*"), pos);
}
passaggi = thisroute.getJSONArray("Passaggi"); // now the non-real-time ones
howManyPassaggi = passaggi.length();
- for(j = 0; j < howManyPassaggi; j++) {
+ for(; j < howManyPassaggi; j++) {
p.addPassaggio(passaggi.getString(j), pos);
}
}
} catch (JSONException e) {
res.set(result.PARSER_ERROR);
return p;
}
res.set(result.OK);
return p;
}
@Nullable
private JSONArray queryURL(URL url, AtomicReference res) {
HttpURLConnection urlConnection;
InputStream in = null;
JSONArray json;
try {
urlConnection = (HttpURLConnection) url.openConnection();
} catch(IOException e) {
- res.set(result.SERVER_OFFLINE); // TODO: can we assume this is CLIENT_OFFLINE?
+ res.set(result.SERVER_ERROR); // TODO: can we assume this is CLIENT_OFFLINE?
return null;
}
try {
in = urlConnection.getInputStream();
json = new JSONArray(streamToString(in));
} catch (Exception e) {
res.set(result.PARSER_ERROR);
return null;
} finally {
try {
if (in != null) {in.close();} // this is getting ureadable quite fast.
} catch(Exception ignored) {}
urlConnection.disconnect();
}
try {
// returns [{"PassaggiRT":[],"Passaggi":[]}] for non existing stops!
json.getJSONObject(0).getString("Linea"); // if we can get this, then there's something useful in the array.
} catch(JSONException e) {
res.set(result.EMPTY_RESULT_SET);
return null;
}
return json;
}
// https://stackoverflow.com/a/5445161
private static String streamToString(InputStream is) {
- Scanner s = new Scanner(is, "UTF-8").useDelimiter("\\A");;
+ Scanner s = new Scanner(is, "UTF-8").useDelimiter("\\A");
return s.hasNext() ? s.next() : "";
}
+ private static Route.Type decodeType(final String routename, final String bacino) {
+ if(routename.equals("METRO")) {
+ return Route.Type.METRO;
+ }
+
+ switch (bacino) {
+ case "U":
+ return Route.Type.BUS;
+ case "F":
+ return Route.Type.RAILWAY;
+ case "E":
+ return Route.Type.LONG_DISTANCE_BUS;
+ default:
+ return Route.Type.BUS;
+ }
+
+
+ }
+
}
diff --git a/src/it/reyboz/bustorino/backend/Palina.java b/src/it/reyboz/bustorino/backend/Palina.java
index 65920a3..324d1ab 100644
--- a/src/it/reyboz/bustorino/backend/Palina.java
+++ b/src/it/reyboz/bustorino/backend/Palina.java
@@ -1,218 +1,221 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
import java.util.List;
import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Iterator;
/**
- * Timetable for multiple routes.
- *
- * Apparently "palina" and a bunch of other terms can't really be translated into English.
+ * Timetable for multiple routes.
+ *
+ * Apparently "palina" and a bunch of other terms can't really be translated into English.
* Not in a way that makes sense and keeps the code readable, at least.
*/
public class Palina {
- private ArrayList routes;
+ //private final String stopID;
+ private String stopName = "";
+ private ArrayList routes = new ArrayList<>();
- public Palina() {
- this.routes = new ArrayList<>();
+// public Palina(String stopID) {
+// this.stopID = stopID;
+// }
+
+ public final void setStopName(String name) {
+ this.stopName = name;
+ }
+
+ public final String getStopName() {
+ return stopName;
}
/**
* Adds a route to the timetable.
*
* @param routeID name
+ * @param type bus, underground, railway, ...
* @param destinazione end of line\terminus (underground stations have the same ID for both directions)
* @return array index for this route
- * @see RouteInternal
*/
- public int addRoute(String routeID, String destinazione) {
- this.routes.add(new RouteInternal(routeID, destinazione));
+ public int addRoute(String routeID, String destinazione, Route.Type type) {
+ this.routes.add(new Route(routeID, destinazione, type, new ArrayList(6)));
return this.routes.size() - 1; // last inserted element and pray that direct access to ArrayList elements really is direct
}
/**
* Adds a timetable entry to a route.
*
* @param TimeGTT time in GTT format (e.g. "11:22*")
* @param arrayIndex position in the array for this route (returned by addRoute)
*/
public void addPassaggio(String TimeGTT, int arrayIndex) {
this.routes.get(arrayIndex).addPassaggio(TimeGTT);
}
- /**
- * Clears a route timetable (or creates an empty route) and returns its index
- *
- * @param routeID name
- * @param destinazione end of line\terminus
- * @return array index for this route
- */
- public int updateRoute(String routeID, String destinazione) {
- int s = this.routes.size();
- RouteInternal r;
-
- for(int i = 0; i < s; i++) {
- r = routes.get(i);
- if(r.name.compareTo(routeID) == 0 && r.destinazione.compareTo(destinazione) == 0) {
- // TODO: capire se è possibile che ci siano stessa linea e stessa destinazione su 2 righe diverse del sito e qui una sovrascrive l'altra (probabilmente no)
- r.updateFlag();
- r.deletePassaggio();
- return i;
- }
- }
-
- return this.addRoute(routeID, destinazione);
- }
-
- /**
- * Deletes routes marked as "not updated" (= disappeared from the GTT website\API\whatever).
- * Sets all remaining routes to "not updated" because that's how this contraption works.
- */
- public void finishUpdatingRoutes() {
- RouteInternal r;
-
- for(Iterator itr = this.routes.iterator(); itr.hasNext(); ) {
- r = itr.next();
- if(r.unupdateFlag()) {
- itr.remove();
- }
- }
- }
+// /**
+// * Clears a route timetable (or creates an empty route) and returns its index
+// *
+// * @param routeID name
+// * @param destinazione end of line\terminus
+// * @return array index for this route
+// */
+// public int updateRoute(String routeID, String destinazione) {
+// int s = this.routes.size();
+// RouteInternal r;
+//
+// for(int i = 0; i < s; i++) {
+// r = routes.get(i);
+// if(r.name.compareTo(routeID) == 0 && r.destinazione.compareTo(destinazione) == 0) {
+// // capire se è possibile che ci siano stessa linea e stessa destinazione su 2 righe diverse del sito e qui una sovrascrive l'altra (probabilmente no)
+// r.updateFlag();
+// r.deletePassaggio();
+// return i;
+// }
+// }
+//
+// return this.addRoute(routeID, destinazione);
+// }
+//
+// /**
+// * Deletes routes marked as "not updated" (= disappeared from the GTT website\API\whatever).
+// * Sets all remaining routes to "not updated" because that's how this contraption works.
+// */
+// public void finishUpdatingRoutes() {
+// RouteInternal r;
+//
+// for(Iterator itr = this.routes.iterator(); itr.hasNext(); ) {
+// r = itr.next();
+// if(r.unupdateFlag()) {
+// itr.remove();
+// }
+// }
+// }
/**
* Gets the current timetable for a route. Returns null if the route doesn't exist.
* This is slower than queryRouteByIndex.
*
* @return timetable (passaggi)
*/
public List queryRoute(String routeID) {
- for(RouteInternal route : this.routes) {
- if(routeID.equals(route.name)) {
- return route.getPassaggi();
+ for(Route r : this.routes) {
+ if(routeID.equals(r.name)) {
+ return r.getPassaggi();
}
}
return null;
}
/**
* Gets the current timetable for this route, from its index in the array.
*
* @return timetable (passaggi)
*/
public List queryRouteByIndex(int index) {
return this.routes.get(index).getPassaggi();
}
- // TODO: ponder on the usefulness/uselessness of having separate Route and RouteInternal classes just for this method
/**
- * Gets timetables for every route.
+ * Gets every route and its timetable.
*
* @return routes and timetables.
*/
public List queryAllRoutes() {
- List list = new LinkedList<>();
- for(RouteInternal r : this.routes) {
- list.add(new Route(r.name, r.destinazione, r.passaggi));
- }
- return list;
+ return this.routes;
}
- /**
- * Route with terminus (destinazione) and timetables (passaggi), internal implementation.
- *
- * Contains mostly the same data as the Route public class, but methods are quite different and extending Route doesn't really work, here.
- */
- private final class RouteInternal {
- public final String name;
- public final String destinazione;
- private boolean updated;
- private List passaggi; // TODO: capire se con "final" si intende che copia la lista ogni volta che la modifico, o che non modifico la reference ma la lista è modificabile
-
- /**
- * Creates a new route and marks it as "updated", since it's new.
- *
- * @param routeID name
- * @param destinazione end of line\terminus
- */
- public RouteInternal(String routeID, String destinazione) {
- this.name = routeID;
- this.destinazione = destinazione;
- this.passaggi = new LinkedList<>();
- this.updated = true;
- }
-
- /**
- * Adds a time (passaggio) to the timetable for this route
- *
- * @param TimeGTT time in GTT format (e.g. "11:22*")
- */
- public void addPassaggio(String TimeGTT) {
- this.passaggi.add(new Passaggio(TimeGTT));
- }
-
- /**
- * Deletes al times (passaggi) from the timetable.
- */
- public void deletePassaggio() {
- this.passaggi = new LinkedList<>();
- this.updated = true;
- }
-
- /**
- * Sets the "updated" flag to false.
- *
- * @return previous state
- */
- public boolean unupdateFlag() {
- if(this.updated) {
- this.updated = false;
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * Sets the "updated" flag to true.
- *
- * @return previous state
- */
- public boolean updateFlag() {
- if(this.updated) {
- return true;
- } else {
- this.updated = true;
- return false;
- }
- }
-
- /**
- * Exactly what it says on the tin.
- *
- * @return times from the timetable
- */
- public List getPassaggi() {
- return this.passaggi;
- }
- }
+// /**
+// * Route with terminus (destinazione) and timetables (passaggi), internal implementation.
+// *
+// * Contains mostly the same data as the Route public class, but methods are quite different and extending Route doesn't really work, here.
+// */
+// private final class RouteInternal {
+// public final String name;
+// public final String destinazione;
+// private boolean updated;
+// private List passaggi;
+//
+// /**
+// * Creates a new route and marks it as "updated", since it's new.
+// *
+// * @param routeID name
+// * @param destinazione end of line\terminus
+// */
+// public RouteInternal(String routeID, String destinazione) {
+// this.name = routeID;
+// this.destinazione = destinazione;
+// this.passaggi = new LinkedList<>();
+// this.updated = true;
+// }
+//
+// /**
+// * Adds a time (passaggio) to the timetable for this route
+// *
+// * @param TimeGTT time in GTT format (e.g. "11:22*")
+// */
+// public void addPassaggio(String TimeGTT) {
+// this.passaggi.add(new Passaggio(TimeGTT));
+// }
+//
+// /**
+// * Deletes al times (passaggi) from the timetable.
+// */
+// public void deletePassaggio() {
+// this.passaggi = new LinkedList<>();
+// this.updated = true;
+// }
+//
+// /**
+// * Sets the "updated" flag to false.
+// *
+// * @return previous state
+// */
+// public boolean unupdateFlag() {
+// if(this.updated) {
+// this.updated = false;
+// return true;
+// } else {
+// return false;
+// }
+// }
+//
+// /**
+// * Sets the "updated" flag to true.
+// *
+// * @return previous state
+// */
+// public boolean updateFlag() {
+// if(this.updated) {
+// return true;
+// } else {
+// this.updated = true;
+// return false;
+// }
+// }
+//
+// /**
+// * Exactly what it says on the tin.
+// *
+// * @return times from the timetable
+// */
+// public List getPassaggi() {
+// return this.passaggi;
+// }
+// }
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/Route.java b/src/it/reyboz/bustorino/backend/Route.java
index fa43ba1..bc56a03 100644
--- a/src/it/reyboz/bustorino/backend/Route.java
+++ b/src/it/reyboz/bustorino/backend/Route.java
@@ -1,33 +1,65 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
import java.util.List;
public class Route {
public final String name;
public final String destinazione;
public final List passaggi;
+ public final Type type;
+ public enum Type { // "long distance" sono gli extraurbani.
+ BUS, LONG_DISTANCE_BUS, METRO, RAILWAY, TRAM
+ }
- public Route(String name, String destinazione, List passaggi) {
+ /**
+ * Constructor.
+ *
+ * @param name route ID
+ * @param destinazione terminus\end of line
+ * @param type bus, long distance bus, underground, and so on
+ * @param passaggi timetable, a good choice is an ArrayList of size 6
+ * @see Palina Palina.addRoute() method
+ */
+ public Route(String name, String destinazione, Type type, List passaggi) {
this.name = name;
this.destinazione = destinazione;
this.passaggi = passaggi;
+ this.type = type;
+ }
+
+ /**
+ * Exactly what it says on the tin.
+ *
+ * @return times from the timetable
+ */
+ public List getPassaggi() {
+ return this.passaggi;
}
+
+ /**
+ * Adds a time (passaggio) to the timetable for this route
+ *
+ * @param TimeGTT time in GTT format (e.g. "11:22*")
+ */
+ public void addPassaggio(String TimeGTT) {
+ this.passaggi.add(new Passaggio(TimeGTT));
+ }
}
diff --git a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
index 81843b8..20c767e 100644
--- a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
+++ b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
@@ -1,63 +1,63 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.middleware;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
import it.reyboz.bustorino.backend.Palina;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import java.util.concurrent.atomic.AtomicReference;
public class AsyncArrivalsFetcherAll extends AsyncTask {
private final ArrivalsFetcher af;
private AtomicReference result;
private final String stopID;
private final AsyncArrivalsFetcherAllCallback callback;
public AsyncArrivalsFetcherAll(@NonNull ArrivalsFetcher af, @NonNull String stopID, @NonNull AsyncArrivalsFetcherAllCallback callback) {
this.af = af;
this.stopID = stopID;
this.callback = callback;
this.result = new AtomicReference<>();
}
@Override protected Palina doInBackground(Void... useless) {
- return af.ReadArrivalTimesAll(this.stopID, this.result); // TODO: reuse the same Palina object and update it
+ return af.ReadArrivalTimesAll(this.stopID, this.result);
}
@Override protected void onPostExecute(Palina p) {
if(!this.isCancelled()) { // is this really needed?
this.callback.call(p, result.get(), this.stopID);
}
}
/**
* Android doesn't really support JDK 8, so we have to use this hack\workaround.
*
* I've already tested 4 different solutions, this is the cleanest-looking so far...
*
* The only purpose of this interface is to glue together the AsyncArrivalsFetcherAll and whatver ActivityMain needs to do after obraining results, change parameters liberally if needed.
*/
public interface AsyncArrivalsFetcherAllCallback {
void call(Palina p, Fetcher.result res, String stopID);
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java
index 4abf7c3..2e998f3 100644
--- a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java
+++ b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java
@@ -1,135 +1,138 @@
/*
- BusTO - Arrival times for Turin public transports.
- Copyright (C) 2014 Valerio Bozzolan
+ BusTO (backend components)
+ Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.middleware;
import android.content.Context;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
import java.util.List;
import it.reyboz.bustorino.R;
import it.reyboz.bustorino.backend.Palina;
import it.reyboz.bustorino.backend.Passaggio;
import it.reyboz.bustorino.backend.Route;
/**
* This once was a ListView Adapter for BusLine[].
*
* Thanks to Framentos developers for the guide:
* http://www.framentos.com/en/android-tutorial/2012/07/16/listview-in-android-using-custom-listadapter-and-viewcache/#
*
* @author Valerio Bozzolan
* @author Ludovico Pavesi
*/
public class PalinaAdapter extends ArrayAdapter {
private LayoutInflater li;
private static int row_layout = R.layout.entry_bus_line_passage;
- private static final int metroBg = R.drawable.metro_background;
+ private static final int metroBg = R.drawable.route_background_metro;
+ private static final int extraurbanoBg = R.drawable.route_background_bus_long_distance;
private static final int busIcon = R.drawable.bus;
- private static final int subwayIcon = R.drawable.subway;
- //private static final int tramIcon = R.drawable.tram;
+ private static final int trainIcon = R.drawable.subway;
+ private static final int tramIcon = R.drawable.tram;
//private static final int cityIcon = R.drawable.city;
// hey look, a pattern!
static class ViewHolder {
TextView rowStopIcon;
TextView rowRouteDestination;
TextView rowRouteTimetable;
}
public PalinaAdapter(Context context, Palina p) {
// TODO: find a more efficient way if there's one
super(context, row_layout, p.queryAllRoutes());
li = LayoutInflater.from(context);
}
/**
* Some parts taken from the AdapterBusLines class.
* Some parts inspired by these enlightening tutorials:
* http://www.simplesoft.it/android/guida-agli-adapter-e-le-listview-in-android.html
* https://www.codeofaninja.com/2013/09/android-viewholder-pattern-example.html
* And some other bits and bobs TIRATI FUORI DAL NULLA CON L'INTUIZIONE INTELLETTUALE PERCHÉ
* SEMBRA CHE NESSUNO ABBIA LA MINIMA IDEA DI COME FUNZIONA UN ADAPTER SU ANDROID.
*/
@Override
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder vh;
// TODO: determine why this is called twice with null and twice with a convertView, to display 2 rows.
if(convertView == null) {
// INFLATE!
// setting a parent here is not supported and causes a fatal exception, apparently.
convertView = li.inflate(row_layout, null);
// STORE TEXTVIEWS!
vh = new ViewHolder();
vh.rowStopIcon = (TextView) convertView.findViewById(R.id.routeID);
vh.rowRouteDestination = (TextView) convertView.findViewById(R.id.routeDestination);
vh.rowRouteTimetable = (TextView) convertView.findViewById(R.id.routeTimetable);
// STORE VIEWHOLDER IN\ON\OVER\UNDER\ABOVE\BESIDE THE VIEW!
convertView.setTag(vh);
} else {
// RECOVER THIS STUFF!
vh = (ViewHolder) convertView.getTag();
}
Route route = getItem(position);
+ vh.rowStopIcon.setText(route.name);
vh.rowRouteDestination.setText(route.destinazione);
- // TODO: decide if we really need\want this
- switch(route.name) {
- case "METRO":
- vh.rowStopIcon.setText("M1"); // "METRO" gets split in 2 lines
- vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(subwayIcon, 0, 0, 0);
- /* not really needed, but we're already taking the performance penality of running this
- * switch for every route. Replacing "METRO" with "M1" should probably be done in another
- * "normalizer" class.
- */
+ switch (route.type) {
+ case BUS:
+ default:
+ vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+ break;
+ case LONG_DISTANCE_BUS:
+ vh.rowStopIcon.setBackgroundResource(extraurbanoBg);
+ vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+ break;
+ case METRO:
+ vh.rowStopIcon.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
vh.rowStopIcon.setBackgroundResource(metroBg);
+ vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
break;
- case "FTC":
- case "CAN":
- vh.rowStopIcon.setText(route.name);
- vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(subwayIcon, 0, 0, 0);
+ case RAILWAY:
+ vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
break;
- default:
- vh.rowStopIcon.setText(route.name);
- vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+ case TRAM: // never used but whatever.
+ vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
break;
}
List passaggi = route.passaggi;
if(passaggi.size() == 0) {
vh.rowRouteTimetable.setText(R.string.no_passages);
} else {
String resultString = "";
for(Passaggio passaggio : passaggi) {
// "+" calls concat() and some other stuff internally, this should be faster
resultString = resultString.concat(passaggio.toString()).concat(" ");
}
vh.rowRouteTimetable.setText(resultString);
}
return convertView;
}
}