add launchactivity

add footer to comics list; do not hide fab

7 files changed, 54 insertions, 13 deletions

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 2c46e7a..41dc19d 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     compile 'com.android.support:cardview-v7:22.2.0'

     compile 'it.neokree:MaterialTabs:0.11'

     compile 'com.shamanland:fab:0.0.5'

+    compile 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'

     compile files('libs/universal-image-loader-1.9.3.jar')

     compile 'ch.acra:acra:4.5.0'

     compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index 577971d..15f3849 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -86,16 +86,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" />
     <orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
-    <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" />
+    <orderEntry type="library" exported="" name="android-HeaderFooterGridView-0.2.4" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
+    <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
+    <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index e6f19b5..9c7265b 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -19,8 +19,8 @@
         android:largeHeap="true"        
         android:allowBackup="true">        
         <activity
-            android:theme="@style/AppTheme"
-            android:name=".MainActivity"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:name=".LaunchActivity"
             android:label="@string/title_activity_main" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -28,7 +28,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        
+
+        <activity
+            android:theme="@style/AppTheme"
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+        </activity>
+
         <activity
             android:theme="@style/AppTheme"
             android:name=".PreferencesActivity"
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 c8be1ca..d994e7c 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
@@ -25,7 +25,6 @@ import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -36,13 +35,14 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.process.BitmapProcessor;
 import com.shamanland.fab.FloatingActionButton;
-import com.shamanland.fab.ShowHideOnScroll;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import jp.co.recruit_mp.android.widget.HeaderFooterGridView;
+
 public class ComicListFragment extends Fragment implements OnItemClickListener {
 	private final String TAG = this.getClass().getSimpleName();
 
@@ -281,12 +281,15 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 			}
 		});
 
-		GridView grid = (GridView) view.findViewById(R.id.comics_grid);
+		HeaderFooterGridView grid = (HeaderFooterGridView) view.findViewById(R.id.comics_grid);
+
+		View footer = inflater.inflate(R.layout.comics_grid_footer, grid, false);
+		grid.addFooterView(footer, null, false);
 
 		m_animationAdapter.setAbsListView(grid);
 		grid.setAdapter(m_animationAdapter);
 
-		grid.setOnTouchListener(new ShowHideOnScroll(fab));
+		//grid.setOnTouchListener(new ShowHideOnScroll(fab));
 		grid.setOnScrollListener(new AbsListView.OnScrollListener() {
 			@Override
 			public void onScrollStateChanged(AbsListView view, int scrollState) {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/LaunchActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/LaunchActivity.java
new file mode 100644
index 0000000..9a017cc
--- /dev/null
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/LaunchActivity.java
@@ -0,0 +1,25 @@
+package org.fox.ttcomics2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class LaunchActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // https://code.google.com/p/android/issues/detail?id=26658
+        if (!isTaskRoot()) {
+            finish();
+            return;
+        }
+
+        Intent main = new Intent(LaunchActivity.this, MainActivity.class);
+        startActivity(main);
+
+        finish();
+    }
+
+}
diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_footer.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_footer.xml
new file mode 100644
index 0000000..22c197e
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_footer.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="96dp">
+
+</LinearLayout>
\ No newline at end of file
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..3266a45 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
@@ -8,14 +8,13 @@
         android:id="@+id/comics_swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-        <GridView
+        <jp.co.recruit_mp.android.widget.HeaderFooterGridView
             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" >
-        </GridView>
+            android:numColumns="auto_fit" />
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <!-- <LinearLayout