Initial support for read chapters

app/src/main/java/eu/kanade/mangafeed/ui/activity/ReaderActivity.java

@@ -36,7 +36,6 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
 
     @Inject PreferencesHelper prefs;
 
-    private int currentPage;
     private BaseViewer viewer;
 
     private static final int LEFT_TO_RIGHT = 1;
@@ -60,19 +59,14 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
 
         enableHardwareAcceleration();
     }
-
-    @Override
-    public void onDestroy() {
-        getPresenter().setCurrentPage(currentPage);
-        super.onDestroy();
-    }
-
+    
     public void onPageListReady(List<Page> pages) {
         viewer.onPageListReady(pages);
     }
 
     public void onPageChanged(int currentPageIndex, int totalPages) {
-        currentPage = currentPageIndex;
+        if (currentPageIndex != 0)
+            getPresenter().setCurrentPage(currentPageIndex);
         String page = (currentPageIndex + 1) + "/" + totalPages;
         pageNumber.setText(page);
     }

app/src/main/java/eu/kanade/mangafeed/ui/adapter/LibraryAdapter.java

@@ -7,6 +7,7 @@ import android.widget.Filterable;
 import java.util.List;
 
 import eu.kanade.mangafeed.data.models.Manga;
+import eu.kanade.mangafeed.ui.holder.LibraryHolder;
 import rx.Observable;
 import uk.co.ribot.easyadapter.EasyAdapter;
 

app/src/main/java/eu/kanade/mangafeed/ui/fragment/CatalogueFragment.java

@@ -24,7 +24,7 @@ import eu.kanade.mangafeed.R;
 import eu.kanade.mangafeed.data.models.Manga;
 import eu.kanade.mangafeed.presenter.CataloguePresenter;
 import eu.kanade.mangafeed.ui.activity.MangaDetailActivity;
-import eu.kanade.mangafeed.ui.adapter.CatalogueHolder;
+import eu.kanade.mangafeed.ui.holder.CatalogueHolder;
 import eu.kanade.mangafeed.ui.fragment.base.BaseRxFragment;
 import eu.kanade.mangafeed.util.PageBundle;
 import eu.kanade.mangafeed.widget.EndlessScrollListener;

app/src/main/java/eu/kanade/mangafeed/ui/fragment/MangaChaptersFragment.java

@@ -22,7 +22,7 @@ import eu.kanade.mangafeed.data.models.Chapter;
 import eu.kanade.mangafeed.presenter.MangaChaptersPresenter;
 import eu.kanade.mangafeed.ui.activity.MangaDetailActivity;
 import eu.kanade.mangafeed.ui.activity.ReaderActivity;
-import eu.kanade.mangafeed.ui.adapter.ChapterListHolder;
+import eu.kanade.mangafeed.ui.holder.ChapterListHolder;
 import eu.kanade.mangafeed.ui.fragment.base.BaseRxFragment;
 import nucleus.factory.RequiresPresenter;
 import uk.co.ribot.easyadapter.EasyRecyclerAdapter;

app/src/main/java/eu/kanade/mangafeed/ui/fragment/SourceFragment.java

@@ -15,7 +15,7 @@ import eu.kanade.mangafeed.R;
 import eu.kanade.mangafeed.presenter.SourcePresenter;
 import eu.kanade.mangafeed.sources.base.Source;
 import eu.kanade.mangafeed.ui.activity.MainActivity;
-import eu.kanade.mangafeed.ui.adapter.SourceHolder;
+import eu.kanade.mangafeed.ui.holder.SourceHolder;
 import eu.kanade.mangafeed.ui.fragment.base.BaseRxFragment;
 import nucleus.factory.RequiresPresenter;
 import uk.co.ribot.easyadapter.EasyAdapter;

app/src/main/java/eu/kanade/mangafeed/ui/holder/CatalogueHolder.java

@@ -1,4 +1,4 @@
-package eu.kanade.mangafeed.ui.adapter;
+package eu.kanade.mangafeed.ui.holder;
 
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/eu/kanade/mangafeed/ui/holder/ChapterListHolder.java

@@ -1,5 +1,7 @@
-package eu.kanade.mangafeed.ui.adapter;
+package eu.kanade.mangafeed.ui.holder;
 
+import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -14,11 +16,9 @@ import uk.co.ribot.easyadapter.annotations.ViewId;
 @LayoutId(R.layout.item_chapter)
 public class ChapterListHolder extends ItemViewHolder<Chapter> {
 
-    @ViewId(R.id.chapter_title)
-    TextView title;
-
-    @ViewId(R.id.chapter_download_image)
-    ImageView download_icon;
+    @ViewId(R.id.chapter_title) TextView title;
+    @ViewId(R.id.chapter_download_image) ImageView download_icon;
+    @ViewId(R.id.chapter_pages) TextView pages;
 
     View view;
 
@@ -30,6 +30,18 @@ public class ChapterListHolder extends ItemViewHolder<Chapter> {
     public void onSetValues(Chapter chapter, PositionInfo positionInfo) {
         title.setText(chapter.name);
         download_icon.setImageResource(R.drawable.ic_file_download_black_48dp);
+
+        if (chapter.read) {
+            title.setTextColor(ContextCompat.getColor(getContext(), R.color.chapter_read_text));
+        } else {
+            title.setTextColor(Color.BLACK);
+        }
+
+        if (chapter.last_page_read > 0 && !chapter.read) {
+            pages.setText(getContext().getString(R.string.chapter_progress, chapter.last_page_read));
+        } else {
+            pages.setText("");
+        }
     }
 
     @Override

app/src/main/java/eu/kanade/mangafeed/ui/holder/LibraryHolder.java

@@ -1,4 +1,4 @@
-package eu.kanade.mangafeed.ui.adapter;
+package eu.kanade.mangafeed.ui.holder;
 
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/eu/kanade/mangafeed/ui/holder/SourceHolder.java

@@ -1,4 +1,4 @@
-package eu.kanade.mangafeed.ui.adapter;
+package eu.kanade.mangafeed.ui.holder;
 
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/eu/kanade/mangafeed/ui/viewer/VerticalViewer.java

@@ -54,8 +54,7 @@ public class VerticalViewer extends BaseViewer {
 
     @Override
     public void setSelectedPage(int pageNumber) {
-        // TODO
-        return;
+        viewPager.setCurrentItem(getCurrentPageIndex(pageNumber));
     }
 
     @Override
@@ -66,6 +65,6 @@ public class VerticalViewer extends BaseViewer {
 
     @Override
     public boolean onImageTouch(MotionEvent motionEvent) {
-        return false;
+        return true;
     }
 }