diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 896ab49..722ba68 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,80 +1,82 @@ Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy. Cerca QR Code Numero fermata Nome fermata Inserisci il numero della fermata Inserisci il nome della fermata Alcuni caratteri non sono stati riconosciuti Verifica l\'accesso ad Internet! Nessun arrivo previsto per questa fermata Sembra che nessuna fermata abbia questo nome Errore di lettura del sito 5T/GTT (dannato sito!) Fermata: %1$s Linee: %1$s Scegli la fermata… Nessun passaggio Nessun QR code Preferiti Aiuto Informazioni Più informazioni News Invia bug Codice sorgente Licenza Incontra l\'autore Fermata aggiunta ai preferiti Preferiti Tocca il nome di una fermata per aggiungerla in questa lista Rimuovi Rinomina Rinomina fermata Reset Informazioni Tocca il nome della fermata per aggiungerla ai preferiti\n\nCome leggere gli orari:\n   12:56* Orario in tempo reale\n   12:56   Orario programmato\n\nTrascina giù per aggiornare l\'orario. OK ! Benvenuto!

Grazie per aver scelto BusTO, un\'app \"politicamente\" indipendente da GTT/5T, per spostarsi a Torino attraverso software libero:

Perchè usare BusTO?

- Non sei monitorato
- Non ci sono pubblicità
- La tua privacy è al sicuro
- Inoltre l\'app è molto leggera!

Come Funziona?

Quest\'app ottiene i passaggi dei bus in tempo reale filtrando i dati forniti pubblicamente sul sito www.5t.torino.it «per uso personale».

Ingredienti:
- Valerio Bozzolan sviluppatore principale.
- Marco Gagino intenso collaboratore, creatore dell\'icona, responsabile della grafica.
- Paolo Alloatti per l\'idea dell\'icona.
- JSoup libreria per "web scaping".
- makovkastar bottone fluttuante.
- Google icone Material Design.
- Tutti i contributori!

Licenze

L\'app e il relativo codice sorgente sono distribuiti sotto la licenza GNU General Public License v3+. Ciò significa che puoi usare, studiare, migliorare e ricondividere quest\'app con qualunque mezzo e per qualsiasi scopo: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan.

Note

Quest\'applicazione è rilasciata nella speranza che sia utile a tutti ma senza NESSUNA garanzia.

Buon utilizzo! :)

]]>
Nome troppo corto, digita più caratteri e riprova + %1$s verso %2$s + %s (destinazione sconosciuta)
diff --git a/res/values/strings.xml b/res/values/strings.xml index a173f75..d7f8809 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,79 +1,81 @@ BusTO Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy. Search Scan QR Code Bus stop number Bus stop name Insert bus stop number Insert bus stop name + %1$s towards %2$s + %s (unknown destination) Sorry but you are using not allowed characters Verify the state of your Internet connection! No bus is supposed to arrive at this stop Seems that no bus stop have this name Error parsing the 5T/GTT website (damn site!) Name too short, type more characters and retry Arrivals at: %1$s Choose the bus stop… Lines: %1$s No passages No QR code Favorites Help About More about News releases Bug submission Source code Licence Meet the author Bus stop is now in your favorites Favorites Press on a bus stop name to populate this list Delete Rename Rename the bus stop Reset About Tap the bus stop name to add it to the favourites\n\nHow to read timelines:\n   12:56* Real time arrival\n   12:56   Scheduled time of arrival\n\nPull down to refresh the timetable GOT IT! Welcome!

Thanks for using BusTO, a "politically" independent app useful to move around Torino using a Free/Libre software.

Why using this app?

- You\'ll never be tracked
- You\'ll never see boring ads
- We\'ll always respect your privacy
- Moreover, it\'s lightweight!

How does it work?

This app will show you the timetable of the buses using the information published on the site www.5t.torino.it.

Who worked on BusTO:
- Valerio Bozzolan main developer.
- Marco Gagino main contributor and icon creator.
- Paolo Alloatti original concept of the icon.
- JSoup web scraper library.
- makovkastar floating buttons.
- Google Material Design icons.
- All the contributors!

Licenses

The app and the related source code are released by Valerio Bozzolan under the terms of the GNU General Public License v3+). So everyone is allowed to use, to study, to improve and to share this app by any kind of means and for any purpose: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.

Notes

This app has been developed hoping to be useful to everyone but without ANY warranty.

