diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b1a7bfc..4ae9015 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,88 +1,92 @@ - + + android:minSdkVersion="9" + android:targetSdkVersion="23"/> + + + - + android:theme="@style/AppTheme"> + - + android:host="www.gtt.to.it" + android:pathPrefix="/cms/percorari/arrivi" + android:scheme="http"/> - - + + + android:host="gtt.to.it" + android:pathPrefix="/cms/percorari/arrivi" + android:scheme="http"/> - + - - + + + android:host="m.gtt.to.it" + android:pathPrefix="/m/it/arrivi.jsp" + android:scheme="http"/> + android:name=".ActivityAbout" + android:label="@string/about" + android:parentActivityName=".ActivityMain" + android:theme="@style/AboutTheme"> + + android:name="android.support.PARENT_ACTIVITY" + android:value=".ActivityMain"/> + android:name=".ActivityFavorites" + android:label="@string/title_activity_favorites" + android:parentActivityName=".ActivityMain" + android:theme="@style/FavTheme"> + + android:name="android.support.PARENT_ACTIVITY" + android:value=".ActivityMain"/> + - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index ee27f1e..3918e06 100644 --- a/build.gradle +++ b/build.gradle @@ -1,52 +1,52 @@ buildscript { repositories { mavenCentral() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.1' } } apply plugin: 'com.android.application' android { - compileSdkVersion 23 + compileSdkVersion 25 buildToolsVersion '25.0.2' compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { - compile 'com.android.support:support-v4:23.4.0' - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:design:23.4.0' + compile 'com.android.support:support-v4:25.3.1' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:design:25.3.1' compile 'org.jsoup:jsoup:1.7.3' compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' } } dependencies { } diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index 0bcd239..93f6434 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,887 +1,568 @@ /* BusTO - Arrival times for Turin public transports. Copyright (C) 2014 Valerio Bozzolan This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ package it.reyboz.bustorino; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; -import android.database.sqlite.SQLiteDatabase; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; 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.*; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; //import com.melnykov.fab.FloatingActionButton; import android.support.design.widget.FloatingActionButton; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - import it.reyboz.bustorino.backend.ArrivalsFetcher; -import it.reyboz.bustorino.backend.Fetcher; import it.reyboz.bustorino.backend.FiveTScraperFetcher; import it.reyboz.bustorino.backend.FiveTStopsFetcher; import it.reyboz.bustorino.backend.GTTJSONFetcher; import it.reyboz.bustorino.backend.GTTStopsFetcher; -import it.reyboz.bustorino.backend.Palina; import it.reyboz.bustorino.backend.Stop; import it.reyboz.bustorino.backend.StopsFinderByName; +import it.reyboz.bustorino.fragments.FragmentHelper; import it.reyboz.bustorino.fragments.ResultListFragment; import it.reyboz.bustorino.middleware.*; -public class ActivityMain extends AppCompatActivity implements ResultListFragment.ResultFragmentListener { +public class ActivityMain extends GeneralActivity implements ResultListFragment.ResultFragmentListener { /* * Layout elements */ private EditText busStopSearchByIDEditText; private EditText busStopSearchByNameEditText; private ProgressBar progressBar; private TextView howDoesItWorkTextView; private Button hideHintButton; private MenuItem actionHelpMenuItem; private SwipeRefreshLayout swipeRefreshLayout; private FloatingActionButton floatingActionButton; private FragmentManager framan; /* * Search mode */ private static final int SEARCH_BY_NAME = 0; private static final int SEARCH_BY_ID = 1; private static final int SEARCH_BY_ROUTE = 2; // TODO: implement this (bug #1512948) private int searchMode; /* * Options */ private final String OPTION_SHOW_LEGEND = "show_legend"; /** * Last successfully searched bus stop ID */ public @Nullable Stop lastSuccessfullySearchedBusStop = null; /* // useful for testing: public class MockFetcher implements ArrivalsFetcher { @Override public Palina ReadArrivalTimesAll(String routeID, AtomicReference res) { SystemClock.sleep(5000); res.set(result.SERVER_ERROR); return new Palina(); } } private ArrivalsFetcher[] ArrivalFetchers = {new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher()};*/ private RecursionHelper ArrivalFetchersRecursionHelper = new RecursionHelper<>(new ArrivalsFetcher[] {new GTTJSONFetcher(), new FiveTScraperFetcher()}); private RecursionHelper StopsFindersByNameRecursionHelper = new RecursionHelper<>(new StopsFinderByName[] {new GTTStopsFetcher(), new FiveTStopsFetcher()}); private StopsDB stopsDB; private UserDB userDB; - + private FragmentHelper fh; ///////////////////////////////// EVENT HANDLERS /////////////////////////////////////////////// /* * @see swipeRefreshLayout */ private Handler handler = new Handler(); private final Runnable refreshing = new Runnable() { public void run() { - if (lastSuccessfullySearchedBusStop == null) { - Toast.makeText(getApplicationContext(), - R.string.query_too_short, Toast.LENGTH_SHORT).show(); - } else { - new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); - } + new AsyncDataDownload(AsyncDataDownload.RequestType.ARRIVALS,fh).execute(); } }; //// MAIN METHOD /// @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); framan = getSupportFragmentManager(); this.stopsDB = new StopsDB(getApplicationContext()); this.userDB = new UserDB(getApplicationContext()); setContentView(R.layout.activity_main); busStopSearchByIDEditText = (EditText) findViewById(R.id.busStopSearchByIDEditText); busStopSearchByNameEditText = (EditText) findViewById(R.id.busStopSearchByNameEditText); progressBar = (ProgressBar) findViewById(R.id.progressBar); howDoesItWorkTextView = (TextView) findViewById(R.id.howDoesItWorkTextView); hideHintButton = (Button) findViewById(R.id.hideHintButton); swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.listRefreshLayout); floatingActionButton = (FloatingActionButton) findViewById(R.id.floatingActionButton); framan.addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() { @Override public void onBackStackChanged() { Log.d("MainActivity, BusTO", "BACK STACK CHANGED"); } }); 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; } }); // 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 - + //swipeRefreshLayout.setColorSchemeColors(R.color.blue_500, R.color.orange_500); // setColorScheme is deprecated, setColorSchemeColors isn't + swipeRefreshLayout.setColorSchemeResources(R.color.blue_500,R.color.orange_500); + fh = new FragmentHelper(this,R.id.listRefreshLayout,R.id.resultFrame,FragmentHelper.NO_FRAME); setSearchModeBusStopID(); //---------------------------- START INTENT CHECK QUEUE ------------------------------------ // Intercept calls from URL intent boolean tryedFromIntent = false; String busStopID = null; String busStopDisplayName = 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"); busStopDisplayName = b.getString("bus-stop-display-name"); /** * 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 ArrivalFetchersRecursionHelper.reset(); Toast.makeText(getApplicationContext(), R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); } } else { // If you are here an intent has worked successfully setBusStopSearchByIDEditText(busStopID); this.lastSuccessfullySearchedBusStop = new Stop(busStopID); // forcing it as user name even though it could be standard name, it doesn't really matter this.lastSuccessfullySearchedBusStop.setStopUserName(busStopDisplayName); - new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + createFragmentForStop(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: " + lastSuccessfullySearchedBusStop); if (searchMode == SEARCH_BY_ID && lastSuccessfullySearchedBusStop != null) { setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStop.ID); - new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + //new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + new AsyncDataDownload(AsyncDataDownload.RequestType.ARRIVALS,fh).execute(); } + } @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.main, menu); actionHelpMenuItem = menu.findItem(R.id.action_help); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will // automatically handle clicks on the Home/Up button, so long // as you specify a parent activity in AndroidManifest.xml. switch (item.getItemId()) { case android.R.id.home: // Respond to the action bar's Up/Home button NavUtils.navigateUpFromSameTask(this); return true; case R.id.action_help: showHints(); return true; case R.id.action_favorites: startActivity(new Intent(ActivityMain.this, ActivityFavorites.class)); return true; case R.id.action_about: startActivity(new Intent(ActivityMain.this, ActivityAbout.class)); return true; case R.id.action_news: openIceweasel("http://blog.reyboz.it/tag/busto/"); return true; case R.id.action_bugs: openIceweasel("https://bugs.launchpad.net/bus-torino"); return true; case R.id.action_source: openIceweasel("https://code.launchpad.net/bus-torino"); return true; case R.id.action_licence: openIceweasel("http://www.gnu.org/licenses/gpl-3.0.html"); return true; case R.id.action_author: openIceweasel("http://boz.reyboz.it?lovebusto"); return true; } return super.onOptionsItemSelected(item); } /** * OK this is pure shit * * @param v View clicked */ public void onSearchClick(View v) { if (searchMode == SEARCH_BY_ID) { String busStopID = busStopSearchByIDEditText.getText().toString(); - new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + //OLD ASYNCTASK + //new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + + if(busStopID == null || busStopID.length() <= 0) { + showMessage(R.string.insert_bus_stop_number_error); + toggleSpinner(false); + } else + new AsyncDataDownload(AsyncDataDownload.RequestType.ARRIVALS,fh).execute(busStopID); } else { // searchMode == SEARCH_BY_NAME String query = busStopSearchByNameEditText.getText().toString(); - new asyncWgetBusStopSuggestions(query, stopsDB, StopsFindersByNameRecursionHelper); + //new asyncWgetBusStopSuggestions(query, stopsDB, StopsFindersByNameRecursionHelper); + new AsyncDataDownload(AsyncDataDownload.RequestType.STOPS,fh).execute(query); } } /** * @author Fabio Mazza * This is necessary for the fragment to update the StopDB * @return the last succeffuly searched bus stop, if not null */ public Stop getLastSuccessfullySearchedBusStop() { if(lastSuccessfullySearchedBusStop!=null) return lastSuccessfullySearchedBusStop; else return null; } @Override public void createFragmentForStop(String ID) { - new asyncWgetBusStopFromBusStopID(ID, ArrivalFetchersRecursionHelper,lastSuccessfullySearchedBusStop); + //new asyncWgetBusStopFromBusStopID(ID, ArrivalFetchersRecursionHelper,lastSuccessfullySearchedBusStop); + if(ID == null || ID.length() <= 0) { + // we're still in UI thread, no need to mess with Progress + showMessage(R.string.insert_bus_stop_number_error); + toggleSpinner(false); + } else + new AsyncDataDownload(AsyncDataDownload.RequestType.ARRIVALS,fh).execute(ID); } /** * QR scan button clicked * * @param v View QRButton clicked */ public void onQRButtonClick(View v) { IntentIntegrator integrator = new IntentIntegrator(this); integrator.initiateScan(); } /** * Receive the Barcode Scanner Intent * */ public void onActivityResult(int requestCode, int resultCode, Intent intent) { IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); Uri uri; try { uri = Uri.parse(scanResult != null ? scanResult.getContents() : null); // this apparently prevents NullPointerException. Somehow. } catch (NullPointerException e) { Toast.makeText(getApplicationContext(), R.string.no_qrcode, Toast.LENGTH_SHORT).show(); return; } String busStopID = getBusStopIDFromUri(uri); busStopSearchByIDEditText.setText(busStopID); - new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); + createFragmentForStop(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(); } } } - /* - ***************************************************************************************** - **** STOP FINDER BY NAME **** - ***************************************************************************************** - */ - - private class asyncWgetBusStopSuggestions extends AsyncWget { - private final String query; - private AtomicReference res; - private List stopList; - private StopsDB db; - String fragTag; - - asyncWgetBusStopSuggestions(@Nullable String query, @NonNull StopsDB sdb, @NonNull RecursionHelper r) { - super(getApplicationContext(), r); - - toggleSpinner(true); - this.query = query; - this.res = new AtomicReference<>(); - this.db = sdb; - - r.reset(); - - if(query == null || query.length() <= 0) { - Toast.makeText(this.c, - R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show(); - toggleSpinner(false); - } else { - fragTag = "stop_search_"+query; - this.execute(); - } - } - - @Override - protected boolean tryFetcher(StopsFinderByName f) { - // gets opened multiple times, whatever. - this.db.openIfNeeded(); - this.stopList = f.FindByName(this.query, this.db, this.res); - this.db.closeIfNeeded(); - - // TODO: handle errors in a clearer/cleaner way (users see some random toasts after a while and sometimes still get results from a fetcher) - - switch (this.res.get()) { - case CLIENT_OFFLINE: - publishProgress(R.string.network_error); - return false; - case SERVER_ERROR: - if (isConnected()) { - publishProgress(R.string.parsing_error); - } else { - publishProgress(R.string.network_error); - } - return false; - case PARSER_ERROR: - default: - publishProgress(R.string.internal_error); - return false; - case QUERY_TOO_SHORT: - publishProgress(R.string.query_too_short); - return false; - case EMPTY_RESULT_SET: - publishProgress(R.string.no_bus_stop_have_this_name); - return false; - case OK: - return true; - } - } - - @Override - protected void onPostExecute(Void useless) { - // something really bad happened - if(this.isCancelled() || !this.terminated || this.stopList == null) { - toggleSpinner(false); - this.onCancelled(); - - return; - } - - // no results - if(this.failedAll) { - toggleSpinner(false); - // TODO: an error message would be a good idea, here - return; - } - - hideKeyboard(); - - //CREATE THE FRAGMENT - FragmentTransaction transaction = framan.beginTransaction(); - ResultListFragment listfragment = ResultListFragment.newInstance(ResultListFragment.TYPE_STOPS); - transaction.replace(R.id.resultFrame,listfragment, fragTag); - transaction.addToBackStack(fragTag); - transaction.commit(); - //Apparently, the fragment creation is asynchronous, but we need the fragment, NOW! - framan.executePendingTransactions(); - - prepareGUIForBusStops(); - - listfragment.setTextViewMessage(getString(R.string.results)); - listfragment.setListAdapter(new StopAdapter(this.c, this.stopList)); - //listfragment.attachFABToListView(); TODO - - toggleSpinner(false); - } - - @Override - protected void onCancelled() { - toggleSpinner(false); - } - } - - /* - ***************************************************************************************** - **** ARRIVALS FETCHER **** - ***************************************************************************************** - */ - - private class asyncWgetBusStopFromBusStopID extends AsyncWget { - private final String stopID; - private AtomicReference res; - private Palina p; - String fragmentTag; - boolean sameBusStopAsBefore = false; - /** - * Begins its life as a copy of lastSuccessfullySearchedBusStop, ends as null if it needs - * replacing or stays the same if it stayed the same - */ - private Stop lastSearchedBusStop; - - asyncWgetBusStopFromBusStopID(@Nullable String stopID, @NonNull RecursionHelper r, @Nullable Stop lastSearchedBusStop) { - super(getApplicationContext(), r); - - toggleSpinner(true); - this.stopID = stopID; - this.lastSearchedBusStop = lastSearchedBusStop; - this.res = new AtomicReference<>(); - - if(stopID == null || stopID.length() <= 0) { - // we're still in UI thread, no need to mess with Progress - Toast.makeText(this.c, - R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); - toggleSpinner(false); - } else { - //In case the query works, the fragment tag is the stop ID - this.execute(); - } - - } - - @Override - protected boolean tryFetcher(ArrivalsFetcher fetcher) { - this.p = fetcher.ReadArrivalTimesAll(this.stopID, this.res); - - switch(this.res.get()) { - case CLIENT_OFFLINE: - publishProgress(R.string.network_error); - return false; - case SERVER_ERROR: - if(isConnected()) { - publishProgress(R.string.parsing_error); - } else { - publishProgress(R.string.network_error); - } - return false; - case QUERY_TOO_SHORT: // should never happen here, but to err on the side of caution... - publishProgress(R.string.query_too_short); - return false; - case PARSER_ERROR: - default: // there are no other cases but Android Studio is still complaining... - publishProgress(R.string.internal_error); - return false; - case EMPTY_RESULT_SET: - publishProgress(R.string.no_passages); - return false; - case OK: - // WARNING: lots of branches ahead. - - // did we search for anything? - if(this.lastSearchedBusStop != null) { - // check that we don't have the same stop - if(!this.lastSearchedBusStop.ID.equals(p.ID)) { - // remove it, get new name - this.lastSearchedBusStop = null; - getNameOrGetRekt(); - } else { - // searched and it's the same - String sn = lastSearchedBusStop.getStopDisplayName(); - if(sn == null) { - // something really bad happened, start from scratch - this.lastSearchedBusStop = null; - getNameOrGetRekt(); - } else { - // "merge" Stop over Palina and we're good to go - this.p.mergeNameFrom(lastSearchedBusStop); - } - } - } else { - // we haven't searched anything yet - getNameOrGetRekt(); - } - return true; - } - } - - /** - * Run this in a background thread.
- * Sets a stop name for this.palina, guaranteed not to be null! - */ - private void getNameOrGetRekt() { - String nameMaybe; - SQLiteDatabase udb = userDB.getReadableDatabase(); - - // does it already have a name (for fetchers that support it, or already got from favorites)? - nameMaybe = this.p.getStopDisplayName(); - if(nameMaybe != null && nameMaybe.length() > 0) { - return; - } - - // ok, let's search favorites. - - String usernameMaybe = UserDB.getStopUserName(udb, this.p.ID); - if(usernameMaybe != null && usernameMaybe.length() > 0) { - this.p.setStopUserName(usernameMaybe); - return; - } - - - // let's try StopsDB, then. - - StopsDB db = new StopsDB(this.c); - - db.openIfNeeded(); - nameMaybe = db.getNameFromID(this.p.ID); - db.closeIfNeeded(); - - if(nameMaybe != null && nameMaybe.length() > 0) { - this.p.setStopName(nameMaybe); - return; - } - - // no name to be found anywhere, don't bother searching it next time - this.p.setStopName(""); - } - - @Override - protected void onPostExecute(Void useless) { - - boolean refreshing = false; - // something really bad happened - if(this.isCancelled() || !this.terminated || this.p == null) { - toggleSpinner(false); - this.onCancelled(); - return; - } - - // no results - if(this.failedAll) { - toggleSpinner(false); - // TODO: an error message would be a good idea, here - return; - } - - - hideKeyboard(); - ResultListFragment listFragment; - //Detect if we need to update the data rather than create a new fragment for a new stop - if(swipeRefreshLayout.isRefreshing()) - refreshing=true; - else if(framan.findFragmentById(R.id.resultFrame) instanceof ResultListFragment) { - listFragment = (ResultListFragment) framan.findFragmentById(R.id.resultFrame); - if (listFragment.getResultsListView().getAdapter() instanceof PalinaAdapter && listFragment.getTag().equals(p.ID)) - refreshing = true; - } else refreshing = false; - - - if(this.lastSearchedBusStop == null) { - // did we gather any new information about this Stop? Then update it (casting from Palina) - lastSuccessfullySearchedBusStop = this.p; - } - - - fragmentTag = p.ID; - //DO THE FRAGMENT TRANSACTION - if(!refreshing) { - FragmentTransaction transaction = framan.beginTransaction(); - listFragment = ResultListFragment.newInstance(ResultListFragment.TYPE_LINES); - transaction.replace(R.id.resultFrame, listFragment, fragmentTag); - transaction.addToBackStack(fragmentTag); - transaction.commit(); - //Apparently, the fragment creation is asynchronous, but we need the fragment, NOW! - framan.executePendingTransactions(); - } else { - Log.d("BusTO", "Same bus stop, accessing existing fragment"); - listFragment = (ResultListFragment) framan.findFragmentByTag(fragmentTag); - } - - String displayName = p.getStopDisplayName(); - String displayStuff; - - if (displayName != null && displayName.length() > 0) { - displayStuff = p.ID.concat(" - ").concat(displayName); - } else { - displayStuff = p.ID; - } - listFragment.setTextViewMessage(String.format( - getString(R.string.passages), displayStuff)); - // Shows hints - if (getOption(OPTION_SHOW_LEGEND, true)) { - showHints(); - } //else { - // hideHints(); - //} - - prepareGUIForBusLines(); - - listFragment.setListAdapter(new PalinaAdapter(this.c, p)); - if(!sameBusStopAsBefore) - //listFragment.attachFABToListView(); TODO - - toggleSpinner(false); - } - - @Override - protected void onCancelled() { - toggleSpinner(false); - } - } ///////////////////////////////// OTHER STUFF ////////////////////////////////////////////////// - private boolean isConnected() { - ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); - return networkInfo != null && networkInfo.isConnected(); - } + /** * This method is not really necessary anymore... */ @Deprecated public void addToFavorites(View v) { if(lastSuccessfullySearchedBusStop != null) { new AsyncAddToFavorites(this).execute(lastSuccessfullySearchedBusStop); } } - // TODO: try to move these 2 methods to a separate class - - private void setOption(String optionName, boolean value) { - SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit(); - editor.putBoolean(optionName, value); - editor.commit(); - } - - private boolean getOption(String optionName, boolean optDefault) { - SharedPreferences preferences = getPreferences(MODE_PRIVATE); - return preferences.getBoolean(optionName, optDefault); - } - ////////////////////////////////////// GUI HELPERS ///////////////////////////////////////////// - - private void showKeyboard() { + @Override + public 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); - } + @Override + public void showMessage(int messageID) { + Toast.makeText(getApplicationContext(), messageID, Toast.LENGTH_SHORT).show(); } 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); } + //TODO: toggle spinner from mainActivity - private void toggleSpinner(boolean enable) { + @Override + public void toggleSpinner(boolean enable) { if (enable) { //already set by the RefreshListener when needed //swipeRefreshLayout.setRefreshing(true); progressBar.setVisibility(View.VISIBLE); } else { swipeRefreshLayout.setRefreshing(false); progressBar.setVisibility(View.GONE); } } private void prepareGUIForBusLines() { swipeRefreshLayout.setEnabled(true); swipeRefreshLayout.setVisibility(View.VISIBLE); actionHelpMenuItem.setVisible(true); } private void prepareGUIForBusStops() { swipeRefreshLayout.setEnabled(false); swipeRefreshLayout.setVisibility(View.VISIBLE); actionHelpMenuItem.setVisible(false); } + /** + * This provides a temporary fix to make the transition + * to a single asynctask go smoother + * @param fragmentType the type of fragment created + */ + @Override + public void readyGUIfor(String fragmentType) { + hideKeyboard(); + if(fragmentType==null) Log.e("ActivityMain","Problem with fragmentType"); + else + switch (fragmentType){ + case ResultListFragment.TYPE_LINES: + prepareGUIForBusLines(); + if (getOption(OPTION_SHOW_LEGEND, true)) { + showHints(); + } + break; + case ResultListFragment.TYPE_STOPS: + prepareGUIForBusStops(); + break; + default: + Log.e("BusTO Activity","Called readyGUI with unsupported type of Fragment"); + return; + } + // Shows hints + + } /** * Open an URL in the default browser. * * @param url URL */ public void openIceweasel(String url) { Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); startActivity(browserIntent1); } ///////////////////// INTENT HELPER //////////////////////////////////////////////////////////// /** * Try to extract the bus stop ID from a URi * * @param uri The URL * @return bus stop ID or null */ public static String getBusStopIDFromUri(Uri uri) { String busStopID; // everithing catches fire when passing null to a switch. String host = uri.getHost(); if(host == null) { Log.e("ActivityMain", "Not an URL: " + uri); return null; } switch(host) { case "m.gtt.to.it": // http://m.gtt.to.it/m/it/arrivi.jsp?n=1254 busStopID = uri.getQueryParameter("n"); if (busStopID == null) { Log.e("ActivityMain", "Expected ?n from: " + uri); } break; case "www.gtt.to.it": case "gtt.to.it": // http://www.gtt.to.it/cms/percorari/arrivi?palina=1254 busStopID = uri.getQueryParameter("palina"); if (busStopID == null) { Log.e("ActivityMain", "Expected ?palina from: " + uri); } break; default: Log.e("ActivityMain", "Unexpected intent URL: " + uri); busStopID = null; } return busStopID; } } \ No newline at end of file diff --git a/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java b/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java index 80785e2..dde6db2 100644 --- a/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java +++ b/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java @@ -1,188 +1,191 @@ /* 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; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; public class GTTStopsFetcher implements StopsFinderByName { @Override @NonNull public List FindByName(String name, StopsDBInterface db, AtomicReference res) { URL url; // sorting an ArrayList should be faster than a LinkedList and the API is limited to 15 results List s = new ArrayList<>(15); List s2 = new ArrayList<>(15); String fullname; String content; String bacino; String localita; Route.Type type; JSONArray json; int howManyStops, i; JSONObject thisstop; if(name.length() < 3) { res.set(result.QUERY_TOO_SHORT); return s; } try { url = new URL("http://www.gtt.to.it/cms/components/com_gtt/views/palinejson/view.html.php?term=" + URLEncoder.encode(name, "utf-8")); } catch (Exception e) { res.set(result.PARSER_ERROR); return s; } content = networkTools.queryURL(url, res); if(content == null) { return s; } try { json = new JSONArray(content); } catch(JSONException e) { if(content.contains("[]")) { // when no results are found, server returns a PHP Warning and an empty array. In case they fix the warning, we're looking for the array. res.set(result.EMPTY_RESULT_SET); } else { res.set(result.PARSER_ERROR); } return s; } howManyStops = json.length(); if(howManyStops == 0) { res.set(result.EMPTY_RESULT_SET); return s; } try { for(i = 0; i < howManyStops; i++) { thisstop = json.getJSONObject(i); fullname = thisstop.getString("data"); String ID = thisstop.getString("value"); try { localita = thisstop.getString("localita"); if(localita.equals("[MISSING]")) { localita = null; } } catch(JSONException e) { localita = null; } + /* if(localita == null || localita.length() == 0) { localita = db.getLocationFromID(ID); } + //TODO: find località by ContentProvider + */ try { bacino = thisstop.getString("bacino"); } catch (JSONException ignored) { bacino = "U"; } if(fullname.startsWith("Metro ")) { type = Route.Type.METRO; } else if(fullname.length() >= 6 && fullname.startsWith("S00")) { type = Route.Type.RAILWAY; } else if(fullname.startsWith("ST")) { type = Route.Type.RAILWAY; } else { type = FiveTNormalizer.decodeType("", bacino); } - + //TODO: refactor using content provider s.add(new Stop(fullname, ID, localita, type, db.getRoutesByStop(ID))); } } catch (JSONException e) { res.set(result.PARSER_ERROR); return s; } if(s.size() < 1) { // shouldn't happen but prevents the next part from catching fire res.set(result.EMPTY_RESULT_SET); return s; } Collections.sort(s); // the next loop won't work with less than 2 items if(s.size() < 2) { res.set(result.OK); return s; } /* There are some duplicate stops returned by this API. * Long distance buses have stop IDs with 5 digits. Always. They are zero-padded if there * aren't enough. E.g. stop 631 becomes 00631. * * Unfortunately you can't use padded stops to query any API. * Fortunately, unpadded stops return both normal and long distance bus timetables. * FiveTNormalizer is already removing padding (there may be some padded stops for which the * API doesn't return an unpadded equivalent), here we'll remove duplicates by skipping * padded stops, which also never have a location. * * I had to draw a finite state machine on a piece of paper to understand how to implement * this loop. */ for(i = 1; i < howManyStops; ) { Stop current = s.get(i); Stop previous = s.get(i-1); // same stop: let's see which one to keep... if(current.ID.equals(previous.ID)) { if(previous.location == null) { // previous one is useless: discard it, increment i++; } else if(current.location == null) { // this one is useless: add previous and skip one s2.add(previous); i += 2; } else { // they aren't really identical: to err on the side of caution, keep them both. s2.add(previous); i++; } } else { // different: add previous, increment s2.add(previous); i++; } } // unless the last one was garbage (i would be howManyStops+1 in that case), add it if(i == howManyStops) { s2.add(s.get(i-1)); } res.set(result.OK); return s2; } } diff --git a/src/it/reyboz/bustorino/fragments/FragmentHelper.java b/src/it/reyboz/bustorino/fragments/FragmentHelper.java new file mode 100644 index 0000000..bf0e75d --- /dev/null +++ b/src/it/reyboz/bustorino/fragments/FragmentHelper.java @@ -0,0 +1,172 @@ +/* + BusTO (fragments) + Copyright (C) 2018 Fabio Mazza + + 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.fragments; + + +import android.database.sqlite.SQLiteDatabase; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.support.v4.widget.SwipeRefreshLayout; +import android.util.Log; +import it.reyboz.bustorino.R; +import it.reyboz.bustorino.backend.Fetcher; +import it.reyboz.bustorino.backend.Palina; +import it.reyboz.bustorino.backend.Stop; +import it.reyboz.bustorino.middleware.*; + +import java.util.List; + +public class FragmentHelper { + GeneralActivity act; + private Stop lastSuccessfullySearchedBusStop; + private int primaryFrameLayout,secondaryFrameLayout, swipeRefID; + public static final int NO_FRAME = -3; + UserDB userDB; + StopsDB stopsDB; + + public FragmentHelper(GeneralActivity act, int swipeRefID, int mainFrame) { + this(act,swipeRefID,mainFrame,NO_FRAME); + } + + public FragmentHelper(GeneralActivity act, int swipeRefID, int primaryFrameLayout, int secondaryFrameLayout) { + this.act = act; + this.swipeRefID = swipeRefID; + this.primaryFrameLayout = primaryFrameLayout; + this.secondaryFrameLayout = secondaryFrameLayout; + stopsDB = new StopsDB(act); + userDB = new UserDB(act); + } + + public Stop getLastSuccessfullySearchedBusStop() { + return lastSuccessfullySearchedBusStop; + } + + public void setLastSuccessfullySearchedBusStop(Stop stop) { + this.lastSuccessfullySearchedBusStop = stop; + } + + public void createOrUpdateStopFragment(Palina p){ + boolean refreshing; + ResultListFragment listFragment; + + if(act==null) { + //SOMETHING WENT VERY WRONG + return; + } + + SwipeRefreshLayout srl = (SwipeRefreshLayout) act.findViewById(swipeRefID); + FragmentManager fm = act.getSupportFragmentManager(); + //DON'T UNDERSTAND WHY BUT IT SAYS IT'S NULL REFERENCE + if(srl.isRefreshing()) + refreshing=true; + else if(fm.findFragmentById(R.id.resultFrame) instanceof ResultListFragment) { + listFragment = (ResultListFragment) fm.findFragmentById(R.id.resultFrame); + refreshing = listFragment.isFragmentForTheSameStop(p); + } else + refreshing = false; + + setLastSuccessfullySearchedBusStop(p); + + if(!refreshing) { + //set the String to be displayed on the fragment + String displayName = p.getStopDisplayName(); + String displayStuff; + + if (displayName != null && displayName.length() > 0) { + displayStuff = p.ID.concat(" - ").concat(displayName); + } else { + displayStuff = p.ID; + } + listFragment = ResultListFragment.newInstance(ResultListFragment.TYPE_LINES,displayStuff); + attachFragmentToContainer(fm,listFragment,true,ResultListFragment.getFragmentTag(p)); + } else { + Log.d("BusTO", "Same bus stop, accessing existing fragment"); + listFragment = (ResultListFragment) fm.findFragmentById(R.id.resultFrame); + } + + listFragment.setListAdapter(new PalinaAdapter(act.getApplicationContext(),p)); + act.hideKeyboard(); + if (act instanceof FragmentListener) ((FragmentListener) act).readyGUIfor(ResultListFragment.TYPE_LINES); + + toggleSpinner(false); + } + public void createFragmentFor(List resultList,String query){ + act.hideKeyboard(); + ResultListFragment listfragment = ResultListFragment.newInstance(ResultListFragment.TYPE_STOPS); + attachFragmentToContainer(act.getSupportFragmentManager(),listfragment,false,"search_"+query); + if (act instanceof FragmentListener) ((FragmentListener) act).readyGUIfor(ResultListFragment.TYPE_STOPS); + listfragment.setListAdapter(new StopAdapter(act.getApplicationContext(), resultList)); + toggleSpinner(false); + + } + public void toggleSpinner(boolean on){ + if (act instanceof FragmentListener) + ((FragmentListener) act).toggleSpinner(on); + else { + SwipeRefreshLayout srl = (SwipeRefreshLayout) act.findViewById(swipeRefID); + srl.setRefreshing(false); + } + } + private void attachFragmentToContainer(FragmentManager fm,Fragment fragment, boolean sendToSecondaryFrame, String tag){ + FragmentTransaction ft = fm.beginTransaction(); + if(sendToSecondaryFrame && secondaryFrameLayout!=NO_FRAME) + ft.replace(secondaryFrameLayout,fragment,tag); + else ft.replace(primaryFrameLayout,fragment,tag); + ft.addToBackStack("state_"+tag); + ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE); + ft.commit(); + //fm.executePendingTransactions(); + } + public boolean isActivityReferenceNull(){ + return act==null; + } + + //Find a way to open databases + public SQLiteDatabase openStopsDB(){ + return stopsDB.openIfNeeded(); + } + + public void showErrorMessage(Fetcher.result res){ + //TODO: implement a common set of errors for all fragments + switch (res){ + case OK: + break; + case CLIENT_OFFLINE: + act.showMessage(R.string.network_error); + break; + case SERVER_ERROR: + if (act.isConnected()) { + act.showMessage(R.string.parsing_error); + } else { + act.showMessage(R.string.network_error); + } + case PARSER_ERROR: + default: + act.showMessage(R.string.internal_error); + break; + case QUERY_TOO_SHORT: + act.showMessage(R.string.query_too_short); + break; + case EMPTY_RESULT_SET: + act.showMessage(R.string.no_bus_stop_have_this_name); + break; + } + } + +} diff --git a/src/it/reyboz/bustorino/fragments/FragmentKind.java b/src/it/reyboz/bustorino/fragments/FragmentKind.java new file mode 100644 index 0000000..4564972 --- /dev/null +++ b/src/it/reyboz/bustorino/fragments/FragmentKind.java @@ -0,0 +1,22 @@ +/* + BusTO (fragments) + Copyright (C) 2018 Fabio Mazza + + 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.fragments; + +public enum FragmentKind { + STOPS,ARRIVALS,FAVORITES +} diff --git a/src/it/reyboz/bustorino/fragments/FragmentListener.java b/src/it/reyboz/bustorino/fragments/FragmentListener.java new file mode 100644 index 0000000..69ee268 --- /dev/null +++ b/src/it/reyboz/bustorino/fragments/FragmentListener.java @@ -0,0 +1,13 @@ +package it.reyboz.bustorino.fragments; + +import it.reyboz.bustorino.backend.Palina; + +public interface FragmentListener { + void toggleSpinner(boolean state); + /** + * Sends the message to the activity to adapt the GUI + * to the fragment that has been attached + * @param fragmentType the type of fragment attached + */ + void readyGUIfor(String fragmentType); +} diff --git a/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/src/it/reyboz/bustorino/fragments/ResultListFragment.java index f79241f..c390edf 100644 --- a/src/it/reyboz/bustorino/fragments/ResultListFragment.java +++ b/src/it/reyboz/bustorino/fragments/ResultListFragment.java @@ -1,322 +1,356 @@ /* BusTO - Fragments components Copyright (C) 2016 Fabio Mazza 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.fragments; import android.content.Context; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.widget.SwipeRefreshLayout; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.*; import android.support.design.widget.FloatingActionButton; import it.reyboz.bustorino.ActivityMain; import it.reyboz.bustorino.R; import it.reyboz.bustorino.backend.FiveTNormalizer; +import it.reyboz.bustorino.backend.Palina; import it.reyboz.bustorino.backend.Route; import it.reyboz.bustorino.backend.Stop; import it.reyboz.bustorino.middleware.AsyncAddToFavorites; +import it.reyboz.bustorino.middleware.PalinaAdapter; /** * This is a generalized fragment that can be used both for * * */ public class ResultListFragment extends Fragment { // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String LIST_TYPE = "list-type"; + private static final String STOP_TITLE = "messageExtra"; + + public static final String TYPE_LINES ="lines"; public static final String TYPE_STOPS = "fermate"; private static final String MESSAGE_TEXT_VIEW ="message_text_view"; private String adapterType; - + private boolean adapterSet = false; private ResultFragmentListener mListener; private TextView messageTextView; FloatingActionButton fabutton; private ListView resultsListView; ListAdapter mListAdapter = null; boolean listShown; public ResultListFragment() { // Required empty public constructor } public ListView getResultsListView() { return resultsListView; } /** * Use this factory method to create a new instance of * this fragment using the provided parameters. * * @param listType whether the list is used for STOPS or LINES (Orari) * @return A new instance of fragment ResultListFragment. */ - public static ResultListFragment newInstance(String listType) { + public static ResultListFragment newInstance(String listType,String eventualStopTitle) { ResultListFragment fragment = new ResultListFragment(); Bundle args = new Bundle(); args.putString(LIST_TYPE, listType); + if(eventualStopTitle!=null) + args.putString(STOP_TITLE,eventualStopTitle); fragment.setArguments(args); return fragment; } - + public static ResultListFragment newInstance(String listType){ + return newInstance(listType,null); + } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { adapterType = getArguments().getString(LIST_TYPE); } } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { hideMyFAB mInterface = new hideMyFAB() { @Override public void showFloatingActionButton(boolean show) { if (fabutton!=null){ if(show) fabutton.show(); else fabutton.hide(); } } }; View root = inflater.inflate(R.layout.fragment_list_view, container, false); messageTextView = (TextView) root.findViewById(R.id.messageTextView); if(adapterType!=null) { resultsListView = (ListView) root.findViewById(R.id.resultsListView); if(adapterType.equals(TYPE_STOPS)) { resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { /* * Casting because of Javamerda * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener */ Stop busStop = (Stop) parent.getItemAtPosition(position); mListener.createFragmentForStop(busStop.ID); } }); resultsListView.setOnScrollListener(new ListFragmentScrollListener(false,mInterface)); + + //set the textviewMessage + setTextViewMessage(getString(R.string.results)); } else if(adapterType.equals(TYPE_LINES)) { resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { String routeName; Route r = (Route) parent.getItemAtPosition(position); routeName = FiveTNormalizer.routeInternalToDisplay(r.name); if (routeName == null) { routeName = r.name; } if (r.destinazione == null || r.destinazione.length() == 0) { Toast.makeText(getContext(), getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show(); } else { Toast.makeText(getContext(), getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show(); } } }); + String displayName = getArguments().getString(STOP_TITLE); + setTextViewMessage(String.format( + getString(R.string.passages), displayName)); resultsListView.setOnScrollListener(new ListFragmentScrollListener(true,mInterface)); } String probablemessage = getArguments().getString(MESSAGE_TEXT_VIEW); if(probablemessage!=null) { //Log.d("BusTO fragment " + this.getTag(), "We have a possible message here in the savedInstaceState: " + probablemessage); messageTextView.setText(probablemessage); messageTextView.setVisibility(View.VISIBLE); } } else Log.d(getString(R.string.list_fragment_debug), "No content root for fragment"); return root; } + public boolean isFragmentForTheSameStop(Palina p){ + return adapterType.equals(TYPE_LINES) && getTag().equals(getFragmentTag(p)); + } + public static String getFragmentTag(Palina p){ + return p.ID; + } @Override public void onResume() { super.onResume(); //Log.d(getString(R.string.list_fragment_debug),"Fragment restored, saved listAdapter is "+(mListAdapter)); if(mListAdapter!=null){ ListAdapter adapter = mListAdapter; mListAdapter = null; setListAdapter(adapter); } + mListener.readyGUIfor(adapterType); + } @Override public void onPause() { if(adapterType.equals(TYPE_LINES)) { SwipeRefreshLayout reflay = (SwipeRefreshLayout) getActivity().findViewById(R.id.listRefreshLayout); reflay.setEnabled(false); Log.d("BusTO Fragment " + this.getTag(), "RefreshLayout disabled"); } super.onPause(); } @Override public void onAttach(Context context) { super.onAttach(context); if (context instanceof ResultFragmentListener) { mListener = (ResultFragmentListener) context; fabutton = (FloatingActionButton) getActivity().findViewById(R.id.floatingActionButton); } else { throw new RuntimeException(context.toString() + " must implement ResultFragmentListener"); } + + } @Override public void onDetach() { mListener = null; if(fabutton!=null) fabutton.show(); super.onDetach(); } @Override public void onDestroyView() { resultsListView = null; //Log.d(getString(R.string.list_fragment_debug), "called onDestroyView"); getArguments().putString(MESSAGE_TEXT_VIEW, messageTextView.getText().toString()); super.onDestroyView(); } public void setListAdapter(ListAdapter adapter) { boolean hadAdapter = mListAdapter != null; mListAdapter = adapter; if (resultsListView != null) { resultsListView.setAdapter(adapter); resultsListView.setVisibility(View.VISIBLE); } } /** * This method attaches the FloatingActionButton to the current ListView */ /* TODO REWORKING public void attachFABToListView(){ if(resultsListView!=null) switch(adapterType){ case TYPE_LINES: fabutton.attachToListView(resultsListView, null, new ListFragmentScrollListener()); break; default: fabutton.attachToListView(resultsListView); break; } } */ public void setTextViewMessage(String message){ messageTextView.setText(message); switch (adapterType){ case TYPE_LINES: final ActivityMain activ = (ActivityMain) getActivity(); messageTextView.setClickable(true); messageTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { new AsyncAddToFavorites(getContext()).execute(activ.getLastSuccessfullySearchedBusStop()); } }); break; case TYPE_STOPS: messageTextView.setClickable(false); break; } messageTextView.setVisibility(View.VISIBLE); } + /** + * This methods sets both the adapter and the textviewMessage + * Do not call when the fragment shows a list of stops + * @param p the palina to get the info from + * TODO: overload it so that it can be used also by the STOPS + */ + + + /** * This interface is useful for communicating with the activity * The name has been automatically generated (do not blame me) */ - public interface ResultFragmentListener { + public interface ResultFragmentListener extends FragmentListener{ /** * Houston, we need another fragment! * @param ID the Stop ID */ void createFragmentForStop(String ID); } /** * Classe per gestire gli scroll * */ class ListFragmentScrollListener implements AbsListView.OnScrollListener{ boolean enableRefreshLayout,lastScrollUp=false; int mLastFirstVisibleItem; hideMyFAB fabInterface; public ListFragmentScrollListener(boolean enableRefreshLayout, hideMyFAB iface){ this.enableRefreshLayout = enableRefreshLayout; this.fabInterface = iface; } @Override public void onScrollStateChanged(AbsListView view, int scrollState) { /* * This seems to be a totally useless method */ } @Override public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { if (firstVisibleItem!=0) { if (mLastFirstVisibleItem < firstVisibleItem) { Log.i("Busto", "Scrolling DOWN"); fabInterface.showFloatingActionButton(false); //lastScrollUp = true; } else if (mLastFirstVisibleItem > firstVisibleItem) { Log.i("Busto", "Scrolling UP"); fabInterface.showFloatingActionButton(true); //lastScrollUp = false; } mLastFirstVisibleItem = firstVisibleItem; } if(enableRefreshLayout){ SwipeRefreshLayout refreshLayout = (SwipeRefreshLayout) getActivity().findViewById(R.id.listRefreshLayout); boolean enable = false; if(view != null && view.getChildCount() > 0){ // check if the first item of the list is visible boolean firstItemVisible = view.getFirstVisiblePosition() == 0; // check if the top of the first item is visible boolean topOfFirstItemVisible = view.getChildAt(0).getTop() == 0; // enabling or disabling the refresh layout enable = firstItemVisible && topOfFirstItemVisible; } refreshLayout.setEnabled(enable); Log.d(getString(R.string.list_fragment_debug),"onScroll active, first item visible: "+firstVisibleItem+", refreshlayout enabled: "+enable); }} } } interface hideMyFAB { void showFloatingActionButton(boolean show); } diff --git a/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java b/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java new file mode 100644 index 0000000..9d02128 --- /dev/null +++ b/src/it/reyboz/bustorino/middleware/AsyncDataDownload.java @@ -0,0 +1,243 @@ +/* + BusTO (middleware) + Copyright (C) 2018 Fabio Mazza + + 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.database.sqlite.SQLiteDatabase; +import android.os.AsyncTask; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import it.reyboz.bustorino.R; +import it.reyboz.bustorino.backend.*; +import it.reyboz.bustorino.fragments.FragmentHelper; + +import java.lang.ref.WeakReference; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +/** + * This should be used to download data, but not to display it + */ +public class AsyncDataDownload extends AsyncTask{ + + private static final String TAG = "BusTO-DataDownload"; + private boolean failedAll = false; + + private AtomicReference res; + private RequestType t; + private String query; + WeakReference helperRef; + + + public AsyncDataDownload(RequestType type,FragmentHelper fh) { + t = type; + helperRef = new WeakReference<>(fh); + res = new AtomicReference<>(); + } + + @Override + protected Object doInBackground(String... params) { + RecursionHelper r; + boolean success=false; + Object result; + switch (t){ + case ARRIVALS: + r = new RecursionHelper<>(new ArrivalsFetcher[] {new GTTJSONFetcher(), new FiveTScraperFetcher()}); + break; + case STOPS: + r = new RecursionHelper<>(new StopsFinderByName[] {new GTTStopsFetcher(), new FiveTStopsFetcher()}); + break; + default: + //TODO put error message + cancel(true); + return null; + } + //res.get()!= Fetcher.result.OK + FragmentHelper fh = helperRef.get(); + if (fh == null){ + cancel(true); + return null; + } + + //Log.d(TAG,"refresh layout reference is: "+fh.isRefreshLayoutReferenceTrue()); + while(r.valid()) { + //If the FragmentHelper is null, that means the activity doesn't exist anymore + if(this.isCancelled()) { + return null; + } + //get the data from the fetcher + switch (t){ + case ARRIVALS: + ArrivalsFetcher f = (ArrivalsFetcher) r.getAndMoveForward(); + Stop lastSearchedBusStop = fh.getLastSuccessfullySearchedBusStop(); + Palina p; + if(params.length>0) + p = f.ReadArrivalTimesAll(params[0],res); //(it's a Palina) + else if(lastSearchedBusStop!=null) + p = f.ReadArrivalTimesAll(lastSearchedBusStop.ID,res); //(it's a Palina) + else { + publishProgress(Fetcher.result.QUERY_TOO_SHORT); + return null; + } + publishProgress(res.get()); + /* + if(lastSearchedBusStop != null && res.get()== Fetcher.result.OK) { + // check that we don't have the same stop + if(!lastSearchedBusStop.ID.equals(p.ID)) { + // remove it, get new name + getNameOrGetRekt(); + } else { + // searched and it's the same + String sn = lastSearchedBusStop.getStopDisplayName(); + if(sn == null) { + // something really bad happened, start from scratch + getNameOrGetRekt(); + } else { + // "merge" Stop over Palina and we're good to go + p.mergeNameFrom(lastSearchedBusStop); + } + } + } else if(res.get()== Fetcher.result.OK) { + // we haven't searched anything yet + getNameOrGetRekt(); + } + */ + result = p; + Log.d(TAG,"Using the ArrivalsFetcher: "+f.getClass()); + //TODO: SEND THE RESULT TO THE ACT + //TODO: find a way to avoid overloading the user with toasts + break; + case STOPS: + StopsFinderByName finder = (StopsFinderByName) r.getAndMoveForward(); + db.openIfNeeded(); + result = finder.FindByName(params[0], this.db, this.res); //it's a List + db.closeIfNeeded(); + Log.d(TAG,"Using the StopFinderByName: "+finder.getClass()); + query =params[0]; + break; + default: + result = null; + } + //find if it went well + if(res.get()== Fetcher.result.OK) { + return result; + } + + } + //at this point, we are sure that the result has been negative + failedAll=true; + + return null; + } + + @Override + protected void onProgressUpdate(Fetcher.result... values) { + FragmentHelper fh = helperRef.get(); + if (fh!=null) + for (Fetcher.result r : values){ + //TODO: make Toast + fh.showErrorMessage(r); + } + else { + Log.w(TAG,"We had to show some progress but activity was destroyed"); + } + } + + @Override + protected void onPostExecute(Object o) { + FragmentHelper fh = helperRef.get(); + + if(failedAll || o == null || fh == null){ + //everything went bad + cancel(true); + return; + } + + switch (t){ + case ARRIVALS: + Palina palina = (Palina) o; + fh.createOrUpdateStopFragment(palina); + break; + case STOPS: + //this should never be a problem + List stopList = (List) o; + if(query!=null) + fh.createFragmentFor(stopList,query); + else Log.e(TAG,"QUERY NULL, COULD NOT CREATE FRAGMENT"); + break; + case DBUPDATE: + break; + } + } + + @Override + protected void onCancelled() { + FragmentHelper fh = helperRef.get(); + if (fh!=null) fh.toggleSpinner(false); + } + + @Override + protected void onPreExecute() { + FragmentHelper fh = helperRef.get(); + if (fh!=null) fh.toggleSpinner(true); + } + + + public enum RequestType { + ARRIVALS,STOPS,DBUPDATE + } + /** + * Run this in a background thread.
+ * Sets a stop name for this.palina, guaranteed not to be null! + **/ + //TODO:Implement this + /* + private void getNameOrGetRekt(Palina p) { + String nameMaybe; + SQLiteDatabase udb = uDB.getReadableDatabase(); + + // does it already have a name (for fetchers that support it, or already got from favorites)? + nameMaybe = p.getStopDisplayName(); + if(nameMaybe != null && nameMaybe.length() > 0) { + return; + } + + // ok, let's search favorites. + + String usernameMaybe = UserDB.getStopUserName(udb, this.p.ID); + if(usernameMaybe != null && usernameMaybe.length() > 0) { + p.setStopUserName(usernameMaybe); + return; + } + + + // let's try StopsDB, then. + + db.openIfNeeded(); + nameMaybe = db.getNameFromID(this.p.ID); + db.closeIfNeeded(); + + if(nameMaybe != null && nameMaybe.length() > 0) { + p.setStopName(nameMaybe); + return; + } + + // no name to be found anywhere, don't bother searching it next time + p.setStopName(""); + }*/ + +} diff --git a/src/it/reyboz/bustorino/middleware/GeneralActivity.java b/src/it/reyboz/bustorino/middleware/GeneralActivity.java new file mode 100644 index 0000000..960e2a8 --- /dev/null +++ b/src/it/reyboz/bustorino/middleware/GeneralActivity.java @@ -0,0 +1,41 @@ +package it.reyboz.bustorino.middleware; + +import android.content.Context; +import android.content.SharedPreferences; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.view.inputmethod.InputMethodManager; + +/** + * Activity class that contains all the generally useful methods + */ +public abstract class GeneralActivity extends AppCompatActivity { + + protected void setOption(String optionName, boolean value) { + SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit(); + editor.putBoolean(optionName, value); + editor.commit(); + } + + protected boolean getOption(String optionName, boolean optDefault) { + SharedPreferences preferences = getPreferences(MODE_PRIVATE); + return preferences.getBoolean(optionName, optDefault); + } + public void hideKeyboard() { + View view = getCurrentFocus(); + if (view != null) { + ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)) + .hideSoftInputFromWindow(view.getWindowToken(), + InputMethodManager.HIDE_NOT_ALWAYS); + } + } + public boolean isConnected() { + ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); + return networkInfo != null && networkInfo.isConnected(); + } + public abstract void showMessage(int messageID); + public abstract void showKeyboard(); +}