diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index a72c710..377c42d 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,708 +1,707 @@
/*
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.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 it.reyboz.bustorino.lab.adapters.AdapterBusStops;
import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopFromBusStopID;
import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions;
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
*/
private Handler handler = new Handler();
private final Runnable refreshing = new Runnable() {
public void run() {
showSpinner(DOUBLE_SPINNER);
asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID);
}
};
/*
* 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)
/*
* Options
*/
private final String OPTION_SHOW_LEGEND = "show_legend";
/**
* Last successfully searched bus stop ID
*/
private String lastSuccessfullySearchedBusStopID = null;
AsyncWgetBusStopSuggestions asyncWgetBusStopSuggestions;
AsyncWgetBusStopFromBusStopID asyncWgetBusStopFromBusStopID;
private SQLiteDatabase db;
@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
asyncWgetBusStopFromBusStopID(null);
}
} else {
// If you are here an intent has worked successfully
setBusStopSearchByIDEditText(busStopID);
showSpinner();
asyncWgetBusStopFromBusStopID(busStopID);
}
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);
}
}
@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);
}
/**
* 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 the ID as a String
*/
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;
}
BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID());
String busStopNameDisplay;
if (dbBusStop != null && dbBusStop.getBusStopUsername() != null) {
busStopNameDisplay = dbBusStop.getBusStopUsername();
} else if (busStop.getBusStopName() != null) {
busStopNameDisplay = busStop.getBusStopName();
} else {
busStopNameDisplay = String.valueOf(busStopID);
}
busStopNameTextView.setText(String.format(
getString(R.string.passages), busStopNameDisplay));
// Hide the alphabetical 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);
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);
} 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);
}
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);
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);
}
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
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);
}
/**
* 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);
}
/**
* 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/lab/NetworkTools.java b/src/it/reyboz/bustorino/NetworkTools.java
similarity index 97%
rename from src/it/reyboz/bustorino/lab/NetworkTools.java
rename to src/it/reyboz/bustorino/NetworkTools.java
index bf1e774..b2b351c 100644
--- a/src/it/reyboz/bustorino/lab/NetworkTools.java
+++ b/src/it/reyboz/bustorino/NetworkTools.java
@@ -1,41 +1,41 @@
/*
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;
+package it.reyboz.bustorino;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.widget.Toast;
import it.reyboz.bustorino.R;
public class NetworkTools {
// Check network connection
public static boolean isConnected(Context c) {
ConnectivityManager connMgr = (ConnectivityManager) c
.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
return networkInfo != null && networkInfo.isConnected();
}
// «Turn on WiFi!»
public static void showNetworkError(Context c) {
Toast.makeText(c, R.string.network_error, Toast.LENGTH_SHORT).show();
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/Palina.java b/src/it/reyboz/bustorino/backend/Palina.java
index a49100e..3d207a8 100644
--- a/src/it/reyboz/bustorino/backend/Palina.java
+++ b/src/it/reyboz/bustorino/backend/Palina.java
@@ -1,217 +1,217 @@
/*
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.
* Not in a way that makes sense and keeps the code readable, at least.
*/
public class Palina {
private ArrayList routes;
public Palina() {
this.routes = new ArrayList<>();
}
/**
* Adds a route to the timetable.
*
* @param routeID name
* @param destinazione end of line\terminus (underground stations have the same ID for both directions)
* @return array index for this route
*/
public int addRoute(String routeID, String destinazione) {
this.routes.add(new RouteInternal(routeID, destinazione));
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();
}
}
}
/**
* 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();
}
}
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
+ // TODO: ponder on the usefulness/uselessness of having separate Route and RouteInternal classes just for this method
/**
* Gets timetables for every route.
*
* @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;
}
/**
* 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;
}
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/Passaggio.java b/src/it/reyboz/bustorino/backend/Passaggio.java
index 6796af9..8db41e4 100644
--- a/src/it/reyboz/bustorino/backend/Passaggio.java
+++ b/src/it/reyboz/bustorino/backend/Passaggio.java
@@ -1,90 +1,100 @@
/*
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;
public final class Passaggio implements Comparable {
public final String hh;
public final String mm;
public final boolean isInRealTime;
/**
* Constructs a time (passaggio) for the timetable.
*
* @param TimeGTT time in GTT format (e.g. "11:22*"), already trimmed from whitespace.
* @throws IllegalArgumentException if nothing reasonable can be extracted from the string
*/
public Passaggio(@NonNull String TimeGTT) {
String[] parts = TimeGTT.split(":");
if(parts.length != 2) {
// TODO: messaggio d'errore meno ridicolo
throw new IllegalArgumentException("The string " + TimeGTT + " doesn't follow the sacred format of time according to GTT!");
}
this.hh = parts[0];
if(parts[1].endsWith("*")) {
this.mm = parts[1].substring(0, parts[1].length() - 1);
this.isInRealTime = true;
} else {
this.mm = parts[1];
this.isInRealTime = false;
}
}
@Override public int compareTo(@NonNull Passaggio altro) {
int diff;
diff = failsafeParseInt(altro.hh) - failsafeParseInt(this.hh);
// an attempt to correctly sort times around midnight (e.g. 23.59 should come before 00.01)
if(diff > 12) { // TODO: see if this works in practice
diff = -(24 - diff);
} else if(diff < -12) {
diff = -(diff + 24);
}
diff *= 60;
diff += failsafeParseInt(altro.mm) - failsafeParseInt(this.mm);
// we should take into account if one is in real time and the other isn't, shouldn't we?
if(altro.isInRealTime) {
++diff;
}
if(this.isInRealTime) {
--diff;
}
return diff;
}
+ @Override
+ public String toString() {
+ String resultString = (this.hh).concat(":").concat(this.mm);
+ if(this.isInRealTime) {
+ return resultString.concat("*");
+ } else {
+ return resultString;
+ }
+ }
+
/**
* Parses without blowing up.
*
* @param str the number as a string
* @return the number as an integer
*/
private static int failsafeParseInt(String str) {
try {
return Integer.parseInt(str);
} catch(NumberFormatException e) {
return 0;
}
}
}
\ 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 9128a8c..fa43ba1 100644
--- a/src/it/reyboz/bustorino/backend/Route.java
+++ b/src/it/reyboz/bustorino/backend/Route.java
@@ -1,33 +1,33 @@
/*
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.Collection;
+import java.util.List;
public class Route {
public final String name;
public final String destinazione;
- public final Collection passaggi;
+ public final List passaggi;
- public Route(String name, String destinazione, Collection passaggi) {
+ public Route(String name, String destinazione, List passaggi) {
this.name = name;
this.destinazione = destinazione;
this.passaggi = passaggi;
}
}
diff --git a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
index e4eb778..e2b9b69 100644
--- a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
+++ b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
@@ -1,43 +1,47 @@
/*
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 {
ArrivalsFetcher af;
AtomicReference result;
String stopID;
public AsyncArrivalsFetcherAll(@NonNull ArrivalsFetcher af, @NonNull String stopID) {
this.af = af;
this.stopID = stopID;
}
@Override protected Palina doInBackground(Void... useless) {
return af.ReadArrivalTimesAll(this.stopID, this.result); // TODO: reuse the same Palina object and update it
}
+
+ @Override protected void onPostExecute(Palina p) {
+
+ }
}
diff --git a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java
new file mode 100644
index 0000000..7f9720d
--- /dev/null
+++ b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java
@@ -0,0 +1,103 @@
+/*
+ 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.middleware;
+
+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 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 TextView entryView = null;
+ private TextView busLineIconTextView = null;
+ private TextView busLinePassagesTextView = null;
+ private TextView busLineVehicleIcon = null;
+ private View someRandomConvertView = null;
+ private static int layout = R.layout.entry_bus_line_passage;
+
+ public PalinaAdapter(Context context, Palina p) {
+ // TODO: find a more efficient way if there's one
+ super(context, layout, p.queryAllRoutes());
+ }
+
+ /**
+ * Some parts taken from the AdapterBusLines class, some parts inspired by this tutorial:
+ * http://www.simplesoft.it/android/guida-agli-adapter-e-le-listview-in-android.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) {
+ if(convertView == null) {
+ if(this.someRandomConvertView == null) {
+ LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = inflater.inflate(layout, null);
+ this.someRandomConvertView = convertView;
+ }
+ } else {
+ this.someRandomConvertView = convertView;
+ }
+
+ if(this.entryView == null) {
+ // I'd be surprised if this doesn't catch fire as soon as it runs.
+ this.entryView = (TextView) this.someRandomConvertView.findViewById(R.id.busLineNames);
+ this.busLineIconTextView = (TextView) this.someRandomConvertView.findViewById(R.id.busLineIcon);
+ this.busLinePassagesTextView = (TextView) this.someRandomConvertView.findViewById(R.id.busLineNames);;
+ this.busLineVehicleIcon = (TextView) this.someRandomConvertView.findViewById(R.id.vehicleIcon); // Vehicle icon
+ }
+
+ Route route = getItem(position);
+
+ // Take the TextView from layout and set the busLine name
+ // TODO: pezza temporanea da sistemare
+ busLineIconTextView.setText(route.name + " > " + route.destinazione);
+
+ List passaggi = route.passaggi;
+ if(passaggi.size() == 0) {
+ this.busLinePassagesTextView.setText(R.string.no_passages);
+ this.busLineVehicleIcon.setVisibility(View.INVISIBLE);
+ } else {
+ String resultString = "";
+ for(Passaggio passaggio : passaggi) {
+ // "+" calls concat() and some other stuff internally, this should be faster
+ resultString = resultString.concat(passaggio.toString()).concat(" ");
+ }
+ this.busLinePassagesTextView.setText(resultString);
+ }
+
+ return convertView;
+ }
+}