From 9e96e4434f6583ef18ccafa61ce785ceffbeec1c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 29 Nov 2011 07:40:50 +0300
Subject: [PATCH] feed icon scaling fixes

---
 res/layout/feeds_row.xml             | 5 +++++
 src/org/fox/ttrss/FeedsFragment.java | 5 ++---
 src/org/fox/ttrss/MainActivity.java  | 6 ------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index 88704a1f..7449b79b 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -10,6 +10,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:maxWidth="16dp"
+        android:adjustViewBounds="true"
+        android:maxHeight="16dp"
+        android:minHeight="16dp"
+        android:minWidth="16dp"
         android:src="@drawable/ic_rss_bw" />
 
         <TextView
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 6243f79b..15d5305c 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -45,6 +45,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -375,9 +376,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 					if (iconFile.exists()) {
 						Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath());		
 						if (bmpOrig != null) {
-							Bitmap bmp = Bitmap.createScaledBitmap(bmpOrig, 28, 28, true);
-						
-							icon.setImageBitmap(bmp);
+							icon.setImageBitmap(bmpOrig);
 						}
 					} else {
 						icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw);
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 55df3ba8..78afd450 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -323,12 +323,6 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
 		}
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		
-	}
-
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();