diff options
Diffstat (limited to 'org.fox.ttcomics')
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java | 17 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml | 24 |
2 files changed, 21 insertions, 20 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java index 9b3d4ac..a8d4a76 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java @@ -12,7 +12,6 @@ import android.preference.PreferenceManager; import android.provider.BaseColumns; import android.support.v4.app.Fragment; import android.support.v4.widget.SimpleCursorAdapter; -import android.support.v4.widget.SwipeRefreshLayout; import android.util.DisplayMetrics; import android.util.Log; import android.view.ContextMenu; @@ -59,7 +58,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { private ComicsListAdapter m_adapter; private int m_mode = 0; private String m_baseDirectory = ""; - private SwipeRefreshLayout m_swipeLayout; + //private SwipeRefreshLayout m_swipeLayout; private AnimationAdapter m_animationAdapter; private ImageLoader m_imageLoader = ImageLoader.getInstance(); @@ -251,7 +250,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { m_baseDirectory = savedInstanceState.getString("baseDir"); } - m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container); + /*m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container); m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -263,7 +262,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { m_swipeLayout.setColorScheme(android.R.color.holo_green_dark, android.R.color.holo_red_dark, android.R.color.holo_blue_dark, - android.R.color.holo_orange_dark); + android.R.color.holo_orange_dark); */ m_adapter = new ComicsListAdapter(getActivity(), R.layout.comics_grid_row, createCursor(), new String[] { "filename" }, new int[] { R.id.file_name }, 0); @@ -405,12 +404,12 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { protected void rescan(final boolean fullRescan) { AsyncTask<String, Integer, Integer> rescanTask = new AsyncTask<String, Integer, Integer>() { - @Override + /*@Override protected void onProgressUpdate(Integer... progress) { if (isAdded()) { - m_activity.setProgress(Math.round(((float)progress[0] / (float)progress[1]) * 10000)); + //m_activity.setProgress(Math.round(((float)progress[0] / (float)progress[1]) * 10000)); } - } + }*/ @Override protected Integer doInBackground(String... params) { @@ -505,7 +504,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { //m_animationAdapter.reset(); m_adapter.notifyDataSetChanged(); - if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false); + //if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false); } } }; @@ -513,7 +512,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { String comicsDir = m_prefs.getString("comics_directory", null); if (comicsDir != null && m_activity.isStorageAvailable()) { - if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true); + //if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true); rescanTask.execute(m_baseDirectory.length() > 0 ? m_baseDirectory : comicsDir); } diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml index 4fb8544..9466428 100644 --- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml @@ -1,22 +1,24 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/FrameLayout4" + android:animateLayoutChanges="true" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <android.support.v4.widget.SwipeRefreshLayout + <!-- <android.support.v4.widget.SwipeRefreshLayout android:id="@+id/comics_swipe_container" android:layout_width="match_parent" - android:layout_height="match_parent" > - <GridView + android:layout_height="match_parent" > --> + <GridView android:id="@+id/comics_grid" android:drawSelectorOnTop="true" android:layout_width="match_parent" android:layout_height="match_parent" android:columnWidth="160dp" - android:numColumns="auto_fit" > + android:numColumns="auto_fit" + android:layout_alignParentBottom="true"> </GridView> - </android.support.v4.widget.SwipeRefreshLayout> + <!-- </android.support.v4.widget.SwipeRefreshLayout> --> <!-- <LinearLayout android:id="@+id/no_comics" @@ -37,12 +39,12 @@ android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_marginRight="16dp" - android:layout_marginBottom="20dp" + android:layout_margin="16dp" app:floatingActionButtonColor="?colorAccent" android:src="@drawable/ic_refresh" - /> + android:layout_alignBottom="@+id/comics_grid" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> -</FrameLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file |