Limit height of emotes in comment flair and body

Author: bharatknv

Diff for: src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditParsedComment.java

@@ -20,6 +20,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.text.style.ImageSpan;
+import android.util.TypedValue;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,6 +36,7 @@
 import org.quantumbadger.redreader.common.General;
 import org.quantumbadger.redreader.common.GenericFactory;
 import org.quantumbadger.redreader.common.Optional;
+import org.quantumbadger.redreader.common.PrefsUtility;
 import org.quantumbadger.redreader.common.Priority;
 import org.quantumbadger.redreader.common.datastream.SeekableInputStream;
 import org.quantumbadger.redreader.http.FailedRequestBody;
@@ -149,10 +151,33 @@ public void onDataStreamComplete(
 								try (InputStream is = stream.create()) {
 									image = BitmapFactory.decodeStream(is);
 
-									image = Bitmap.createScaledBitmap(image,
-											image.getWidth() / 2,
-											image.getHeight() / 2,
-											true);
+									if (image == null) {
+										throw new IOException("Failed to decode bitmap");
+									}
+
+									final int textSize = 11;
+									final float maxImageHeightMultiple = 2.0F;
+
+									final float maxHeight = TypedValue.applyDimension(
+											TypedValue.COMPLEX_UNIT_SP,
+											PrefsUtility.appearance_fontscale_comment_headers()
+													* textSize
+													* maxImageHeightMultiple,
+											activity.getApplicationContext()
+													.getResources()
+													.getDisplayMetrics());
+
+									if (image.getHeight() > maxHeight) {
+										final float imageAspectRatio =
+												(float) image.getHeight() / image.getWidth();
+
+										final float newImageWidth = maxHeight / imageAspectRatio;
+
+										image = Bitmap.createScaledBitmap(image,
+												Math.round(newImageWidth),
+												Math.round(maxHeight),
+												true);
+									}
 
 									if (image == null) {
 										throw new IOException("Failed to decode bitmap");

Diff for: src/main/java/org/quantumbadger/redreader/reddit/prepared/html/HtmlRawElementImg.java

@@ -22,6 +22,7 @@
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ImageSpan;
+import android.util.TypedValue;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,6 +37,7 @@
 import org.quantumbadger.redreader.common.General;
 import org.quantumbadger.redreader.common.GenericFactory;
 import org.quantumbadger.redreader.common.Optional;
+import org.quantumbadger.redreader.common.PrefsUtility;
 import org.quantumbadger.redreader.common.Priority;
 import org.quantumbadger.redreader.common.RRError;
 import org.quantumbadger.redreader.common.UriString;
@@ -105,6 +107,30 @@ public void onDataStreamComplete(
 								throw new IOException("Failed to decode bitmap");
 							}
 
+							final int textSize = 18;
+							final float maxImageHeightMultiple = 2.0F;
+
+							final float maxHeight = TypedValue.applyDimension(
+									TypedValue.COMPLEX_UNIT_SP,
+									PrefsUtility.appearance_fontscale_comment_headers()
+											* textSize
+											* maxImageHeightMultiple,
+									activity.getApplicationContext()
+											.getResources()
+											.getDisplayMetrics());
+
+							if (image.getHeight() > maxHeight) {
+								final float imageAspectRatio =
+										(float) image.getHeight() / image.getWidth();
+
+								final float newImageWidth = maxHeight / imageAspectRatio;
+
+								image = Bitmap.createScaledBitmap(image,
+										Math.round(newImageWidth),
+										Math.round(maxHeight),
+										true);
+							}
+
 							final ImageSpan span = new ImageSpan(
 									activity.getApplicationContext(),
 									image);