Page MenuHomeGitPull.it

No OneTemporary

Authored By
Unknown
Size
38 KB
Referenced Files
None
Subscribers
None
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265e..758de96 100755
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index acff019..e433a97 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="it.reyboz.bustorino.ActivitySettings"
>
<!-- <fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/settActFragment"
- class="it.reyboz.bustorino.fragments.PreferFragment"
+ class="it.reyboz.bustorino.fragments.SettingsFragment"
android:tag="PreferFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start">
</fragment>
-->
<FrameLayout
android:id="@+id/setting_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 3d1064a..aa3390a 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,52 +1,57 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="it.reyboz.bustorino.ActivityMain">
<!--suppress AndroidDomInspection --> <!-- Android Studio can't find ic_star even though it's there. -->
<item
android:id="@+id/action_favorites"
android:icon="@drawable/ic_star"
android:orderInCategory="1"
android:title="@string/action_favorites"
app:showAsAction="ifRoom" />
<item
android:orderInCategory="2"
android:title="@string/action_about">
<menu>
<item
android:id="@+id/action_about"
android:orderInCategory="4"
android:title="@string/action_about_more" />
<item
android:id="@+id/action_news"
android:orderInCategory="5"
android:title="@string/action_news" />
<item
android:id="@+id/action_bugs"
android:orderInCategory="6"
android:title="@string/action_bugs"
app:showAsAction="never" />
<item
android:id="@+id/action_source"
android:orderInCategory="7"
android:title="@string/action_source"
app:showAsAction="never" />
<item
android:id="@+id/action_licence"
android:orderInCategory="8"
android:title="@string/action_licence"
app:showAsAction="never" />
<item
android:id="@+id/action_author"
android:orderInCategory="9"
android:title="@string/action_author"
app:showAsAction="never" />
</menu>
</item>
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="3"
+ android:title="@string/action_settings"
+ android:visible="true" />
<item
android:id="@+id/action_help"
android:orderInCategory="4"
android:title="@string/action_help"
android:visible="true" />
</menu>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 892db79..eab6e55 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,89 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
<string name="search">Cerca</string>
<string name="qrcode">QR Code</string>
<string name="insert_bus_stop_number">Numero fermata</string>
<string name="insert_bus_stop_name">Nome fermata</string>
<string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
<string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
<string name="network_error">Verifica l\'accesso ad Internet!</string>
<string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
<string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
<string name="passages">Fermata: %1$s</string>
<string name="lines">Linee: %1$s</string>
<string name="results">Scegli la fermata…</string>
<string name="no_passages">Nessun passaggio</string>
<string name="no_qrcode">Nessun QR code</string>
<string name="action_favorites">Preferiti</string>
<string name="action_help">Aiuto</string>
<string name="action_about">Informazioni</string>
<string name="action_about_more">Più informazioni</string>
<string name="action_news">News</string>
<string name="action_bugs">Invia bug</string>
<string name="action_source">Codice sorgente</string>
<string name="action_licence">Licenza</string>
<string name="action_author">Incontra l\'autore</string>
<string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
<string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
<string name="title_activity_favorites">Preferiti</string>
<string name="tip_add_favorite">Tocca il nome di una fermata per aggiungerla in questa lista</string>
<string name="action_remove_from_favourites">Rimuovi</string>
<string name="action_rename_bus_stop_username">Rinomina</string>
<string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
<string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
<string name="about">Informazioni</string>
<string name="howDoesItWork"><b>Tocca il nome della fermata</b> per aggiungerla ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.</string>
<string name="hint_button">OK !</string>
<string name="about_history">
<![CDATA[
<h1>Benvenuto!</h1>
<p>Grazie per aver scelto BusTO, un\'app \"politicamente\" <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>:</p>
<p>Perché usare BusTO?</p>
<p>
- Non sei <b>monitorato</b><br>
- Non ci sono <b>pubblicità</b><br>
- La tua <b>privacy</b> è al sicuro<br>
- Inoltre l\'app è molto leggera!<br>
</p>
<h2>Come Funziona?</h2>
<p>Quest\'app ottiene i passaggi dei bus in tempo reale filtrando i dati forniti pubblicamente sul sito <b>www.gtt.to.it</b> o <i>www.5t.torino.it</i> "per uso personale".</p>
<p>Ingredienti:<br>
- <b>Valerio Bozzolan</b> sviluppatore principale.<br>
- <b>Marco Gagino</b> intenso collaboratore, creatore dell\'icona, responsabile della grafica.<br>
- <b>Paolo Alloatti</b> per l\'idea dell\'icona.<br>
- <b>JSoup</b> libreria per "<i>web scaping</i>".<br>
- <b>makovkastar</b> bottone fluttuante.<br>
- <b>Google</b> icone Material Design.<br>
- Tutti i contributori!
</p>
<h2>Licenze</h2>
<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3+</i>.
Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan.
</p>
<h2>Note</h2>
<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia.</p>
<p>Buon utilizzo! :)</p>
]]>
</string>
<string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
<string name="route_towards_destination">%1$s verso %2$s</string>
<string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
<string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
<string name="action_view_on_map">Visualizza sulla mappa</string>
<string name="nearby_stops_message">Fermate vicine</string>
<string name="position_searching_message">Ricerca della posizione in corso&#8230;</string>
<string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
<string name="main_menu_pref">Preferenze</string>
<string name="database_update_message">Aggiornamento del database&#8230;</string>
+ <string name="pref_num_elements">Numero di fermate</string>
+ <string name="title_activity_settings">Impostazioni</string>
+ <string name="action_settings">Impostazioni</string>
+ <string name="pref_recents_group_title">Fermate recenti</string>
+ <string name="enableGpsText">Abilitare il GPS</string>
+ <string name="settings_search_radius">Raggio di ricerca</string>
</resources>
diff --git a/res/values/keys.xml b/res/values/keys.xml
new file mode 100644
index 0000000..18be176
--- /dev/null
+++ b/res/values/keys.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="MissingTranslation">
+ <string name="pref_layout">layout_pref</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/pref_keys.xml b/res/values/pref_keys.xml
new file mode 100644
index 0000000..e6923a1
--- /dev/null
+++ b/res/values/pref_keys.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Preference screen -->
+ <string name="pref_key_num_recents" translatable="false">pref_num_recents</string>
+ <string name="pref_key_radius_recents" translatable="false">pref_radius_recents</string>
+ <string name="pref_key_experimental" translatable="false">pref_exp_features</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 413e489..4563cec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,103 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">BusTO</string>
<string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
</string>
<string name="search">Search</string>
<string name="qrcode">Scan QR Code</string>
<string name="insert_bus_stop_number">Bus stop number</string>
<string name="insert_bus_stop_name">Bus stop name</string>
<string name="insert_bus_stop_number_error">Insert bus stop number</string>
<string name="insert_bus_stop_name_error">Insert bus stop name</string>
<string name="route_towards_destination">%1$s towards %2$s</string>
<string name="route_towards_unknown">%s (unknown destination)</string>
<string name="network_error">Verify your Internet connection!</string>
<string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
<string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
<string name="query_too_short">Name too short, type more characters and retry
</string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
<string name="passages">Arrivals at: %1$s</string>
<string name="results">Choose the bus stop…</string>
<string name="lines">Lines: %1$s</string>
<string name="no_passages">No timetable found</string>
<string name="no_qrcode">No QR code</string>
<string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
<string name="action_help">Help</string>
<string name="action_about">About</string>
<string name="action_about_more">More about</string>
<string name="action_news">News releases</string>
<string name="action_bugs">Bug submission</string>
<string name="action_source">Source code</string>
<string name="action_licence">Licence</string>
<string name="action_author">Meet the author</string>
<string name="added_in_favorites">Bus stop is now in your favorites</string>
<string name="action_favorites">Favorites</string>
<string name="title_activity_favorites">Favorites</string>
<string name="tip_add_favorite">Press on a bus stop name to populate this list</string>
<string name="action_remove_from_favourites">Delete</string>
<string name="action_rename_bus_stop_username">Rename</string>
<string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
<string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
<string name="about">About</string>
<string name="howDoesItWork">
<b>Tap the bus stop name</b>
to add it to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
</string>
<string name="hint_button">GOT IT!</string>
<string name="about_history">
<![CDATA[
<h1>Welcome!</h1>
<p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
<p>Why use this app?</p>
<p>
- You\'ll never be <b>tracked</b><br>
- You\'ll never see boring <b>ads</b><br>
- We\'ll always respect your <b>privacy</b><br>
- Moreover, it\'s lightweight!<br>
</p>
<h2>How does it work?</h2>
<p>This app will show you bus timetables gathering data from <b>www.gtt.to.it</b> or <b>www.5t.torino.it</b> "for personal use".</p>
<p>Who worked on BusTO:<br>
- <b>Valerio Bozzolan</b> main developer.<br>
- <b>Marco Gagino</b> main contributor and icon creator.<br>
- <b>Paolo Alloatti</b> original concept of the icon.<br>
- <b>JSoup</b> web scraper library.<br>
- <b>makovkastar</b> floating buttons.<br>
- <b>Google</b> Material Design icons.<br>
- All the contributors!
</p>
<h2>Licenses</h2>
<p>The app and the related source code are released by Valerio Bozzolan under the terms of the <i>GNU General Public License v3+</i>).
So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
<h2>Notes</h2>
<p>This app has been developed <b>hoping to be useful to everyone</b> but without ANY warranty.</p>
<p>This translation is kindly provided by Riccardo Caniato and Marco Gagino.</p>
<p>Get involved! :)</p>
]]>
</string>
<string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
<string name="action_view_on_map">View on a map</string>
<string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
<string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
<string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
<string name="nearby_stops_message">Nearby stops</string>
<string name="position_searching_message">Finding the position&#8230;</string>
<string name="no_stops_nearby">No stops nearby</string>
<string name="pref_num_elements">Number of stops</string>
<string name="main_menu_pref">Preferences</string>
<string name="title_activity_settings">Settings</string>
<string name="action_settings">Settings</string>
+ <string name="settings_experimental">Experimental features</string>
+ <string name="settings_search_radius">Search radius</string>
<string name="pref_recents_group_title">Recent stops</string>
<string name="enableGpsText">Please enable GPS</string>
<string name="database_update_message">Database update in progress&#8230;</string>
</resources>
diff --git a/res/values/theme.xml b/res/values/theme.xml
index 691ca25..9766bd6 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FavTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/blue_500</item>
<item name="colorPrimaryDark">@color/blue_700</item>
<item name="colorAccent">@color/teal_500</item>
</style>
<style name="AboutTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/teal_300</item>
<item name="colorPrimaryDark">@color/teal_500</item>
<item name="colorAccent">@color/blue_700</item>
</style>
+ <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
+
</resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e74149b..e3dca9e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,23 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.preference.PreferenceCategory
- android:title="@string/pref_recents_group_title"
- android:key="pref_key_recent_group">
+ android:title="General">
+ <android.support.v7.preference.SwitchPreferenceCompat
+ android:defaultValue="false"
+ android:title="@string/settings_experimental" android:key="@string/pref_key_experimental"/>
+ </android.support.v7.preference.PreferenceCategory>
+ <android.support.v7.preference.PreferenceCategory
+ android:title="@string/pref_recents_group_title">
<android.support.v7.preference.EditTextPreference
- android:defaultValue="3"
+ android:defaultValue="10"
android:selectAllOnFocus="true"
android:singleLine="true"
- android:title="@string/pref_num_elements" android:key="pref_number_recents" android:inputType="number"/>
+ android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents" android:inputType="numberDecimal"
+
+ android:digits="0123456789" android:ems="10"
+ />
<android.support.v7.preference.SeekBarPreference
- android:title="Radius of search"
- android:key="pref_radius_recents"
+ android:title="@string/settings_search_radius"
+ android:key="@string/pref_key_radius_recents"
android:defaultValue="500"
android:max="1000"
app:min="20"
- />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ />
</android.support.v7.preference.PreferenceCategory>
- <android.support.v7.preference.SwitchPreferenceCompat
- android:defaultValue="false"
- android:title="Activate experimental features" android:key="debug"/>
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+
+</android.support.v7.preference.PreferenceScreen>
diff --git a/src/it/reyboz/bustorino/ActivitySettings.java b/src/it/reyboz/bustorino/ActivitySettings.java
index 9dc7bbf..17cdf61 100644
--- a/src/it/reyboz/bustorino/ActivitySettings.java
+++ b/src/it/reyboz/bustorino/ActivitySettings.java
@@ -1,41 +1,37 @@
package it.reyboz.bustorino;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.util.Log;
-import android.view.View;
-import it.reyboz.bustorino.fragments.PreferFragment;
+import it.reyboz.bustorino.fragments.SettingsFragment;
public class ActivitySettings extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
ActionBar ab = getSupportActionBar();
if(ab!=null) {
ab.setIcon(R.drawable.ic_launcher);
ab.setDisplayHomeAsUpEnabled(true);
} else {
Log.e("SETTINGS_ACTIV","ACTION BAR IS NULL");
}
FragmentManager framan = getSupportFragmentManager();
FragmentTransaction ft = framan.beginTransaction();
- ft.add(R.id.setting_container,new PreferFragment());
- ft.commitNow();
+ ft.replace(R.id.setting_container,new SettingsFragment());
+ ft.commit();
}
}
/**
* Interesting thing
* Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
* .setAction("Action", null).show();
*/
diff --git a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
index 6fdc50a..27c988c 100644
--- a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
@@ -1,363 +1,373 @@
/*
BusTO - Fragments components
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 <http://www.gnu.org/licenses/>.
*/
package it.reyboz.bustorino.fragments;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
+import android.support.v7.preference.PreferenceManager;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.TextView;
import it.reyboz.bustorino.R;
import it.reyboz.bustorino.backend.Route;
import it.reyboz.bustorino.backend.Stop;
import it.reyboz.bustorino.backend.utils;
import it.reyboz.bustorino.middleware.AppDataProvider;
import it.reyboz.bustorino.middleware.NextGenDB.Contract.*;
import it.reyboz.bustorino.adapters.SquareStopAdapter;
import it.reyboz.bustorino.util.StopSorterByDistance;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.*;
public class NearbyStopsFragment extends Fragment implements LoaderManager.LoaderCallbacks<Cursor> {
private FragmentListener mListener;
private LocationManager locManager;
private FragmentLocationListener locationListener;
private final String[] PROJECTION = {StopsTable.COL_ID,StopsTable.COL_LAT,StopsTable.COL_LONG,
StopsTable.COL_NAME,StopsTable.COL_TYPE,StopsTable.COL_LINES_STOPPING};
private final static String DEBUG_TAG = "NearbyStopsFragment";
//data Bundle
private final String BUNDLE_LOCATION = "location";
private final int LOADER_ID = 0;
private RecyclerView gridRecyclerView;
private SquareStopAdapter dataAdapter;
private AutoFitGridLayoutManager gridLayoutManager;
boolean canStartDBQuery = true;
private Location lastReceivedLocation = null;
private ProgressBar loadingProgressBar;
private int distance;
private SharedPreferences globalSharedPref;
private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
private TextView messageTextView;
private CommonScrollListener scrollListener;
private boolean firstLoc = true;
public static final int COLUMN_WIDTH_DP = 250;
+ private Integer MAX_DISTANCE = -3;
+ private int MIN_NUM_STOPS = -1;
+
public NearbyStopsFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
* @return A new instance of fragment NearbyStopsFragment.
*/
public static NearbyStopsFragment newInstance() {
NearbyStopsFragment fragment = new NearbyStopsFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
/*
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
*/
}
locManager = (LocationManager) getContext().getSystemService(Context.LOCATION_SERVICE);
locationListener = new FragmentLocationListener(this);
globalSharedPref = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences),Context.MODE_PRIVATE);
globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View root = inflater.inflate(R.layout.fragment_nearby_stops, container, false);
gridRecyclerView = (RecyclerView) root.findViewById(R.id.stopGridRecyclerView);
gridLayoutManager = new AutoFitGridLayoutManager(getContext().getApplicationContext(), utils.convertDipToPixels(getContext(),COLUMN_WIDTH_DP));
gridRecyclerView.setLayoutManager(gridLayoutManager);
gridRecyclerView.setHasFixedSize(false);
loadingProgressBar = (ProgressBar) root.findViewById(R.id.loadingBar);
messageTextView = (TextView) root.findViewById(R.id.messageTextView);
preferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Log.d(DEBUG_TAG,"Key "+key+" was changed");
if(key.equals(getString(R.string.databaseUpdatingPref))){
if(!sharedPreferences.getBoolean(getString(R.string.databaseUpdatingPref),true)){
canStartDBQuery = true;
Log.d(DEBUG_TAG,"The database has finished updating, can start update now");
}
}
}
};
scrollListener = new CommonScrollListener(mListener,false);
return root;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (context instanceof FragmentListener) {
mListener = (FragmentListener) context;
} else {
throw new RuntimeException(context.toString()
+ " must implement OnFragmentInteractionListener");
}
}
@Override
public void onPause() {
super.onPause();
canStartDBQuery = false;
locManager.removeUpdates(locationListener);
gridRecyclerView.setAdapter(null);
Log.d(DEBUG_TAG,"On paused called");
}
@Override
public void onResume() {
super.onResume();
canStartDBQuery = !globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false);
try{
if(canStartDBQuery) locManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,2000,5,locationListener);
} catch (SecurityException ex){
//ignored
//try another location provider
}
if(dataAdapter!=null){
gridRecyclerView.setAdapter(dataAdapter);
loadingProgressBar.setVisibility(View.GONE);
}
Log.d(DEBUG_TAG,"OnResume called");
+
+ //Re-read preferences
+ SharedPreferences shpr = PreferenceManager.getDefaultSharedPreferences(getContext().getApplicationContext());
+ //For some reason, they are all saved as strings
+ MAX_DISTANCE = shpr.getInt(getString(R.string.pref_key_radius_recents),1000);
+ MIN_NUM_STOPS = Integer.parseInt(shpr.getString(getString(R.string.pref_key_num_recents),"12"));
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
gridRecyclerView.setVisibility(View.INVISIBLE);
gridRecyclerView.addOnScrollListener(scrollListener);
}
@Override
public void onDetach() {
super.onDetach();
mListener = null;
}
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
//BUILD URI
lastReceivedLocation = args.getParcelable(BUNDLE_LOCATION);
Uri.Builder builder = new Uri.Builder();
builder.scheme("content").authority(AppDataProvider.AUTHORITY)
.appendPath("stops").appendPath("location")
.appendPath(String.valueOf(lastReceivedLocation.getLatitude()))
.appendPath(String.valueOf(lastReceivedLocation.getLongitude()))
.appendPath(String.valueOf(distance)); //distance
CursorLoader cl = new CursorLoader(getContext(),builder.build(),PROJECTION,null,null,null);
- cl.setUpdateThrottle(1000);
+ cl.setUpdateThrottle(2000);
return cl;
}
+
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
ArrayList<Stop> stopList = new ArrayList<>();
data.moveToFirst();
- if(data.getCount()<4 && !globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false) && distance<=1000){
+ if (0 > MAX_DISTANCE) throw new AssertionError();
+ if(!globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false) && (data.getCount()<MIN_NUM_STOPS || distance<=MAX_DISTANCE)){
distance = distance*2;
Bundle d = new Bundle();
d.putParcelable(BUNDLE_LOCATION,lastReceivedLocation);
getLoaderManager().restartLoader(LOADER_ID,d,this);
return;
}
Log.d("LoadFromCursor","Number of nearby stops: "+data.getCount());
final int col_id = data.getColumnIndex(StopsTable.COL_ID);
final int latInd = data.getColumnIndex(StopsTable.COL_LAT);
final int lonInd = data.getColumnIndex(StopsTable.COL_LONG);
final int nameindex = data.getColumnIndex(StopsTable.COL_NAME);
final int typeIndex = data.getColumnIndex(StopsTable.COL_TYPE);
final int linesIndex = data.getColumnIndex(StopsTable.COL_LINES_STOPPING);
for(int i=0; i<data.getCount();i++){
String[] routes = data.getString(linesIndex).split(",");
stopList.add(new Stop(data.getString(col_id),data.getString(nameindex),null,null,
Route.Type.fromCode(data.getInt(typeIndex)),
Arrays.asList(routes), //the routes should be compact, not normalized yet
data.getDouble(latInd),data.getDouble(lonInd)
)
);
//Log.d("NearbyStopsFragment","Got stop with id "+data.getString(col_id)+
//" and name "+data.getString(nameindex));
data.moveToNext();
}
if(data.getCount()>0) {
//quick trial to hopefully always get the stops in the correct order
Collections.sort(stopList,new StopSorterByDistance(lastReceivedLocation));
if(firstLoc) {
dataAdapter = new SquareStopAdapter(stopList, mListener, lastReceivedLocation);
gridRecyclerView.setAdapter(dataAdapter);
firstLoc = false;
}else {
dataAdapter.setStops(stopList);
dataAdapter.setUserPosition(lastReceivedLocation);
}
dataAdapter.notifyDataSetChanged();
if (gridRecyclerView.getVisibility() != View.VISIBLE) {
loadingProgressBar.setVisibility(View.GONE);
gridRecyclerView.setVisibility(View.VISIBLE);
}
messageTextView.setVisibility(View.GONE);
} else {
messageTextView.setVisibility(View.VISIBLE);
messageTextView.setText(R.string.no_stops_nearby);
loadingProgressBar.setVisibility(View.GONE);
}
}
@Override
public void onLoaderReset(Loader<Cursor> loader) {
}
/**
* Local locationListener, to use for the GPS
*/
class FragmentLocationListener implements LocationListener{
LoaderManager.LoaderCallbacks<Cursor> callbacks;
private int oldLocStatus = -2;
public FragmentLocationListener(LoaderManager.LoaderCallbacks<Cursor> callbacks) {
this.callbacks = callbacks;
}
@Override
public void onLocationChanged(Location location) {
//set adapter
float accuracy = location.getAccuracy();
if(accuracy<60 && canStartDBQuery) {
- distance = 100;
+ distance = 20;
final Bundle msgBundle = new Bundle();
msgBundle.putParcelable(BUNDLE_LOCATION,location);
getLoaderManager().restartLoader(LOADER_ID,msgBundle,callbacks);
}
Log.d("LocationListener","can start loader "+ canStartDBQuery);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
if(oldLocStatus!=status){
if(status == LocationProvider.OUT_OF_SERVICE || status == LocationProvider.TEMPORARILY_UNAVAILABLE) {
messageTextView.setText(R.string.enableGpsText);
messageTextView.setVisibility(View.VISIBLE);
}else if(status == LocationProvider.AVAILABLE){
messageTextView.setVisibility(View.GONE);
}
oldLocStatus = status;
}
}
@Override
public void onProviderEnabled(String provider) {
}
@Override
public void onProviderDisabled(String provider) {
}
}
/**
* Simple trick to get an automatic number of columns (from https://www.journaldev.com/13792/android-gridlayoutmanager-example)
*
*/
class AutoFitGridLayoutManager extends GridLayoutManager {
private int columnWidth;
private boolean columnWidthChanged = true;
public AutoFitGridLayoutManager(Context context, int columnWidth) {
super(context, 1);
setColumnWidth(columnWidth);
}
public void setColumnWidth(int newColumnWidth) {
if (newColumnWidth > 0 && newColumnWidth != columnWidth) {
columnWidth = newColumnWidth;
columnWidthChanged = true;
}
}
@Override
public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
if (columnWidthChanged && columnWidth > 0) {
int totalSpace;
if (getOrientation() == VERTICAL) {
totalSpace = getWidth() - getPaddingRight() - getPaddingLeft();
} else {
totalSpace = getHeight() - getPaddingTop() - getPaddingBottom();
}
int spanCount = Math.max(1, totalSpace / columnWidth);
setSpanCount(spanCount);
columnWidthChanged = false;
}
super.onLayoutChildren(recycler, state);
}
}
}
diff --git a/src/it/reyboz/bustorino/fragments/PreferFragment.java b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
similarity index 79%
rename from src/it/reyboz/bustorino/fragments/PreferFragment.java
rename to src/it/reyboz/bustorino/fragments/SettingsFragment.java
index f325599..ebfa69f 100644
--- a/src/it/reyboz/bustorino/fragments/PreferFragment.java
+++ b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
@@ -1,26 +1,26 @@
package it.reyboz.bustorino.fragments;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
import it.reyboz.bustorino.R;
-public class PreferFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
- private static final String TAG = PreferFragment.class.getName();
+public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+ private static final String TAG = SettingsFragment.class.getName();
SharedPreferences preferences;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.preferences,rootKey);
preferences = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences), Context.MODE_PRIVATE);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Preference pref = findPreference(key);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Nov 19, 03:34 (1 d, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2264532
Default Alt Text
(38 KB)

Event Timeline