diff options
author | Andrew Dolgov <[email protected]> | 2015-06-08 15:46:11 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-08 15:46:11 +0300 |
commit | b643a64be39257642d4dfd085ff53cf13d1f8728 (patch) | |
tree | b8017dd08362776af2211e2813d19c095e947b68 | |
parent | f4a66050dcaf3ea17d416570d61cafbad32401ee (diff) |
add folder icon & overflow
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java | 16 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png | bin | 0 -> 325 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png | bin | 0 -> 408 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png | bin | 0 -> 432 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png | bin | 0 -> 558 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png | bin | 0 -> 590 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png | bin | 0 -> 718 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png | bin | 0 -> 950 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png | bin | 0 -> 1038 bytes | |||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml | 9 |
10 files changed, 20 insertions, 5 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 8cffac8..796a0e2 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 @@ -30,6 +30,7 @@ import android.widget.TextView; import com.nostra13.universalimageloader.core.ImageLoader; import com.shamanland.fab.FloatingActionButton; +import com.shamanland.fab.ShowHideOnScroll; import java.io.File; import java.io.FileOutputStream; @@ -135,12 +136,15 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { } } - /* ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow); + ImageView overflow = (ImageView) v.findViewById(R.id.overflow); if (overflow != null) { if (size == SIZE_DIR) { - overflow.setVisibility(View.GONE); + overflow.setImageResource(R.drawable.ic_folder); + } else { + overflow.setImageResource(R.drawable.ic_dots_vertical); + overflow.setOnClickListener(new View.OnClickListener() { @Override @@ -149,16 +153,18 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { } }); } - } */ + } File thumbnailFile = new File(m_activity.getCacheFileName(firstChild != null ? firstChild : filePath + "/" + fileBaseName)); ImageView thumbnail = (ImageView) v.findViewById(R.id.thumbnail); - if (thumbnail != null && thumbnailFile != null) { + if (thumbnail != null && thumbnailFile != null && thumbnailFile.exists()) { ImageLoader imageLoader = ImageLoader.getInstance(); imageLoader.displayImage("file://" + thumbnailFile.getAbsolutePath(), thumbnail); + } else { + thumbnail.setImageDrawable(null); } return v; @@ -209,7 +215,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { GridView grid = (GridView) view.findViewById(R.id.comics_grid); grid.setAdapter(m_adapter); - //grid.setOnTouchListener(new ShowHideOnScroll(fab)); + grid.setOnTouchListener(new ShowHideOnScroll(fab)); grid.setEmptyView(view.findViewById(R.id.no_comics)); grid.setOnItemClickListener(this); diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png Binary files differnew file mode 100644 index 0000000..f4b0bf2 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_dots_vertical.png diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png Binary files differnew file mode 100644 index 0000000..e4388c9 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_folder.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png Binary files differnew file mode 100644 index 0000000..7119299 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_dots_vertical.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png Binary files differnew file mode 100644 index 0000000..dd6369f --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_folder.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png Binary files differnew file mode 100644 index 0000000..12c0e9c --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_dots_vertical.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png Binary files differnew file mode 100644 index 0000000..5175e19 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_folder.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png Binary files differnew file mode 100644 index 0000000..c4997cf --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png diff --git a/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png Binary files differnew file mode 100644 index 0000000..c4ba099 --- /dev/null +++ b/org.fox.ttcomics/src/main/res/drawable-xxxhdpi/ic_folder.png 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 4f7de13..1f35b6d 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 @@ -64,5 +64,14 @@ android:textSize="8sp" /> </LinearLayout> + <ImageView + android:paddingTop="8dp" + android:paddingRight="8dp" + android:layout_gravity="top|right" + android:src="@drawable/ic_dots_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/overflow" /> + </FrameLayout> </android.support.v7.widget.CardView>
\ No newline at end of file |