This translation is kindly provided by Riccardo Caniato and Marco Gagino.

Get involved! :)

]]>
diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index 2d555ba..e498b3c 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,829 +1,837 @@ /* 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.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; import android.os.AsyncTask; 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 java.util.List; import it.reyboz.bustorino.backend.ArrivalsFetcher; import it.reyboz.bustorino.backend.Fetcher; +import it.reyboz.bustorino.backend.FiveTNormalizer; import it.reyboz.bustorino.backend.FiveTScraperFetcher; import it.reyboz.bustorino.backend.FiveTStopsFetcher; import it.reyboz.bustorino.backend.GTTJSONFetcher; import it.reyboz.bustorino.backend.GTTStopsFetcher; import it.reyboz.bustorino.backend.Palina; +import it.reyboz.bustorino.backend.Route; import it.reyboz.bustorino.backend.Stop; import it.reyboz.bustorino.backend.StopsFinderByName; import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; import it.reyboz.bustorino.lab.MyDB; import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions; import it.reyboz.bustorino.middleware.AsyncArrivalsFetcherAll; import it.reyboz.bustorino.middleware.AsyncStopsFinderByName; import it.reyboz.bustorino.middleware.PalinaAdapter; import it.reyboz.bustorino.middleware.StopAdapter; public class ActivityMain extends AppCompatActivity { private class RecursionHelper { private int pos = 0; public AsyncTask RunningInstance = null; // the only one that hasn't been cancelled public void reset() { this.pos = 0; if(RunningInstance != null) { RunningInstance.cancel(true); } } public void increment() { pos++; } public int getPos() { return pos; } } /* * 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; /* * Serach mode */ private static final int SEARCH_BY_NAME = 0; 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; /* // 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()};*/ /* * I tried to wrap everything in a class and it didn't work right no matter what. * Or it kinda worked, but accessing things became very ugly, especially if you wanted to * hide the internal structure of the class. * At least I've managed to shoehorn two variables and a method in there, the array will stay * outside. * * I don't know if I should be surprised that handling recursion the C way looks a lot cleaner * than wrapping and extending and implementing everything the Java way. */ private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher(), new FiveTScraperFetcher()}; private RecursionHelper ArrivalFetchersRecursionHelper = new RecursionHelper(); private StopsFinderByName[] StopsFindersByName = {new GTTStopsFetcher(), new FiveTStopsFetcher()}; private RecursionHelper StopsFindersByNameRecursionHelper = new RecursionHelper(); private SQLiteDatabase db; ///////////////////////////////// EVENT HANDLERS /////////////////////////////////////////////// /* * @see swipeRefreshLayout */ private Handler handler = new Handler(); private final Runnable refreshing = new Runnable() { public void run() { asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, true); } }; @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 // TODO: did I accidentally remove the warning? ArrivalFetchersRecursionHelper.reset(); } } else { // If you are here an intent has worked successfully setBusStopSearchByIDEditText(busStopID); asyncWgetBusStopFromBusStopID(busStopID, true); } 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) { setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStopID); asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, true); } } @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); } /** * 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, true); } else { // searchMode == SEARCH_BY_NAME String query = busStopSearchByNameEditText.getText().toString(); asyncWgetBusStopSuggestions(query, true); } } /** * 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, true); } 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 ///////////////////////////////////////// /** * See the other asyncWget method for documentation\comments. */ private void asyncWgetBusStopSuggestions(String query, boolean reset) { toggleSpinner(true); // TODO: remove whatever else is starting the spinner before this if(reset) { StopsFindersByNameRecursionHelper.reset(); } if(query == null || query.length() == 0) { Toast.makeText(getApplicationContext(), R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show(); toggleSpinner(false); return; } // TODO: implement offline search (it's possibile.) // if (!NetworkTools.isConnected(getApplicationContext())) { // NetworkTools.showNetworkError(getApplicationContext()); // toggleSpinner(false); // return; // } if(StopsFindersByNameRecursionHelper.getPos() >= StopsFindersByName.length) { // TODO: error message (tryed every fetcher and failed) StopsFindersByNameRecursionHelper.reset(); toggleSpinner(false); return; } if(StopsFindersByNameRecursionHelper.RunningInstance != null) { StopsFindersByNameRecursionHelper.RunningInstance.cancel(true); } StopsFindersByNameRecursionHelper.RunningInstance = new AsyncStopsFinderByName(StopsFindersByName[StopsFindersByNameRecursionHelper.getPos()], query, new AsyncStopsFinderByNameCallbackImplementation()).execute(); } private class AsyncStopsFinderByNameCallbackImplementation implements AsyncStopsFinderByName.AsyncStopsFinderByNameCallback { public void call(List stops, Fetcher.result res, String query) { toggleSpinner(false); switch (res) { case CLIENT_OFFLINE: Toast.makeText(getApplicationContext(), R.string.network_error, Toast.LENGTH_SHORT).show(); break; // goto recursion case SERVER_ERROR: if(isConnected()) { // TODO: better error message for this case Toast.makeText(getApplicationContext(), R.string.parsing_error, Toast.LENGTH_SHORT).show(); } else { Toast.makeText(getApplicationContext(), R.string.network_error, Toast.LENGTH_SHORT).show(); } break; case PARSER_ERROR: Toast.makeText(getApplicationContext(), R.string.parsing_error, Toast.LENGTH_SHORT).show(); break; // goto recursion case QUERY_TOO_SHORT: Toast.makeText(getApplicationContext(), R.string.query_too_short, Toast.LENGTH_SHORT).show(); break; case EMPTY_RESULT_SET: Toast.makeText(getApplicationContext(), R.string.no_bus_stop_have_this_name, Toast.LENGTH_SHORT).show(); break; // goto recursion case OK: //for (BusStop busStop : busStops) { // MyDB.DBBusStop.addBusStop(db, busStop); //} populateBusStopsLayout(stops); toggleSpinner(false); // recursion terminated, remove spinner return; // RETURN. } StopsFindersByNameRecursionHelper.increment(); asyncWgetBusStopSuggestions(query, false); } } private void populateBusStopsLayout(List busStops) { hideKeyboard(); busStopNameTextView.setVisibility(View.GONE); prepareGUIForBusStops(); resultsListView.setAdapter(new StopAdapter(this, 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 */ Stop busStop = (Stop) parent.getItemAtPosition(position); Intent intent = new Intent(ActivityMain.this, ActivityMain.class); Bundle b = new Bundle(); b.putString("bus-stop-ID", busStop.ID); intent.putExtras(b); startActivity(intent); } }); } ///////////////////////////////// ARRIVALS FETCHER ///////////////////////////////////////////// /** * Try every fetcher until you get something usable. * * @param busStopID the ID * @param reset set to true if you want to live (set to false during recursion) */ private void asyncWgetBusStopFromBusStopID(String busStopID, boolean reset) { toggleSpinner(true); if(reset) { ArrivalFetchersRecursionHelper.reset(); } if(busStopID == null || busStopID.length() == 0) { // TODO: this should be run only on first recursive call Toast.makeText(getApplicationContext(), R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); toggleSpinner(false); return; } if(ArrivalFetchersRecursionHelper.getPos() >= ArrivalFetchers.length) { // TODO: error message (tryed every fetcher and failed) ArrivalFetchersRecursionHelper.reset(); toggleSpinner(false); return; } // cancel whatever is still running if(ArrivalFetchersRecursionHelper.RunningInstance != null) { // cancel() should hopefully only kill the background thread, not the one we're using for this same recursion... ArrivalFetchersRecursionHelper.RunningInstance.cancel(true); } // create new task, run it, store the running instance. Don't try to reorder these calls even though it's unreadable, trust me. ArrivalFetchersRecursionHelper.RunningInstance = new AsyncArrivalsFetcherAll(ArrivalFetchers[ArrivalFetchersRecursionHelper.getPos()], busStopID, new AsyncArrivalsFetcherAllCallbackImplementation()).execute(); } private class AsyncArrivalsFetcherAllCallbackImplementation implements AsyncArrivalsFetcherAll.AsyncArrivalsFetcherAllCallback { public void call(Palina p, Fetcher.result res, String stopID) { switch (res) { case CLIENT_OFFLINE: Toast.makeText(getApplicationContext(), R.string.network_error, Toast.LENGTH_SHORT).show(); break; // goto recursion case SERVER_ERROR: if(isConnected()) { Toast.makeText(getApplicationContext(), R.string.parsing_error, Toast.LENGTH_SHORT).show(); } else { // TODO: better error message for this case Toast.makeText(getApplicationContext(), R.string.network_error, Toast.LENGTH_SHORT).show(); } break; case QUERY_TOO_SHORT: // should never happen here, but to err on the side of caution... Toast.makeText(getApplicationContext(), R.string.query_too_short, Toast.LENGTH_SHORT).show(); break; 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. ArrivalFetchersRecursionHelper.increment(); asyncWgetBusStopFromBusStopID(stopID, false); } } private void populateBusLinesLayout(Palina p, String stopID) { /* 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()); // TODO: implement favorites username /*if(dbBusStop != null && dbBusStop.getBusStopUsername() != null) { busStopNameDisplay = dbBusStop.getBusStopUsername(); } else if (busStop.getBusStopName() != null) { busStopNameDisplay = busStop.getBusStopName(); } else { busStopNameDisplay = String.valueOf(busStopID); }*/ hideKeyboard(); busStopNameTextView.setText(String.format( 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)); - // TODO: do something useful on click (e.g. refresh timetables and show only that route) - /*resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + 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); + String routeName; - Log.i("ActivityMain", "Tapped busLine " + busLine.toString()); + Route r = (Route) parent.getItemAtPosition(position); + routeName = FiveTNormalizer.routeInternalToDisplay(r.name); + if(routeName == null) { + routeName = r.name; + } + if(r.destinazione == null || r.destinazione.length() == 0) { + Toast.makeText(getApplicationContext(), + getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getApplicationContext(), + getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show(); + } } - });*/ + }); } ///////////////////////////////// OTHER STUFF ////////////////////////////////////////////////// private boolean isConnected() { ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); return networkInfo != null && networkInfo.isConnected(); } // 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 void toggleSpinner(boolean enable) { if (enable) { //already set by the RefreshListener when needed //swipeRefreshLayout.setRefreshing(true); progressBar.setVisibility(View.VISIBLE); } else { swipeRefreshLayout.setRefreshing(false); progressBar.setVisibility(View.GONE); } } 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/FiveTNormalizer.java b/src/it/reyboz/bustorino/backend/FiveTNormalizer.java index 928d54b..fd27b64 100644 --- a/src/it/reyboz/bustorino/backend/FiveTNormalizer.java +++ b/src/it/reyboz/bustorino/backend/FiveTNormalizer.java @@ -1,172 +1,251 @@ /* 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.
*
* Note: this class also just became useless, as 5T now uses the same format as GTT website. */ public abstract class FiveTNormalizer { public static String FiveTNormalizeRoute(String RouteID) { while (RouteID.startsWith("0")) { RouteID = RouteID.substring(1); } return RouteID; } 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; } 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; } public 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; } + } + /** + * Converts a route ID from internal format to display format, returns null if it has the same name. + * + * @return string with display name, null if unchanged + */ + public static String routeInternalToDisplay(String routeID) { + switch(routeID) { + case "1C": + return "1 Chieri"; + case "1N": + return "1 Nichelino"; + case "OB1": + return "1 Orbassano"; + case "2C": + return "2 Chieri"; + case "RV2": + return "2 Rivalta"; + case "5B": + return "5 /"; + case "CO1": + return "Circolare Collegno"; + case "79": + return "Cremagliera Sassi-Superga"; + case "W01": + return "Night Buster 1 arancio"; + case "N10": + return "Night Buster 10 gialla"; + case "W15": + return "Night Buster 15 rosa"; + case "S18": + return "Night Buster 18 blu"; + case "S04": + return "Night Buster 4 azzurra"; + case "N4": + return "Night Buster 4 rossa"; + case "N57": + return "Night Buster 57 oro"; + case "W60": + return "Night Buster 60 argento"; + case "E68": + return "Night Buster verde 68"; + case "S05": + return "Night Buster viola 5"; + case "ST1": + return "Star 1"; + case "ST2": + return "Star 2"; + case "10N": + return "10 navetta"; + case "17B": + return "17 /"; + case "35N": + return "35 navetta"; + case "36N": + return "36 navetta"; + case "45B": + return "45 /"; + case "46N": + return "46 navetta"; + case "58B": + return "58 /"; + case "59B": + return "59 /"; + case "63B": + return "63 /"; + case "72B": + return "72 /"; + case "79B": + return "79 /"; + case "93B": + return "93 /"; + case "101": + return "101 Metrobus"; + case "95B": + return "95 /"; + default: + return null; + } } }