Reduce amount of scrolling needed to load more information

Closes #217
grote · Sep 30, 2016 · 8931338 · 8931338
1 parent a917d3d
commit 8931338
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/res/xml/changelog_master.xml b/res/xml/changelog_master.xml
@@ -3,6 +3,7 @@
 
     <release version="1.1.5" versioncode="41">
         <change>Added France North West (Thanks Patrick!)</change>
+        <change>Reduce amount of scrolling needed to load more information</change>
         <change>Added help screens</change>
         <change>Reduced size of the app</change>
     </release>

diff --git a/src/de/grobox/liberario/activities/TripsActivity.java b/src/de/grobox/liberario/activities/TripsActivity.java
@@ -27,6 +27,7 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.util.DisplayMetrics;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -54,6 +55,8 @@
 import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.Trip;
 
+import static de.grobox.liberario.utils.TransportrUtils.getDragDistance;
+
 public class TripsActivity extends TransportrActivity {
 	private QueryTripsResult start_context;
 	private QueryTripsResult end_context;
@@ -96,6 +99,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		swipeRefresh = (SwipyRefreshLayout) findViewById(R.id.swipe_refresh_layout);
 		swipeRefresh.setColorSchemeResources(R.color.accent);
+		swipeRefresh.setDistanceToTriggerSync(getDragDistance(this));
+
 
 		mRecyclerView = (RecyclerView) findViewById(R.id.trips_recycler_view);
 		mRecyclerView.setLayoutManager(new LinearLayoutManager(this));

diff --git a/src/de/grobox/liberario/fragments/DeparturesFragment.java b/src/de/grobox/liberario/fragments/DeparturesFragment.java
@@ -52,6 +52,8 @@
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.StationDepartures;
 
+import static de.grobox.liberario.utils.TransportrUtils.getDragDistance;
+
 public class DeparturesFragment extends TransportrFragment {
 
 	public static final String TAG = "de.grobox.liberario.departures";
@@ -92,6 +94,7 @@ public void onClick(View v) {
 		// Swipe to Refresh
 		ui.swipe_refresh.setColorSchemeResources(R.color.accent);
 		ui.swipe_refresh.setDirection(SwipyRefreshLayoutDirection.BOTH);
+		ui.swipe_refresh.setDistanceToTriggerSync(getDragDistance(getContext()));
 		ui.swipe_refresh.setOnRefreshListener(new SwipyRefreshLayout.OnRefreshListener() {
 			@Override
 			public void onRefresh(final SwipyRefreshLayoutDirection direction) {

diff --git a/src/de/grobox/liberario/fragments/NearbyStationsFragment.java b/src/de/grobox/liberario/fragments/NearbyStationsFragment.java
@@ -53,6 +53,8 @@
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyLocationsResult;
 
+import static de.grobox.liberario.utils.TransportrUtils.getDragDistance;
+
 public class NearbyStationsFragment extends TransportrFragment {
 
 	public static final String TAG = "de.grobox.liberario.nearby_locations";
@@ -127,6 +129,7 @@ public void onLocationChanged(Location location) {
 
 		ui.swipe_refresh.setColorSchemeResources(R.color.accent);
 		ui.swipe_refresh.setDirection(SwipyRefreshLayoutDirection.BOTTOM);
+		ui.swipe_refresh.setDistanceToTriggerSync(getDragDistance(getContext()));
 		ui.swipe_refresh.setOnRefreshListener(new SwipyRefreshLayout.OnRefreshListener() {
 			                                      @Override
 			                                      public void onRefresh(final SwipyRefreshLayoutDirection direction) {

diff --git a/src/de/grobox/liberario/utils/TransportrUtils.java b/src/de/grobox/liberario/utils/TransportrUtils.java
@@ -28,6 +28,7 @@
 import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.support.v4.content.ContextCompat;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -588,4 +589,9 @@ static public NetworkProvider.WalkSpeed getWalkSpeed(Context context) {
 		return NetworkProvider.WalkSpeed.valueOf(walkString);
 	}
 
+	static public int getDragDistance(Context context) {
+		final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+		return (int) (25 * metrics.density);
+	}
+
 }