diff options
Diffstat (limited to 'org.fox.ttcomics/src')
4 files changed, 25 insertions, 16 deletions
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index 4bcf0f5..1f5d06e 100644 --- a/org.fox.ttcomics/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttcomics"
- android:versionCode="48"
+ android:versionCode="49"
android:versionName="1.14" >
<uses-sdk
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java index 26166fc..ff142b9 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java @@ -369,7 +369,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { }
protected void rescan(final boolean fullRescan) {
- m_swipeLayout.setRefreshing(true);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
AsyncTask<String, Integer, Integer> rescanTask = new AsyncTask<String, Integer, Integer>() {
@@ -467,8 +467,8 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { if (isAdded() && m_activity != null) {
m_activity.cleanupCache(false);
m_activity.cleanupSqliteCache(comicsDir);
-
- m_swipeLayout.setRefreshing(false);
+
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
}
return fileIndex; //m_files.size();
diff --git a/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml index 9752e65..53a2e0a 100644 --- a/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml @@ -4,12 +4,17 @@ android:layout_width="fill_parent"
android:layout_height="fill_parent" >
- <GridView
- android:id="@+id/comics_grid"
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/comics_swipe_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:numColumns="3" >
- </GridView>
+ android:layout_height="match_parent" >
+ <GridView
+ android:id="@+id/comics_grid"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:numColumns="3" >
+ </GridView>
+ </android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/no_comics"
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml index eaf8c90..a05af25 100644 --- a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml @@ -3,15 +3,19 @@ android:id="@+id/FrameLayout4"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
- - <GridView
- android:id="@+id/comics_grid"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:numColumns="3" >
- </GridView>
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/comics_swipe_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ <GridView
+ android:id="@+id/comics_grid"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:numColumns="3" >
+ </GridView>
+ </android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/no_comics"
|