diff --git a/res/menu/menu_favourites_entry.xml b/res/menu/menu_favourites_entry.xml index a9e1458..1782f9f 100644 --- a/res/menu/menu_favourites_entry.xml +++ b/res/menu/menu_favourites_entry.xml @@ -1,7 +1,10 @@ + \ No newline at end of file diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d62b851..efea2a5 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,77 +1,80 @@ Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy. Cerca 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 Informazioni Preferiti Codice sorgente Ultimi cambiamenti Incontra l\'autore Aiuto 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 come sviluppatore principale.
- Marco Gagino come intenso collaboratore + icona.
- Paolo Alloatti per l\'idea dell\'icona.
- JSoup libreria per "web scaping".
- makovkastar per i floating button.
- Google per le icone Material Design.
E tutti i contributori!

Licenze

L\'app e il relativo codice sorgente sono distribuiti sotto licenza Gnu General Public License v3+ (GNU GPLv3+). 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 alcuna garanzia.

Invio di bugs/idee: lamentati qui.

Codice sorgente: lp:bus-torino.

Cosa è cambiato: changes.txt

Contatta l\'autore: Valerio Bozzolan.

Buon utilizzo! :)

]]>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 39cc7dc..04c76a0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,76 +1,79 @@ BusTO Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy. Search Bus stop number Bus stop name Insert bus stop number Insert bus stop name 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!) Arrivals at: %1$s Choose the bus stop… Lines: %1$s No passages Favorites About Source code Last changes Meet the author Help Bus stop is now in your favorites Favorites Press on a bus stop name to populate this list Delete + Rename + Rename 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, an indipendent 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, the main developer.
- Marco Gagino, the main contributor + icon.
- Paolo Alloatti, the original concept of the icon.
- JSoup for the web scraper library.
- makovkastar for the floating buttons.
- Google for Material Design icons.
Thanks to 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+ (GNU GPLv3+). 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 manteining this rights and of attributing the original source code to Valerio Bozzolan.

Notes

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

Send bugs/ideas: bug tracker.

Source code: lp:bus-torino.

Changes: changes.txt

