projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6451222
)
Implement onRefresh method for SwipeRefreshLayout
author
masensio
<masensio@solidgear.es>
Thu, 29 May 2014 15:50:55 +0000
(17:50 +0200)
committer
masensio
<masensio@solidgear.es>
Thu, 29 May 2014 15:50:55 +0000
(17:50 +0200)
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index
04d2813
..
537ed74
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@
-927,6
+927,13
@@
FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
removeStickyBroadcast(intent);
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
removeStickyBroadcast(intent);
Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/);
+
+ if (mSyncInProgress) {
+ getListOfFilesFragment().showSwipeProgress();
+
+ } else {
+ getListOfFilesFragment().hideSwipeProgress();
+ }
}
if (synchResult != null) {
}
if (synchResult != null) {
diff --git
a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index
915e455
..
8b54555
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@
-147,6
+147,20
@@
public class ExtendedListFragment extends SherlockFragment implements OnItemClic
public void disableSwipe() {
mRefreshLayout.setEnabled(false);
}
public void disableSwipe() {
mRefreshLayout.setEnabled(false);
}
+
+ /**
+ * It shows the SwipeRefreshLayout progress
+ */
+ public void showSwipeProgress() {
+ mRefreshLayout.setRefreshing(true);
+ }
+
+ /**
+ * It shows the SwipeRefreshLayout progress
+ */
+ public void hideSwipeProgress() {
+ mRefreshLayout.setRefreshing(false);
+ }
}
}
diff --git
a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index
6b7d30a
..
23bfe6e
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@
-35,7
+35,6
@@
import com.owncloud.android.utils.Log_OC;
import android.app.Activity;
import android.os.Bundle;
import android.app.Activity;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
import android.view.ContextMenu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.ContextMenu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@
-434,5
+433,19
@@
public class OCFileListFragment extends ExtendedListFragment {
mFile = directory;
}
}
mFile = directory;
}
}
+
+
+ @Override
+ public void onRefresh() {
+ super.onRefresh();
+
+ if (mFile != null) {
+ listDirectory(mFile);
+
+ ((FileDisplayActivity)mContainerActivity).startSyncFolderOperation(mFile);
+ }
+ }
+
+
}
}