Maintain the loading visibility on action bar instead of the pull refresh animation

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 097ff48..932612e 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -32,11 +32,6 @@
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>
     
-    <color name="refresh_color_start">#00ddff</color>
-    <color name="refresh_color_middle_1">#1D2D44</color>
-    <color name="refresh_color_middle_2">#FFFFFF</color>
-    <color name="refresh_color_end">#00ddff</color>
-    
     <!-- Button -->
     <color name="button_text_color">#000000</color>
     

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 537ed74..ae38805 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -929,11 +929,13 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
                         setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
                         
                         if (mSyncInProgress) {
-                            getListOfFilesFragment().showSwipeProgress();
+                            getListOfFilesFragment().disableSwipe();
                             
                         } else {
+                            getListOfFilesFragment().enableSwipe();
                             getListOfFilesFragment().hideSwipeProgress();
                         }
+                        
                 }
                 
                 if (synchResult != null) {

diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 8b54555..951e33a 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -76,10 +76,6 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
         
         // Pull down refresh
         mRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files);
-        mRefreshLayout.setColorScheme(R.color.refresh_color_start,
-                R.color.refresh_color_middle_1, 
-                R.color.refresh_color_middle_2, 
-                R.color.refresh_color_end);
         mRefreshLayout.setOnRefreshListener(this);
         
         return v;