Meet the author: Valerio Bozzolan.

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

]]>
diff --git a/src/it/reyboz/bustorino/ActivityFavorites.java b/src/it/reyboz/bustorino/ActivityFavorites.java index 29fdcb7..4343f7d 100644 --- a/src/it/reyboz/bustorino/ActivityFavorites.java +++ b/src/it/reyboz/bustorino/ActivityFavorites.java @@ -1,134 +1,197 @@ /* 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 it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; import it.reyboz.bustorino.lab.MyDB; import it.reyboz.bustorino.lab.MyDB.DBBusStop; import it.reyboz.bustorino.lab.adapters.AdapterBusStops; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.support.v7.app.ActionBarActivity; +import android.text.InputType; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.EditText; import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.TextView; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; public class ActivityFavorites extends ActionBarActivity { private ListView favoriteListView; private MyDB mDbHelper; private SQLiteDatabase db; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_favorites); mDbHelper = new MyDB(this); db = mDbHelper.getWritableDatabase(); favoriteListView = (ListView) findViewById(R.id.favoriteListView); createFavoriteList(); } @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); if (v.getId() == R.id.favoriteListView) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.menu_favourites_entry, menu); } } @Override public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); - String busStopID = ((TextView) (info.targetView) - .findViewById(R.id.busStopID)).getText().toString(); + BusStop busStop = (BusStop) favoriteListView.getItemAtPosition(info.position); switch (item.getItemId()) { case R.id.action_favourite_entry_delete: db.delete(DBBusStop.TABLE_NAME, - MyDB.somethingEqualsWithoutQuotes(DBBusStop.COLUMN_NAME_BUSSTOP_ID), - new String[] { busStopID }); + MyDB.somethingEqualsWithoutQuotes(DBBusStop.COLUMN_NAME_BUSSTOP_ID), + new String[] { busStop.getBusStopID() }); db.delete(MyDB.DBBusStopServeLine.TABLE_NAME, - MyDB.somethingEqualsWithoutQuotes(MyDB.DBBusStopServeLine.COLUMN_NAME_BUSSTOP_ID), - new String[] { busStopID }); + MyDB.somethingEqualsWithoutQuotes(MyDB.DBBusStopServeLine.COLUMN_NAME_BUSSTOP_ID), + new String[] { busStop.getBusStopID() }); createFavoriteList(); return true; + case R.id.action_rename_bus_stop_username: + showBusStopUsernameInputDialog(busStop); + return true; default: return super.onContextItemSelected(item); } } void createFavoriteList() { BusStop[] busStops = MyDB.DBBusStop.getFavoriteBusStops(db); // If no data is found show a friendly message if (busStops.length == 0) { favoriteListView.setVisibility(View.INVISIBLE); TextView favoriteTipTextView = (TextView) findViewById(R.id.favoriteTipTextView); favoriteTipTextView.setVisibility(View.VISIBLE); } // Show results favoriteListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops)); favoriteListView .setOnItemClickListener(new AdapterView.OnItemClickListener() { 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(ActivityFavorites.this, ActivityMain.class); Bundle b = new Bundle(); b.putString("busStopID", busStop.getBusStopID()); intent.putExtras(b); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); Log.d("FavoritesActivity", "Tapped on bus stop: " + busStop.getBusStopID()); startActivity(intent); finish(); } }); registerForContextMenu(favoriteListView); } + + private class BusStopUsernameOnClickListener implements DialogInterface.OnClickListener { + private BusStop busStop; + + BusStopUsernameOnClickListener(BusStop busStop) { + this.busStop = busStop; + } + + @Override + public void onClick(DialogInterface dialog, int which) { + + } + } + + public void showBusStopUsernameInputDialog(BusStop busStop) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + + builder.setTitle(getString(R.string.dialog_rename_bus_stop_username_title)); + + final EditText input = new EditText(this); + input.setInputType(InputType.TYPE_CLASS_TEXT); + input.setText(busStop.getBusStopName()); + input.setHint(busStop.getBusStopName()); + + builder.setView(input); + + builder.setPositiveButton(getString(android.R.string.ok), new BusStopUsernameOnClickListener(busStop) { + @Override + public void onClick(DialogInterface dialog, int which) { + String busStopUsername = input.getText().toString(); + if(busStopUsername == null || busStopUsername.length() == 0) { + busStopUsername = super.busStop.getBusStopName(); + } + + super.busStop.setBusStopUsername(busStopUsername); + MyDB.DBBusStop.addBusStop(db, super.busStop); + + createFavoriteList(); + } + }); + builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.cancel(); + } + }); + builder.setNeutralButton(R.string.dialog_rename_bus_stop_username_reset_button, new BusStopUsernameOnClickListener(busStop) { + @Override + public void onClick(DialogInterface dialog, int which) { + super.busStop.setBusStopUsername(null); + MyDB.DBBusStop.addBusStop(db, super.busStop, DBBusStop.FORCE_NULL_BUSSTOP_USERNAME); + + createFavoriteList(); + } + }); + builder.show(); + } } diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index 4eb6cdb..1f1be39 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,563 +1,566 @@ /* 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 java.io.UnsupportedEncodingException; import it.reyboz.bustorino.lab.adapters.AdapterBusStops; import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopFromBusStopID; import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions; 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.NetworkTools; import it.reyboz.bustorino.lab.adapters.AdapterBusLines; 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.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBarActivity; import android.util.Log; 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.AutoCompleteTextView; 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 android.view.KeyEvent; import com.melnykov.fab.FloatingActionButton; public class ActivityMain extends ActionBarActivity { /* * Layout elements */ private EditText busStopSearchByIDEditText; private AutoCompleteTextView 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 */ private Handler handler = new Handler(); private final Runnable refreshing = new Runnable() { public void run() { showSpinner(DOUBLE_SPINNER); asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID); } }; /* * To toggle keyboard */ private final boolean SEARCH_BY_ID = true; private final boolean SEARCH_BY_NAME = false; private boolean searchMode; /* * Options */ private final String OPTION_SHOW_LEGEND = "show_legend"; /** * Last successfully searched bus stop ID */ private String lastSuccessfullySearchedBusStopID; AsyncWgetBusStopSuggestions asyncWgetBusStopSuggestions; AsyncWgetBusStopFromBusStopID asyncWgetBusStopFromBusStopID; /** * Last successfully searched bus stop / bus stops */ private BusStop[] busStopsCache; /* * SQLite */ private MyDB mDbHelper; private SQLiteDatabase db; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); busStopSearchByIDEditText = (EditText) findViewById(R.id.busStopSearchByIDEditText); busStopSearchByNameEditText = (AutoCompleteTextView) 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); floatingActionButton.attachToListView(resultsListView); // IME_ACTION_SEARCH keyboard option busStopSearchByIDEditText .setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { onSearchClick(v); return true; } return false; } }); // IME_ACTION_SEARCH keyboard option busStopSearchByNameEditText .setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { onSearchClick(v); return true; } return false; } }); // Get database in write mode 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); } }); /** * Deprecated! D: * * @author Marco Gagino!!! * @deprecated * @see https://developer.android.com/reference/android/support/v4/widget/SwipeRefreshLayout.html#setColorSchemeResources%28int...%29 */ swipeRefreshLayout.setColorScheme(R.color.blue_500, R.color.orange_500); setSearchModeBusStopID(); // Intercept calls from other activities Bundle b = getIntent().getExtras(); if (b != null) { String busStopID = b.getString("busStopID"); if (busStopID != null) { busStopSearchByIDEditText.setText(busStopID); showSpinner(); asyncWgetBusStopFromBusStopID(busStopID); } } else { showKeyboard(); } } @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 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_source: openIceweasel("https://launchpad.net/bus-torino"); return true; case R.id.action_changelog: openIceweasel("http://bustorino.reyboz.it/CONTRIBUTORS_AND_CHANGES.txt"); return true; case R.id.action_help: showHints(); return true; case R.id.action_author: openIceweasel("http://boz.reyboz.it?lovebusto"); return true; } return super.onOptionsItemSelected(item); } /** * 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(); return; } if (!NetworkTools.isConnected(getApplicationContext())) { NetworkTools.showNetworkError(getApplicationContext()); hideSpinner(); return; } if(asyncWgetBusStopSuggestions != null) { asyncWgetBusStopSuggestions.cancel(true); asyncWgetBusStopSuggestions = null; } try { asyncWgetBusStopSuggestions = new AsyncWgetBusStopSuggestions(query) { public void onReceivedBusStopNames(BusStop[] busStops, int status) { hideSpinner(); 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(); } } /** * It's pure magic <3 * * @param busStopID */ private void asyncWgetBusStopFromBusStopID(String busStopID) { if(busStopID == null || busStopID.length() == 0) { Toast.makeText(getApplicationContext(), R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); hideSpinner(); return; } if (!NetworkTools.isConnected(getApplicationContext())) { NetworkTools.showNetworkError(getApplicationContext()); hideSpinner(); return; } if(asyncWgetBusStopFromBusStopID != null) { asyncWgetBusStopFromBusStopID.cancel(true); asyncWgetBusStopFromBusStopID = null; } asyncWgetBusStopFromBusStopID = new AsyncWgetBusStopFromBusStopID(busStopID) { public void onReceivedBusStop(BusStop busStop, int status) { hideSpinner(); switch (status) { case AsyncWgetBusStopSuggestions.ERROR_EMPTY_DOM: case AsyncWgetBusStopSuggestions.ERROR_DOM: Toast.makeText(getApplicationContext(), R.string.parsing_error, Toast.LENGTH_SHORT).show(); break; case AsyncWgetBusStopFromBusStopID.ERROR_NO_PASSAGES_OR_NO_BUS_STOP: Toast.makeText(getApplicationContext(), R.string.no_passages, Toast.LENGTH_SHORT).show(); break; case AsyncWgetBusStopSuggestions.ERROR_NONE: lastSuccessfullySearchedBusStopID = busStop.getBusStopID(); MyDB.DBBusStop.addBusStop(db, busStop); populateBusLinesLayout(busStop); break; } } }; } private void populateBusLinesLayout(BusStop busStop) { busStop.orderBusLinesByFirstArrival(); // Remember last successfully searched busStopID String busStopID = busStop.getBusStopID(); // Retrieve passages BusLine[] busLines = busStop.getBusLines(); // No passages? if (busLines.length == 0) { Toast.makeText(getApplicationContext(), R.string.no_arrival_times, Toast.LENGTH_SHORT).show(); return; } - String busStopName = busStop.getBusStopName(); + BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID()); + String busStopNameDisplay; - if (busStopName == null) { - busStopNameDisplay = String.valueOf(busStopID); + if(dbBusStop != null && dbBusStop.getBusStopUsername() != null) { + busStopNameDisplay = dbBusStop.getBusStopUsername(); + } else if (busStop.getBusStopName() != null) { + busStopNameDisplay = busStop.getBusStopName(); } else { - busStopNameDisplay = busStopName; + busStopNameDisplay = String.valueOf(busStopID); } busStopNameTextView.setText(String.format( getString(R.string.passages), busStopNameDisplay)); // Hide the keyboard before showing passages hideKeyboard(); // Shows hints if (getOption(OPTION_SHOW_LEGEND, true)) { showHints(); } else { hideHints(); } prepareGUIForBusLines(); resultsListView.setAdapter(new AdapterBusLines(this, R.layout.entry_bus_line_passage, busLines)); 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()); } }); } 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); String busStopID = busStop.getBusStopID(); busStopSearchByIDEditText.setText(busStopID); setSearchModeBusStopID(); showSpinner(); asyncWgetBusStopFromBusStopID(busStopID); } }); } /** * 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); } else { // searchMode == SEARCH_BY_NAME String query = busStopSearchByNameEditText.getText().toString(); asyncWgetBusStopSuggestions(query); } } 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(); } } } public void addInFavorites(View v) { if (lastSuccessfullySearchedBusStopID != null) { BusStop busStop = new BusStop(lastSuccessfullySearchedBusStopID); busStop.setIsFavorite(true); MyDB.DBBusStop.addBusStop(db, busStop); 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); } 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.ic_keyboard_white_24dp); } private void setSearchModeBusStopName() { searchMode = SEARCH_BY_NAME; busStopSearchByIDEditText.setVisibility(View.GONE); busStopSearchByIDEditText.setText(""); busStopSearchByNameEditText.setVisibility(View.VISIBLE); floatingActionButton.setImageResource(R.drawable.ic_looks_one_white_24dp); } 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 boolean DOUBLE_SPINNER = true; private final boolean NORMAL_SPINNER = false; private void showSpinner(boolean swipeSpinner) { if (swipeSpinner == DOUBLE_SPINNER) { swipeRefreshLayout.setRefreshing(true); } else { // NORMAL_SPINNER progressBar.setVisibility(View.VISIBLE); } } 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); 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); } } \ No newline at end of file diff --git a/src/it/reyboz/bustorino/lab/MyDB.java b/src/it/reyboz/bustorino/lab/MyDB.java index 7de30c4..408655b 100644 --- a/src/it/reyboz/bustorino/lab/MyDB.java +++ b/src/it/reyboz/bustorino/lab/MyDB.java @@ -1,383 +1,419 @@ /* 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.lab; import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; import it.reyboz.bustorino.lab.GTTSiteSucker.BusLine; import android.database.Cursor; import android.database.SQLException; import android.provider.BaseColumns; import android.util.Log; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.content.ContentValues; import android.content.Context; import java.util.ArrayList; /** * Manage SQLite * * @author Valerio Bozzolan */ public class MyDB extends SQLiteOpenHelper { // If you change the database schema, you must increment the database // version. public static final int DATABASE_VERSION = 8; public static final String DATABASE_NAME = "bustorino.db"; public static final String COMMA = ", "; public static final String DOT = "."; public static final String EQUALS = " = "; public static final String CREATE_TABLE_IF_NOT_EXISTS = "CREATE TABLE IF NOT EXISTS "; public static final String DROP_TABLE = "DROP TABLE IF EXISTS "; public static final String TEXT_TYPE = " TEXT"; public static final String INTEGER_TYPE = " INTEGER"; public static final String REAL_TYPE = " REAL "; public static final String PRIMARY_KEY = " PRIMARY KEY"; public static final String NOT_NULL = " NOT NULL"; public static final String WHERE = " WHERE "; public static final String AND = " AND "; public static final String SELECT = "SELECT "; public static final String FROM = " FROM "; public static final String SELECT_ALL_FROM = "SELECT * FROM "; public static final String ORDER_BY = " ORDER BY "; public static final String ASC = " ASC"; public static final String DESC = " DESC"; public static String getDefault(String i) { return " DEFAULT " + String.valueOf(i); } /** * @deprecated CAUSES CRASHES IN PARAMETRIC QUERIES * @param columnName * @return */ public static String somethingEqualsString(String columnName) { return " " + columnName + "=\"?\""; } public static String somethingEqualsWithoutQuotes(String columnName) { return " " + columnName + "=?"; } public MyDB(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); } public void onCreate(SQLiteDatabase db) { db.execSQL(DBBusStop.SQL_CREATE_ENTRIES); db.execSQL(DBBusLine.SQL_CREATE_ENTRIES); db.execSQL(DBBusStopServeLine.SQL_CREATE_ENTRIES); } public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { boolean somethingTerribleIsGoingToHappen = false; if(oldVersion == 6 && newVersion == 7) { // Added two tables. It's OK! oldVersion = 7; } if(oldVersion == 7 && newVersion == 8) { /****** TOO MANY CHANGES. SORRY ME! THIS WILL CAUSE THE DROP OF YOUR CURRENT DB! ******/ somethingTerribleIsGoingToHappen = true; } if (oldVersion != DATABASE_VERSION || somethingTerribleIsGoingToHappen){ // Do you hear these cries? :'( db.execSQL(DBBusStop.SQL_DROP_TABLE); db.execSQL(DBBusLine.SQL_DROP_TABLE); db.execSQL(DBBusStopServeLine.SQL_DROP_TABLE); } onCreate(db); } public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { onUpgrade(db, oldVersion, newVersion); } public static boolean rowExists(SQLiteDatabase db, String tableName, String columnName, String columnValue) { Cursor c = db.rawQuery(SELECT_ALL_FROM + tableName + WHERE + somethingEqualsWithoutQuotes(columnName), new String[]{columnValue}); boolean success = c.moveToFirst(); c.close(); return success; } /** * Store bus stops. */ public static abstract class DBBusStop implements BaseColumns { public static final String TABLE_NAME = "busstop"; public static final String COLUMN_NAME_BUSSTOP_ID = "busstop_ID"; public static final String COLUMN_NAME_BUSSTOP_NAME = "busstop_name"; public static final String COLUMN_NAME_BUSSTOP_USERNAME = "busstop_username"; // User manually edit it public static final String COLUMN_NAME_BUSSTOP_LOCALITY = "busstop_locality"; public static final String COLUMN_NAME_BUSSTOP_LATITUDE = "busstop_latitude"; public static final String COLUMN_NAME_BUSSTOP_LONGITUDE = "busstop_longitude"; public static final String COLUMN_NAME_BUSSTOP_ISFAVORITE = "busstop_isfavorite"; public static final String IS_FAVORITE = "1"; public static final String IS_NOT_FAVORITE = "0"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSSTOP_ID + TEXT_TYPE + PRIMARY_KEY + NOT_NULL + COMMA + COLUMN_NAME_BUSSTOP_NAME + TEXT_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSSTOP_USERNAME + TEXT_TYPE + COMMA + COLUMN_NAME_BUSSTOP_ISFAVORITE + INTEGER_TYPE + NOT_NULL + getDefault(IS_NOT_FAVORITE) + COMMA + COLUMN_NAME_BUSSTOP_LOCALITY + TEXT_TYPE + COMMA + COLUMN_NAME_BUSSTOP_LATITUDE + REAL_TYPE + COMMA + COLUMN_NAME_BUSSTOP_LONGITUDE + REAL_TYPE + ")"; private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; public static boolean busStopExists(SQLiteDatabase db, String busStopID) { return rowExists(db, TABLE_NAME, getColumn(COLUMN_NAME_BUSSTOP_ID), busStopID); } + public final static int FORCE_NULL_BUSSTOP_USERNAME = 1; + /** * Add a bus stop or replace the existing bus stop. * It also add its bus lines! * * @param db * @param busStop + * @param forceNULL * @return * @throws SQLException */ - public static void addBusStop(SQLiteDatabase db, BusStop busStop) throws SQLException { + public static void addBusStop(SQLiteDatabase db, BusStop busStop, int forceNULL) throws SQLException { ContentValues values = new ContentValues(); if(busStop.getBusStopName() != null) { values.put(COLUMN_NAME_BUSSTOP_NAME, busStop.getBusStopName()); } if(busStop.getBusStopUsername() != null) { values.put(COLUMN_NAME_BUSSTOP_USERNAME, busStop.getBusStopUsername()); + } else if((forceNULL & FORCE_NULL_BUSSTOP_USERNAME) != 0) { + values.putNull(COLUMN_NAME_BUSSTOP_USERNAME); } if (busStop.getBusStopLocality() != null) { values.put(COLUMN_NAME_BUSSTOP_LOCALITY, busStop.getBusStopLocality()); } if (busStop.getIsFavorite() != null) { values.put(COLUMN_NAME_BUSSTOP_ISFAVORITE, busStop.getIsFavorite() ? IS_FAVORITE : IS_NOT_FAVORITE); } if(busStop.getLatitude() != null && busStop.getLongitude() != null) { values.put(COLUMN_NAME_BUSSTOP_LATITUDE, busStop.getLatitude()); values.put(COLUMN_NAME_BUSSTOP_LONGITUDE, busStop.getLongitude()); } if(busStopExists(db, busStop.getBusStopID())) { db.update(TABLE_NAME, values, somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ID), new String[]{busStop.getBusStopID()}); Log.d("MyDB", "busStop with busStopID " + busStop.getBusStopID() + " updated"); } else { values.put(COLUMN_NAME_BUSSTOP_ID, busStop.getBusStopID()); long lastInserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "busStop with busStopID " + busStop.getBusStopID() + " inserted as " + lastInserted); } // Javamerda if(busStop.getBusLines() != null) { for (BusLine busLine : busStop.getBusLines()) { DBBusLine.addBusLine(db, busLine); DBBusStopServeLine.addBusStopServeLine(db, busStop.getBusStopID(), busLine.getBusLineID()); } } } + public static void addBusStop(SQLiteDatabase db, BusStop busStop) throws SQLException { + addBusStop(db, busStop, 0); + } + public static BusStop[] getFavoriteBusStops(SQLiteDatabase db) { ArrayList busStops = new ArrayList(); String query = MyDB.SELECT_ALL_FROM + TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ISFAVORITE) + ORDER_BY + COLUMN_NAME_BUSSTOP_NAME + ASC; Cursor c = db.rawQuery(query, new String[]{DBBusStop.IS_FAVORITE}); while (c.moveToNext()) { String busStopID = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_ID)); String busStopName = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_NAME)); String busStopUsername = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_USERNAME)); String busStopLocality = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_LOCALITY)); BusLine[] busLines = DBBusStopServeLine.getBusLinesServedByBusStopID(db, busStopID); BusStop busStop = new BusStop(busStopID, busStopName, busLines); busStop.setBusStopUsername(busStopUsername); busStop.setBusStopLocality(busStopLocality); busStops.add(busStop); } c.close(); return busStops.toArray(new BusStop[busStops.size()]); } + public static BusStop getBusStop(SQLiteDatabase db, String searchBusStopID) { + BusStop busStop = null; + + String query = MyDB.SELECT_ALL_FROM + + TABLE_NAME + + WHERE + + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ID); + + Cursor c = db.rawQuery(query, new String[]{searchBusStopID}); + + while (c.moveToNext()) { + String busStopID = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_ID)); + String busStopName = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_NAME)); + String busStopUsername = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_USERNAME)); + String busStopLocality = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_LOCALITY)); + + BusLine[] busLines = DBBusStopServeLine.getBusLinesServedByBusStopID(db, busStopID); + + busStop = new BusStop(busStopID, busStopName, busLines); + busStop.setBusStopUsername(busStopUsername); + busStop.setBusStopLocality(busStopLocality); + } + c.close(); + + return busStop; + } + public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } } /** * Store bus lines. */ public static abstract class DBBusLine implements BaseColumns { public static final String TABLE_NAME = "busline"; public static final String COLUMN_NAME_BUSLINE_ID = "busline_ID"; public static final String COLUMN_NAME_BUSLINE_NAME = "busline_name"; public static final String COLUMN_NAME_BUSLINE_USERNAME = "busline_username"; public static final String COLUMN_NAME_BUSLINE_TYPE = "busline_type"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSLINE_ID + TEXT_TYPE + PRIMARY_KEY + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_NAME + TEXT_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_USERNAME + TEXT_TYPE + COMMA + COLUMN_NAME_BUSLINE_TYPE + INTEGER_TYPE + ")"; private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } public static boolean busLineExists(SQLiteDatabase db, Integer busLineID) { return rowExists(db, TABLE_NAME, getColumn(COLUMN_NAME_BUSLINE_ID), busLineID.toString()); } public static void addBusLine(SQLiteDatabase db, BusLine busLine) throws SQLException { ContentValues values = new ContentValues(); values.put(COLUMN_NAME_BUSLINE_NAME, busLine.getBusLineName()); if(busLine.getBusLineUsername() != null) { values.put(COLUMN_NAME_BUSLINE_USERNAME, busLine.getBusLineUsername()); } if(busLine.getBusLineType() != null) { values.put(COLUMN_NAME_BUSLINE_TYPE, busLine.getBusLineType()); } if(busLineExists(db, busLine.getBusLineID())) { db.update(TABLE_NAME, values, somethingEqualsWithoutQuotes(COLUMN_NAME_BUSLINE_ID), new String[] { String.valueOf(busLine.getBusLineID()) }); Log.d("MyDB", "BusLine with busLineID " + busLine.getBusLineID() + " updated"); } else { values.put(COLUMN_NAME_BUSLINE_ID, busLine.getBusLineID()); long lastInserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "BusLine with busLineID " + busLine.getBusLineID() + " inserted as " + lastInserted); } } } /** * Associate every bus stop on every bus line served */ public static abstract class DBBusStopServeLine { public static final String TABLE_NAME = "busstopserveline"; public static final String COLUMN_NAME_BUSSTOP_ID = "busstop_ID"; public static final String COLUMN_NAME_BUSLINE_ID = "busline_ID"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSSTOP_ID + INTEGER_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_ID + INTEGER_TYPE + NOT_NULL + COMMA + PRIMARY_KEY + " (" + COLUMN_NAME_BUSSTOP_ID + COMMA + COLUMN_NAME_BUSLINE_ID + "))"; // Add primary key on two columns private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; public static void addBusStopServeLine(SQLiteDatabase db, String busStopID, Integer busLineID) { ContentValues values = new ContentValues(); values.put(COLUMN_NAME_BUSSTOP_ID, busStopID); values.put(COLUMN_NAME_BUSLINE_ID, busLineID); try { long inserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "busStopServeLine relation between busStopID " + busStopID + " and busLineID " + busLineID + " inserted as " + inserted); } catch (SQLException e) { Log.d("MyDB", "busStopServeLine relation between busStopID " + busStopID + " and busLineID " + busLineID + " already inserted"); } } public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } /** * Get bus lines server by a bus stop. * @param db * @param busStopID * @return */ public static BusLine[] getBusLinesServedByBusStopID(SQLiteDatabase db, String busStopID) { ArrayList busLines = new ArrayList(); String queryLines = SELECT + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_ID) + COMMA + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_NAME) + FROM + TABLE_NAME + COMMA + DBBusLine.TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(getColumn(COLUMN_NAME_BUSSTOP_ID)) + AND + getColumn(COLUMN_NAME_BUSLINE_ID) + EQUALS + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_ID) + ORDER_BY + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_NAME) + ASC; Cursor cursor = db.rawQuery(queryLines, new String[] { String.valueOf(busStopID) }); while (cursor.moveToNext()) { Integer busLineID = cursor.getInt(0); String busLineName = cursor.getString(1); busLines.add(new BusLine(busLineID, busLineName)); } cursor.close(); return busLines.toArray(new BusLine[busLines.size()]); } } } diff --git a/src/it/reyboz/bustorino/lab/adapters/AdapterBusStops.java b/src/it/reyboz/bustorino/lab/adapters/AdapterBusStops.java index 49e454d..4ba02c5 100644 --- a/src/it/reyboz/bustorino/lab/adapters/AdapterBusStops.java +++ b/src/it/reyboz/bustorino/lab/adapters/AdapterBusStops.java @@ -1,92 +1,96 @@ /* 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.lab.adapters; import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; import it.reyboz.bustorino.R; import it.reyboz.bustorino.lab.GTTSiteSucker.BusLine; import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; /** * ListView Adapter for BusStop[]. * * @author Valerio Bozzolan */ public class AdapterBusStops extends ArrayAdapter { private LayoutInflater layoutInflater; private Context context; private int resource; public AdapterBusStops(Context context, int resource, BusStop busStops[]) { super(context, resource, busStops); layoutInflater = LayoutInflater.from(context); this.context = context; this.resource = resource; } @Override public View getView(int position, View convertView, ViewGroup parent) { // Create a new view of my layout and inflate it in the row convertView = layoutInflater.inflate(resource, null); // Extract the busStop object to show BusStop busStop = getItem( position ); // Take the TextView from layout and set the BusStop ID TextView busStopIDTextView = (TextView) convertView.findViewById(R.id.busStopID); busStopIDTextView.setText(busStop.getBusStopID()); // Take the TextView from layout and set the busStop name TextView busStopNameTextView = (TextView) convertView.findViewById(R.id.busStopName); - busStopNameTextView.setText(busStop.getBusStopName()); + if(busStop.getBusStopUsername() != null) { + busStopNameTextView.setText(busStop.getBusStopUsername()); + } else { + busStopNameTextView.setText(busStop.getBusStopName()); + } // Vehicle icon TextView busLineVehicleIcon = (TextView) convertView.findViewById(R.id.vehicleIcon); // Take the TextView from layout and set the busStop locality TextView busStopLinesTextView = (TextView) convertView.findViewById(R.id.busLineNames); if(busStop.getBusLines() != null) { String busLines = ""; for(BusLine busLine: busStop.getBusLines()) { if(busLines.length() > 0) { busLines += ", "; } busLines += busLine.getBusLineName(); } busStopLinesTextView.setText(busLines); } else { busStopLinesTextView.setVisibility(View.GONE); busLineVehicleIcon.setVisibility(View.INVISIBLE); } TextView busStopLocaLityTextView = (TextView) convertView.findViewById(R.id.busStopLocality); if (busStop.getBusStopLocality() != null) { busStopLocaLityTextView.setText(busStop.getBusStopLocality()); } else { busStopLocaLityTextView.setVisibility(View.GONE); } return convertView; } }