Fix crash introduced earlier when removing swipe to refresh

This commit is contained in:
Synced Synapse 2015-03-31 00:19:38 +01:00
parent 80e96d1bef
commit 04db54dfca
2 changed files with 21 additions and 12 deletions

View File

@ -22,6 +22,7 @@ import android.os.Handler;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@ -88,6 +89,7 @@ public class MediaFileListFragment extends Fragment {
Queue<FileLocation> mediaQueueFileLocation = new LinkedList<>();
@InjectView(R.id.list) GridView folderGridView;
@InjectView(R.id.swipe_refresh_layout) SwipeRefreshLayout swipeRefreshLayout;
@InjectView(android.R.id.empty) TextView emptyView;
public static MediaFileListFragment newInstance(final String media) {
@ -127,6 +129,7 @@ public class MediaFileListFragment extends Fragment {
ButterKnife.inject(this, root);
hostManager = HostManager.getInstance(getActivity());
swipeRefreshLayout.setEnabled(false);
emptyView.setOnClickListener(new View.OnClickListener() {
@Override

View File

@ -22,18 +22,24 @@
<include layout="@layout/empty_view"/>
<GridView
android:id="@+id/list"
<android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingBottom="@dimen/default_padding"
android:clipToPadding="false"
android:choiceMode="none"
android:listSelector="?attr/selectableItemBackground"
android:drawSelectorOnTop="true"
style="@style/Widget.GridView"/>
android:layout_height="match_parent">
<GridView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingBottom="@dimen/default_padding"
android:clipToPadding="false"
android:choiceMode="none"
android:listSelector="?attr/selectableItemBackground"
android:drawSelectorOnTop="true"
style="@style/Widget.GridView"/>
</android.support.v4.widget.SwipeRefreshLayout>
</FrameLayout>