add FAB, minor style updates

9 files changed, 38 insertions, 25 deletions

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 4cc9d02..a017269 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:21.0.3'

     compile 'com.android.support:cardview-v7:21.0.3'

     compile 'it.neokree:MaterialTabs:0.11'

+    compile 'com.shamanland:fab:0.0.5'

     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.1.0@aar'

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index a304a49..3991b97 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -94,6 +94,7 @@
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
     <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
 </module>
\ No newline at end of file
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 9b766f7..8cffac8 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,11 +25,11 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.shamanland.fab.FloatingActionButton;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -134,7 +134,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
                     progressBar.setVisibility(View.VISIBLE);
 				}
 			}
-			
+
 			/* ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow);
 			
 			if (overflow != null) {
@@ -198,24 +198,23 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
        	m_adapter = new ComicsListAdapter(getActivity(), R.layout.comics_grid_row, createCursor(),
        			new String[] { "filename" }, new int[] { R.id.file_name }, 0);
 
-		if (view.findViewById(R.id.comics_list) != null) {
-			ListView list = (ListView) view.findViewById(R.id.comics_list);
-			list.setAdapter(m_adapter);
-			list.setEmptyView(view.findViewById(R.id.no_comics));
-			list.setOnItemClickListener(this);
-			
-	       	registerForContextMenu(list);
 
-		} else {
-			GridView grid = (GridView) view.findViewById(R.id.comics_grid);
-			grid.setAdapter(m_adapter);
-			grid.setEmptyView(view.findViewById(R.id.no_comics));			
-			grid.setOnItemClickListener(this);
-						
-	       	registerForContextMenu(grid);
+		FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
+		fab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				rescan(true);
+			}
+		});
+
+		GridView grid = (GridView) view.findViewById(R.id.comics_grid);
+		grid.setAdapter(m_adapter);
+		//grid.setOnTouchListener(new ShowHideOnScroll(fab));
+		grid.setEmptyView(view.findViewById(R.id.no_comics));
+		grid.setOnItemClickListener(this);
+
+		registerForContextMenu(grid);
 
-		}
-       	
 		return view;
 	}
 	
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
index 994b101..721821a 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
@@ -14,9 +14,7 @@ import android.view.ViewGroup;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.ToxicBakery.viewpager.transforms.AccordionTransformer;
 import com.ToxicBakery.viewpager.transforms.DepthPageTransformer;
-import com.ToxicBakery.viewpager.transforms.StackTransformer;
 
 import java.io.IOException;
 
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index 2095d87..f715604 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -367,14 +367,14 @@ public class CommonActivity extends ActionBarActivity {
     
     public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.menu_rescan:
+		/*case R.id.menu_rescan:
 			ComicListFragment frag = (ComicListFragment) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_LIST);
 			
 			if (frag != null && frag.isAdded()) {
 				frag.rescan(true);
 			}
 			
-			return true;
+			return true;*/
 		case R.id.menu_settings:
 			Intent intent = new Intent(CommonActivity.this,
 					PreferencesActivity.class);
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png
deleted file mode 100755
index c387044..0000000
--- a/org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png
+++ /dev/null
diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
index 10f1ed4..4f7de13 100755
--- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
+++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
@@ -30,8 +30,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
             android:gravity="center_horizontal|bottom"
-            android:background="@drawable/comic_grid_footer"
+            android:background="@android:color/black"
             android:padding="4dp"
+            android:alpha="0.7"
             android:orientation="vertical" >
 
             <TextView
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 5037747..cbbc414 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,4 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/FrameLayout4"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
@@ -31,4 +32,16 @@
             android:text="@string/error_no_comic_archives_found_" />
     </LinearLayout>
 
+    <com.shamanland.fab.FloatingActionButton
+        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"
+        app:floatingActionButtonColor="?colorAccent"
+        android:src="@drawable/ic_refresh"
+        />
+
+
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/menu/activity_main.xml b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
index 695102d..1143a47 100644
--- a/org.fox.ttcomics/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml
@@ -1,10 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" 
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/menu_rescan"
+    <!-- <item android:id="@+id/menu_rescan"
         android:title="@string/menu_rescan"
         android:icon="@drawable/ic_refresh"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" /> -->
     
     <item android:id="@+id/menu_settings"
         android:title="@string/menu_settings"