From a93ad31cb81f600f830dc3d8d9b4aaa2fff0b992 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 9 Feb 2015 13:40:13 +0300
Subject: layout tweaks; use UIL to load cover images

---
 .../java/org/fox/ttcomics/ComicListFragment.java   | 74 ++--------------------
 .../main/java/org/fox/ttcomics/CommonActivity.java |  8 +++
 2 files changed, 15 insertions(+), 67 deletions(-)

(limited to 'org.fox.ttcomics/src/main/java/org')

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
index 8afe882..919fa64 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
@@ -31,6 +31,8 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.nostra13.universalimageloader.core.ImageLoader;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -135,7 +137,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 				}
 			}
 			
-			ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow);
+			/* ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow);
 			
 			if (overflow != null) {
 				if (size == SIZE_DIR) {
@@ -149,36 +151,16 @@ 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) {
-				/* View imageholder = v.findViewById(R.id.imageholder);
-				
-				int padding = dpToPx(2);
-
-				if (imageholder != null) {
-					if (size == SIZE_DIR) {					
-						imageholder.setBackgroundResource(R.drawable.comic_tile_folder);
-						imageholder.setPadding(padding, padding, padding, padding);
-					} else {
-						imageholder.setBackgroundResource(R.drawable.comic_tile);
-						imageholder.setPadding(padding, padding, padding, padding);
-					}
-				} */
-				
-				thumbnail.setTag("");
-				thumbnail.setImageResource(R.drawable.ic_launcher);
-				
-				if (m_activity.isStorageAvailable() && thumbnailFile.exists()) {
-					thumbnail.setTag(thumbnailFile.getAbsolutePath());
+			if (thumbnail != null && thumbnailFile != null) {
 
-					CoverImageLoader imageLoader = new CoverImageLoader();
-					imageLoader.execute(thumbnail);
-				}
+                ImageLoader imageLoader = ImageLoader.getInstance();
+                imageLoader.displayImage("file://" + thumbnailFile.getAbsolutePath(), thumbnail);
 			}
 
 			return v;
@@ -191,46 +173,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	    return px;
 	}
 
-	class CoverImageLoader extends AsyncTask<ImageView, Void, Bitmap> {
-		private ImageView m_thumbnail;
-		private String m_tag;
-		
-		@Override
-		protected Bitmap doInBackground(ImageView... params) {
-			m_thumbnail = params[0];
-			
-			if (m_thumbnail != null) {
-				m_tag = m_thumbnail.getTag().toString(); 
-				
-				File thumbnailFile = new File(m_tag);
-				
-				if (thumbnailFile.exists() && thumbnailFile.canRead()) {
-				
-				    final BitmapFactory.Options options = new BitmapFactory.Options();
-				    options.inJustDecodeBounds = true;
-				    BitmapFactory.decodeFile(thumbnailFile.getAbsolutePath(), options);
-		
-				    options.inSampleSize = CommonActivity.calculateInSampleSize(options, 256, 256);
-				    options.inJustDecodeBounds = false;
-				    
-				    Bitmap bmp = BitmapFactory.decodeFile(thumbnailFile.getAbsolutePath(), options);
-				
-				    return bmp;
-				}
-			}
-			
-			return null;
-		}
-		
-		@Override
-        protected void onPostExecute(Bitmap bmp) {
-			if (isAdded() && bmp != null && m_tag != null && m_tag.equals(m_thumbnail.getTag().toString())) {
-				m_thumbnail.setImageBitmap(bmp);
-			}
-		}
-		
-	};
-	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
 		
@@ -239,7 +181,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		if (savedInstanceState != null) {
 			m_mode = savedInstanceState.getInt("mode");
 			m_baseDirectory = savedInstanceState.getString("baseDir");
-			//m_files = savedInstanceState.getStringArrayList("files");
 		}
 
 		m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container);
@@ -517,7 +458,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 
 		out.putInt("mode", m_mode);
 		out.putString("baseDir", m_baseDirectory);
-		//out.putStringArrayList("files", m_files);
 	}
 	
 }
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
index 9e99b5b..e41e27d 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
@@ -23,6 +23,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+
 import java.io.File;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -52,6 +55,11 @@ public class CommonActivity extends ActionBarActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this)
+                .diskCacheSize(0)
+                .build();
+        ImageLoader.getInstance().init(config);
+
     	m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	
     	initDatabase();
-- 
cgit v1.2.3