From d6c18db9e9bd1ed1caebaf62af4ba7e620c9050a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 3 Dec 2018 15:25:23 -0200
Subject: [PATCH] [android] set image preview size to 1/4 of screen height

---
 .../android/conversation/ConversationActivity.java  |  2 +-
 .../android/view/TextAttachmentController.java      | 13 ++++++++++++-
 .../briar/android/view/TextInputView.java           |  6 ++++--
 .../src/main/res/layout/text_input_view.xml         |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 890e8f16a..5d53b8d19 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -259,7 +259,7 @@ public class ConversationActivity extends BriarActivity
 		textInputView.setEnabled(false);
 		textInputView.setListener(this);
 		if (FEATURE_FLAG_IMAGE_ATTACHMENTS) {
-			textInputView.setAttachImageListener(this);
+			textInputView.setAttachImageListener(this, getWindowManager());
 		}
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
index fbcc8d53b..ecfc6b02c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
@@ -12,8 +12,11 @@ import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.AbsSavedState;
 import android.support.v7.graphics.Palette;
 import android.support.v7.widget.AppCompatImageButton;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.view.WindowManager;
 import android.widget.ImageView;
 
 import com.bumptech.glide.load.DataSource;
@@ -79,8 +82,16 @@ class TextAttachmentController extends TextSendController {
 		});
 	}
 
-	public void setAttachImageListener(AttachImageListener imageListener) {
+	public void setAttachImageListener(AttachImageListener imageListener,
+			WindowManager windowManager) {
 		this.imageListener = imageListener;
+		// set preview size based on screen height
+		DisplayMetrics displayMetrics = new DisplayMetrics();
+		windowManager.getDefaultDisplay().getMetrics(displayMetrics);
+		LayoutParams layoutParams = imageView.getLayoutParams();
+		layoutParams.height = displayMetrics.heightPixels / 4;
+		imageView.setLayoutParams(layoutParams);
+		// show image button
 		showImageButton(true);
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
index 870e756f5..f57311d44 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
@@ -15,6 +15,7 @@ import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.vanniktech.emoji.EmojiEditText;
 import com.vanniktech.emoji.RecentEmoji;
@@ -143,9 +144,10 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 		textSendController.setSendListener(listener);
 	}
 
-	public void setAttachImageListener(AttachImageListener imageListener) {
+	public void setAttachImageListener(AttachImageListener imageListener,
+			WindowManager windowManager) {
 		attachmentController = (TextAttachmentController) textSendController;
-		attachmentController.setAttachImageListener(imageListener);
+		attachmentController.setAttachImageListener(imageListener, windowManager);
 	}
 
 	public void onImageReceived(@Nullable Intent resultData) {
diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml
index b5416ff92..19fce38e0 100644
--- a/briar-android/src/main/res/layout/text_input_view.xml
+++ b/briar-android/src/main/res/layout/text_input_view.xml
@@ -23,6 +23,7 @@
 			android:id="@+id/imageView"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/text_input_image_height"
+			android:minHeight="@dimen/button_size"
 			tools:background="@color/msg_status_bubble_background"
 			tools:ignore="ContentDescription"
 			tools:srcCompat="@tools:sample/avatars"/>