#4111: scale smileys

3 files changed, 46 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 31edc9f..d531303 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -89,7 +89,7 @@ public class HtmlImage implements Html.ImageGetter {
     final private int maxWidth;
     final private int maxHeight;
     final private Resources resources;
-    final private TextView view;
+    protected final TextView view;
 
     // Background loading
     final private PublishSubject<Observable<String>> loading = PublishSubject.create();
@@ -208,12 +208,7 @@ public class HtmlImage implements Html.ImageGetter {
 
             private Pair<BitmapDrawable, Boolean> loadFromDisk() {
                 final Pair<Bitmap, Boolean> loadResult = loadImageFromStorage(url, pseudoGeocode, shared);
-                final Bitmap bitmap = loadResult.getLeft();
-                return new ImmutablePair<>(bitmap != null ?
-                        ImageUtils.scaleBitmapToFitDisplay(bitmap) :
-                        null,
-                        loadResult.getRight()
-                );
+                return scaleImage(loadResult);
             }
 
             private void downloadAndSave(final Subscriber<? super BitmapDrawable> subscriber) {
@@ -254,6 +249,14 @@ public class HtmlImage implements Html.ImageGetter {
         });
     }
 
+    protected Pair<BitmapDrawable, Boolean> scaleImage(final Pair<Bitmap, Boolean> loadResult) {
+        final Bitmap bitmap = loadResult.getLeft();
+        return new ImmutablePair<>(bitmap != null ?
+                ImageUtils.scaleBitmapToFitDisplay(bitmap) :
+                null,
+                loadResult.getRight());
+    }
+
     public Observable<String> waitForEndObservable(@Nullable final CancellableHandler handler) {
         if (handler != null) {
             handler.unsubscribeIfCancelled(subscription);
diff --git a/main/src/cgeo/geocaching/network/SmileyImage.java b/main/src/cgeo/geocaching/network/SmileyImage.java
new file mode 100644
index 0000000..ebac2bb
--- /dev/null
+++ b/main/src/cgeo/geocaching/network/SmileyImage.java
@@ -0,0 +1,34 @@
+package cgeo.geocaching.network;
+
+import cgeo.geocaching.list.StoredList;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.widget.TextView;
+
+public class SmileyImage extends HtmlImage {
+
+    public SmileyImage(final String geocode, final TextView view) {
+        super(geocode, false, StoredList.STANDARD_LIST_ID, false, view);
+    }
+
+    @Override
+    protected Pair<BitmapDrawable, Boolean> scaleImage(final Pair<Bitmap, Boolean> loadResult) {
+        final Bitmap bitmap = loadResult.getLeft();
+        BitmapDrawable drawable;
+        if (bitmap != null) {
+            final int lineHeight = (int) (view.getLineHeight() * 0.8);
+            drawable = new BitmapDrawable(view.getResources(), bitmap);
+            final int width = drawable.getIntrinsicWidth() * lineHeight / drawable.getIntrinsicHeight();
+            drawable.setBounds(0, 0, width, lineHeight);
+        }
+        else {
+            drawable = null;
+        }
+        return new ImmutablePair<>(drawable, loadResult.getRight());
+    }
+
+}
diff --git a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
index 9532946..e7b830e 100644
--- a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
@@ -4,8 +4,7 @@ import cgeo.geocaching.ImagesActivity;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.activity.AbstractActivity;
-import cgeo.geocaching.list.StoredList;
-import cgeo.geocaching.network.HtmlImage;
+import cgeo.geocaching.network.SmileyImage;
 import cgeo.geocaching.ui.AbstractCachingListViewPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.ui.DecryptTextClickListener;
@@ -85,7 +84,7 @@ public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCre
         if (TextUtils.containsHtml(logText)) {
             logText = log.getDisplayText();
             final UnknownTagsHandler unknownTagsHandler = new UnknownTagsHandler();
-            holder.text.setText(Html.fromHtml(logText, new HtmlImage(getGeocode(), false, StoredList.STANDARD_LIST_ID, false, holder.text),
+            holder.text.setText(Html.fromHtml(logText, new SmileyImage(getGeocode(), holder.text),
                     unknownTagsHandler), TextView.BufferType.SPANNABLE);
         } else {
             holder.text.setText(logText, TextView.BufferType.SPANNABLE);