diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 64d56d8..6f49a48 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,175 +1,177 @@
-
-
+
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e1d628e..99b74ef 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,15 +1,16 @@
#FF9800
#F57C00
#2196F3
#1976D2
- #4DB6AC
#009688
+ #4DB6AC
+ #80cbc4
#F5F5F5
#757575
#FFFFFF
#009688
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index 1f1be39..a06fd30 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,566 +1,583 @@
/*
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.GTTSiteSucker;
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 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 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);
+ 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);
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;
}
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 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(),
+ // 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.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