diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 7840fe8..c5d2cb6 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,124 +1,130 @@
-
-
+ android:layout_below="@+id/legend">
+
+
+
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/MainActivity.java b/src/it/reyboz/bustorino/MainActivity.java
index 61045a0..8946d84 100644
--- a/src/it/reyboz/bustorino/MainActivity.java
+++ b/src/it/reyboz/bustorino/MainActivity.java
@@ -1,335 +1,368 @@
/*
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.util.ArrayList;
import java.util.HashMap;
import it.reyboz.bustorino.GTTSiteSucker.BusLine;
import it.reyboz.bustorino.GTTSiteSucker.BusStop;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
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.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.SimpleAdapter;
import android.widget.TextView;
import android.widget.Toast;
import android.view.KeyEvent;
public class MainActivity extends ActionBarActivity {
private EditText busStopIDEditText;
private TextView busStopNameTextView;
private TextView legend;
private TextView howDoesItWork;
private Button hideHint;
private MenuItem action_help;
private ProgressBar annoyingSpinner;
private ListView resultsListView;
+ private SwipeRefreshLayout swipeRefreshLayout;
+ private Handler handler = new Handler();
+
private MyAsyncWget myAsyncWget;
private MyDB mDbHelper;
private SQLiteDatabase db;
private Integer lastSearchedBusStopID;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
busStopIDEditText = (EditText) findViewById(R.id.busStopIDEditText);
busStopNameTextView = (TextView) findViewById(R.id.busStopNameTextView);
legend = (TextView) findViewById(R.id.legend);
howDoesItWork = (TextView) findViewById(R.id.howDoesItWork);
hideHint = (Button) findViewById(R.id.hideHint);
annoyingSpinner = (ProgressBar) findViewById(R.id.annoyingSpinner);
resultsListView = (ListView) findViewById(R.id.resultsListView);
myAsyncWget = new MyAsyncWget();
// IME_ACTION_SEARCH keyboard option
busStopIDEditText
.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 data in write mode
mDbHelper = new MyDB(this);
db = mDbHelper.getWritableDatabase();
+ swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_container);
+ // the refresh listner. this would be called when the layout is pulled down
+ swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+
+ @Override
+ public void onRefresh() {
+ // get the new data from you data source
+ // TODO : request data here
+ // our swipeRefreshLayout needs to be notified when the data is returned in order for it to stop the animation
+ handler.post(refreshing);
+ }
+ });
+
// Intercept calls from other part of the apps
Bundle b = getIntent().getExtras();
if (b != null) {
String busStopID = b.getString("busStopID");
if (busStopID != null) {
- launchSearchAction(busStopID);
busStopIDEditText.setText(busStopID);
+ launchSearchAction(busStopID);
}
}
}
+ private final Runnable refreshing = new Runnable(){
+ public void run(){
+ try {
+ launchSearchAction(lastSearchedBusStopID);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ };
+
@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);
action_help = menu.findItem(R.id.action_help);
action_help.setVisible(false);
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_settings: Intent intentSettings = new
* Intent(MainActivity.this,AboutActivity.class);
* startActivity(intentSettings); return true;
*/
case R.id.action_about:
Intent intentAbout = new Intent(MainActivity.this,
AboutActivity.class);
startActivity(intentAbout);
return true;
case R.id.action_favorites:
Intent intentFavorites = new Intent(MainActivity.this,
FavoritesActivity.class);
startActivity(intentFavorites);
return true;
case R.id.action_help:
howDoesItWork.setVisibility(View.VISIBLE);
legend.setVisibility(View.VISIBLE);
hideHint.setVisibility(View.VISIBLE);
return true;
}
return super.onOptionsItemSelected(item);
}
/**
* Catch the Async action!
*
* @author boz
*/
public class MyAsyncWget extends AsyncWget {
protected void onPostExecute(String htmlResponse) {
// Network errors?
if (htmlResponse == null || exceptions != null) {
NetworkTools.showNetworkError(MainActivity.this);
stopSpinner();
Log.e("MainActivity", "Network error!");
return;
}
// Try sucking arrivals
BusStop busStop = GTTSiteSucker.getBusStopSuckingHTML(db,
htmlResponse);
// Parse errors?
if (busStop == null) {
Toast.makeText(getApplicationContext(),
R.string.no_arrival_times, Toast.LENGTH_SHORT).show();
stopSpinner();
Log.e("MainActivity", "Parse error! htmlResponse: "
+ htmlResponse);
return;
}
// Order bus lines by first arrival time :D
busStop.orderBusLinesByFirstArrival();
// Remember last successfully searched busStopID
Integer busStopID = busStop.getBusStopID();
lastSearchedBusStopID = busStopID;
// Retrieve passages
BusLine[] busLines = busStop.getBusLines();
// No passages?
if (busLines.length == 0) {
Toast.makeText(getApplicationContext(),
R.string.no_arrival_times, Toast.LENGTH_SHORT).show();
stopSpinner();
Log.d("MainActivity", "No passages!");
return;
}
// Hide the keyboard before showing passages
hideKeyboard();
String busStopName = busStop.getBusStopName();
String busStopNameDisplay;
if (busStopName == null) {
busStopNameDisplay = String.valueOf(busStopID);
} else {
busStopNameDisplay = busStopName;
}
busStopNameTextView.setText(String.format(
getString(R.string.passages), busStopNameDisplay));
// Insert GTTBusStop info in the DB
MyDB.BusStop.addBusStop(db, busStopID, busStopName);
// Populate the stupid ListView SimpleAdapter
ArrayList> entries = new ArrayList>();
for (BusLine busLine : busLines) {
HashMap entry = new HashMap();
String passages = busLine.getTimePassagesString();
if (passages == null) {
passages = getString(R.string.no_passages);
}
entry.put("icon", busLine.getBusLineName());
entry.put("passages", passages);
entries.add(entry);
}
// Show results using the stupid SimpleAdapter
String[] from = { "icon", "passages" };
int[] to = { R.id.busLineIcon, R.id.busLineNames };
SimpleAdapter adapter = new SimpleAdapter(getApplicationContext(),
entries, R.layout.bus_line_passage_entry, from, to);
resultsListView.setAdapter(adapter);
resultsListView
.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView> av, View view,
int i, long l) {
String busLine = ((TextView) av.getChildAt(i)
.findViewById(R.id.busLineIcon)).getText()
.toString();
Log.d("MainActivity", "Tapped busLine: " + busLine);
}
});
// Stops annoying spinner
stopSpinner();
// Shows Help option in the menu
action_help.setVisible(true);
// Shows busStopName
busStopNameTextView.setVisibility(View.VISIBLE);
// Shows hint?
if (getThisOption("show_legend")) {
howDoesItWork.setVisibility(View.VISIBLE);
legend.setVisibility(View.VISIBLE);
hideHint.setVisibility(View.VISIBLE);
} else {
howDoesItWork.setVisibility(View.GONE);
legend.setVisibility(View.GONE);
}
// Shows results
resultsListView.setVisibility(View.VISIBLE);
}
}
public void launchSearchAction(String busStopID) {
if (busStopID.isEmpty()) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT)
.show();
} else if (!NetworkTools.isConnected(this)) {
NetworkTools.showNetworkError(this);
} else {
startSpinner();
myAsyncWget.cancel(true);
myAsyncWget = new MyAsyncWget();
myAsyncWget.execute(GTTSiteSucker
.arrivalTimesByLineQuery(busStopID));
}
}
+ public void launchSearchAction(Integer busStopID) {
+ launchSearchAction(String.valueOf((busStopID)));
+ }
+
public void addInFavorites(View v) {
if (lastSearchedBusStopID != null) {
ContentValues newValues = new ContentValues();
newValues.put(MyDB.BusStop.COLUMN_NAME_BUSSTOP_ISFAVORITE, 1);
db.update(MyDB.BusStop.TABLE_NAME, newValues, MyDB
.somethingEqualsInt(MyDB.BusStop.COLUMN_NAME_BUSSTOP_ID),
new String[] { String.valueOf(lastSearchedBusStopID) });
Toast.makeText(getApplicationContext(),
R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
}
}
public void onSearchClick(View v) {
launchSearchAction(busStopIDEditText.getText().toString());
}
// Hides hint
public void onHideHint(View v) {
howDoesItWork.setVisibility(View.GONE);
legend.setVisibility(View.GONE);
hideHint.setVisibility(View.GONE);
setThisOption("show_legend", false);
}
private void stopSpinner() {
annoyingSpinner.setVisibility(View.INVISIBLE);
+ swipeRefreshLayout.setRefreshing(false);
}
private void startSpinner() {
annoyingSpinner.setVisibility(View.VISIBLE);
}
private void hideKeyboard() {
View view = getCurrentFocus();
if (view != null) {
((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
.hideSoftInputFromWindow(view.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
}
private void setThisOption(String optionName, boolean value) {
SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
editor.putBoolean(optionName, value);
editor.commit();
}
private boolean getThisOption(String optionName) {
SharedPreferences preferences = getPreferences(MODE_PRIVATE);
return preferences.getBoolean(optionName, true);
}
}
\ No newline at end of file