Update image display

- Fix images not appearing at the end of notes - Keep image aspect ratio when using fixed size
orgzly · Oct 10, 2018 · 977b55e · 977b55e
1 parent f84b628
commit 977b55e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/com/orgzly/android/ui/views/TextViewWithMarkup.kt b/app/src/main/java/com/orgzly/android/ui/views/TextViewWithMarkup.kt
@@ -118,7 +118,7 @@ class TextViewWithMarkup : TextViewFixed {
 
         // Ensure that we are updating the correct portion of text
         // As this could be called during drawing
-        if(this.text.length > end) {
+        if(this.text.length >= end) {
             builder.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
 
             setText(builder)

diff --git a/app/src/main/java/com/orgzly/android/util/AsyncImageLoader.java b/app/src/main/java/com/orgzly/android/util/AsyncImageLoader.java
@@ -81,7 +81,9 @@ protected void onPostExecute(Drawable result) {
             float newPixelWidth = (int) ((float) view.getWidth());
 
             if(fixedSize > 0) {
-                result.setBounds(0, 0, fixedSize, fixedSize);
+                // Keep aspect ratio when using fixed size
+                float ratio = drawableHeight / drawableWidth;
+                result.setBounds(0, 0, fixedSize, (int) (fixedSize * ratio));
             }
             else {
                 // Rescale the drawable if it is larger that the current view width