add FAB, minor style updates

3 files changed, 19 insertions, 22 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 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);