fixed swipe refresh

app/src/demo/res/values/config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="banner_ad_unit_id">ca-app-pub-3940256099942544/6300978111</string>
+    <string name="app_name">demo - Saguenay Transit</string>
+</resources>

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/HomeFragment.java

@@ -169,6 +169,16 @@ public class HomeFragment extends Fragment {
         return v;
     }
 
+    public void setRefreshing(final boolean refreshing)
+    {
+        _swipeRefreshLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                _swipeRefreshLayout.setRefreshing(refreshing);
+            }
+        });
+    }
+
     public void loadFavourites()
     {
         List<UserFavouriteStopsDbo> favourites = STSBusiness.getFavouriteStops(getContext());
@@ -209,7 +219,7 @@ public class HomeFragment extends Fragment {
 
     public void loadSchedules()
     {
-        _swipeRefreshLayout.setRefreshing(true);
+        setRefreshing(true);
         _adapter.setSchedules(null);
         TimeZone tz = TimeZone.getDefault();
         DateTimeZone dtz = DateTimeZone.forOffsetMillis(tz.getRawOffset() + (tz.inDaylightTime(new Date()) ? tz.getDSTSavings() : 0));
@@ -220,13 +230,13 @@ public class HomeFragment extends Fragment {
                     @Override
                     public void execute(List<SchedulesDbo> data) {
                         _adapter.setSchedules(data);
-                        _swipeRefreshLayout.setRefreshing(false);
+                        setRefreshing(false);
                     }
                 }, new LuConsumer<LuPromiseError>() {
                     @Override
                     public void execute(LuPromiseError data) {
                         Toast.makeText(getContext(), data.getError(), Toast.LENGTH_LONG).show();
-                        _swipeRefreshLayout.setRefreshing(false);
+                        setRefreshing(false);
                     }
                 });
     }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopViewerFragment.java

@@ -1,10 +1,12 @@
 package com.rthoni.stssaguenay.ui.fragments;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -49,6 +51,9 @@ public class StopViewerFragment extends Fragment {
     @BindView(R.id.listRoutes)
     RecyclerView _listRoutes;
 
+    @BindView(R.id.swipeContainer)
+    SwipeRefreshLayout _swipeRefreshLayout;
+
     private StopsDbo _stopsDbo;
 
     private RoutesAdapter _adapter;
@@ -113,7 +118,7 @@ public class StopViewerFragment extends Fragment {
                 holder._textView2.setText(text.toString());
             }
             else {
-                holder._textView2.setText("");
+                holder._textView2.setText(R.string.loading_schedules);
             }
         }
 
@@ -149,11 +154,28 @@ public class StopViewerFragment extends Fragment {
         _listRoutes.setAdapter(_adapter);
         _listRoutes.setLayoutManager(new LinearLayoutManager(getContext()));
 
+        _swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                loadSchedules();
+            }
+        });
+
         loadRoutesAndSchedules();
 
         return v;
     }
 
+    public void setRefreshing(final boolean refreshing)
+    {
+        _swipeRefreshLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                _swipeRefreshLayout.setRefreshing(refreshing);
+            }
+        });
+    }
+
     public void loadRoutesAndSchedules()
     {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
@@ -184,12 +206,8 @@ public class StopViewerFragment extends Fragment {
 
     public void loadSchedules()
     {
-        final ProgressDialog progressDialog = new ProgressDialog(getContext());
-        progressDialog.setIndeterminate(true);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        progressDialog.setTitle(R.string.loading);
-        progressDialog.setMessage(getString(R.string.loading_schedules));
+        setRefreshing(true);
+        _adapter.setSchedules(null);
 
         UserFavouriteStopsDbo favouriteStopsDbo = new UserFavouriteStopsDbo();
         favouriteStopsDbo.setStop(_stopsDbo);
@@ -205,13 +223,13 @@ public class StopViewerFragment extends Fragment {
                 .then(new LuConsumer<List<SchedulesDbo>>() {
                     @Override
                     public void execute(List<SchedulesDbo> data) {
-                        progressDialog.dismiss();
+                        setRefreshing(false);
                         _adapter.setSchedules(data);
                     }
                 }, new LuConsumer<LuPromiseError>() {
                     @Override
                     public void execute(LuPromiseError data) {
-                        progressDialog.dismiss();
+                        setRefreshing(false);
 //                        _routesAdapter.setRoutes(new Vector<RoutesDbo>()); TODO
                         Toast.makeText(getContext(), data.getError(), Toast.LENGTH_LONG).show();
                     }

app/src/main/res/layout/fragment_home.xml

@@ -1,5 +1,6 @@
 <?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">
 
@@ -7,8 +8,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/favourites_stops"
         android:id="@+id/textView"
+        android:text="@string/favourites_stops"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
@@ -30,7 +31,9 @@
         <android.support.v7.widget.RecyclerView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/listFavouritesStops"/>
+            android:id="@+id/listFavouritesStops"
+            android:scrollbars="vertical"
+            android:fadeScrollbars="true"/>
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_stop_viewer.xml

@@ -1,22 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<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">
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:id="@+id/textView"
-        android:textAppearance="?android:attr/textAppearanceMedium"
         tools:text="268 - Émile-Girardin / Roitelets"
-        android:gravity="center_horizontal"/>
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"/>
 
-    <android.support.v7.widget.RecyclerView
+    <android.support.v4.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/swipeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/listRoutes"
-        android:scrollbars="vertical"
-        android:fadeScrollbars="true"/>
-</LinearLayout>
+        android:layout_below="@+id/textView"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true">
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/listRoutes"
+            android:scrollbars="vertical"
+            android:fadeScrollbars="true"/>
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+</RelativeLayout>

app/src/main/res/values/strings.xml

@@ -4,6 +4,7 @@
 
     <string name="app_name">Saguenay Transit</string>
 
+    <string name="title_activity_main">Saguenay Transit</string>
     <string name="title_activity_stop_picker">Pick a stop - Saguenay Transit</string>
     <string name="favourites_stops">Favourites stops:</string>
     <string name="search_stop">Search a stop</string>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'de.mobilej.unmock:UnMockPlugin:0.5.0'