Fixed images scaling

glodanif · Mar 24, 2018 · d31b93d · d31b93d
1 parent d477787
commit d31b93d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
-def final VERSION_CODE = 13
-def final VERSION_NAME = '1.0.0'
+def final VERSION_CODE = 14
+def final VERSION_NAME = '1.0.1'
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

diff --git a/...src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ChatMessageConverter.kt b/...src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ChatMessageConverter.kt
@@ -21,11 +21,14 @@ class ChatMessageConverter(private val context: Context, private val displayMetr
 
         val info = message.fileInfo
         val actualSize = info?.split("x")
-        var width = (displayMetrics.widthPixels * .5).toInt()
+        var width = displayMetrics.widthPixels / 2
         var height = width
-        if (info != null && actualSize != null && actualSize.size == 2 && actualSize[0].toInt() >= 0 && actualSize[1].toInt() >= 0) {
-            width = actualSize[0].toInt()
-            height = actualSize[1].toInt()
+        if (info != null && actualSize != null && actualSize.size == 2) {
+            val scaledSize = getScaledSize(actualSize[0].toInt(), actualSize[1].toInt())
+            if (scaledSize.width >= 0 && scaledSize.height >= 0) {
+                width = scaledSize.width
+                height = scaledSize.height
+            }
         }
 
         return ChatMessageViewModel(