mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-17 22:41:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug. It is not possible to refresh folder when it is empty

Browse source
This commit is contained in:
jabarros 2014-07-29 15:04:06 +02:00
parent 154a3949f2
commit 5335975717
2 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
res/layout/list_fragment.xml
View file

@ -34,13 +34,33 @@
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_files_emptyView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center">
<TextView <TextView
android:id="@+id/empty_list_view" android:id="@+id/empty_list_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:text="@string/empty" android:text="@string/empty"
android:visibility="gone" android:visibility="visible" />
/>
</LinearLayout>
</ScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</FrameLayout> </FrameLayout>

21
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
View file

@ -46,6 +46,7 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
protected ExtendedListView mList; protected ExtendedListView mList;
private SwipeRefreshLayout mRefreshLayout; private SwipeRefreshLayout mRefreshLayout;
private SwipeRefreshLayout mRefreshEmptyLayout;
private TextView mEmptyListMessage; private TextView mEmptyListMessage;
public void setListAdapter(ListAdapter listAdapter) { public void setListAdapter(ListAdapter listAdapter) {
@ -67,7 +68,7 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
mEmptyListMessage = (TextView) v.findViewById(R.id.empty_list_view); mEmptyListMessage = (TextView) v.findViewById(R.id.empty_list_view);
mList = (ExtendedListView)(v.findViewById(R.id.list_root)); mList = (ExtendedListView)(v.findViewById(R.id.list_root));
mList.setOnItemClickListener(this); mList.setOnItemClickListener(this);
mList.setEmptyView(mEmptyListMessage); // looks like it's not a cool idea
mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator)); mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator));
mList.setDividerHeight(1); mList.setDividerHeight(1);
@ -78,11 +79,12 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
// Pull down refresh // Pull down refresh
mRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files); mRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files);
// Colors in animations: background mRefreshEmptyLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files_emptyView);
mRefreshLayout.setColorScheme(R.color.background_color, R.color.background_color,
R.color.background_color, R.color.background_color);
mRefreshLayout.setOnRefreshListener(this); onCreateSwipeToRefresh(mRefreshLayout);
onCreateSwipeToRefresh(mRefreshEmptyLayout);
mList.setEmptyView(mRefreshEmptyLayout);
return v; return v;
} }
@ -133,6 +135,7 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
public void onRefresh() { public void onRefresh() {
// to be @overriden // to be @overriden
mRefreshLayout.setRefreshing(false); mRefreshLayout.setRefreshing(false);
mRefreshEmptyLayout.setRefreshing(false);
} }
/** /**
@ -182,4 +185,12 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
return (mEmptyListMessage != null) ? mEmptyListMessage.getText().toString() : ""; return (mEmptyListMessage != null) ? mEmptyListMessage.getText().toString() : "";
} }
private void onCreateSwipeToRefresh(SwipeRefreshLayout refreshLayout) {
// Colors in animations: background
refreshLayout.setColorScheme(R.color.background_color, R.color.background_color, R.color.background_color,
R.color.background_color);
refreshLayout.setOnRefreshListener(this);
}
} }