1 files changed, 19 insertions, 37 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
index 4121dfd..266597d 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
@@ -6,14 +6,15 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
+import android.util.Log;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.fox.ttcomics2.archive.ComicArchive;
 
@@ -41,10 +42,6 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
         m_page = page;
     }
 
-	public void setPage(int page) {
-		m_page = page;
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
 		
@@ -53,28 +50,19 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 		final ImageViewTouch image = view.findViewById(R.id.comic_image);
         image.setFitToScreen(true);
 
-        ImageLoader imageLoader = ImageLoader.getInstance();
-
-        if (m_prefs.getBoolean("fit_to_width", false)) {
-            image.setFitToWidth(true);
-        }
-
-        try {
-            byte[] buf = m_archive.getByteArray(m_page);
-
-            DisplayImageOptions options = new DisplayImageOptions.Builder()
-                    .showImageOnFail(R.drawable.badimage)
-                    .extraForDownloader(buf)
-					.cacheOnDisk(false)
-					.cacheInMemory(false)
-                    .build();
-
-            imageLoader.displayImage("stream://" + m_page, image, options);
-
-        } catch (IOException e) {
-            image.setImageResource(R.drawable.badimage);
-            e.printStackTrace();
-        }
+        Log.d(TAG, "loading page:" + m_page + " " + m_archive);
+
+		try {
+			Glide.with(ComicFragment.this)
+                .load(m_archive.getItem(m_page))
+				.dontAnimate()
+				.diskCacheStrategy(DiskCacheStrategy.NONE)
+				.skipMemoryCache(true)
+                .into(image);
+		} catch (IOException e) {
+			image.setImageResource(R.drawable.badimage);
+			e.printStackTrace();
+		}
 
         image.setOnScaleChangedListener(new ImageViewTouch.OnScaleChangedListener() {
             @Override
@@ -92,12 +80,6 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 			
 		//}
 		
-		/* TextView page = (TextView) view.findViewById(R.id.comic_page);
-		
-		if (page != null) {
-			page.setText(String.valueOf(m_page+1));
-		} */
-
 		return view;
 		
 	}
@@ -113,8 +95,8 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 			}
 		}
 	}
-	
-	public boolean canScroll(int direction) {
+
+	/*public boolean canScroll(int direction) {
 		ImageViewTouch image = getView().findViewById(R.id.comic_image);
 		
 		if (image != null) {
@@ -122,7 +104,7 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 		} else {
 			return false;
 		}
-	}
+	}*/
 	
 	private void onRightSideTapped() {
 		ImageViewTouch image = getView().findViewById(R.id.comic_image);