Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

[android] set image preview size to 1/4 of screen height

Browse Source
This commit is contained in:
Torsten Grote
2018-12-03 15:25:23 -02:00
parent 8fe49d9961
commit d6c18db9e9
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -259,7 +259,7 @@ public class ConversationActivity extends BriarActivity
textInputView.setEnabled(false); textInputView.setEnabled(false);
textInputView.setListener(this); textInputView.setListener(this);
if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { if (FEATURE_FLAG_IMAGE_ATTACHMENTS) {
textInputView.setAttachImageListener(this); textInputView.setAttachImageListener(this, getWindowManager());
} }
} }

13
briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
View File

@@ -12,8 +12,11 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v4.view.AbsSavedState; import android.support.v4.view.AbsSavedState;
import android.support.v7.graphics.Palette; import android.support.v7.graphics.Palette;
import android.support.v7.widget.AppCompatImageButton; import android.support.v7.widget.AppCompatImageButton;
import android.util.DisplayMetrics;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
import com.bumptech.glide.load.DataSource; 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; 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); showImageButton(true);
} }

6
briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
View File

@@ -15,6 +15,7 @@ import android.support.v7.widget.AppCompatImageButton;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import com.vanniktech.emoji.EmojiEditText; import com.vanniktech.emoji.EmojiEditText;
import com.vanniktech.emoji.RecentEmoji; import com.vanniktech.emoji.RecentEmoji;
@@ -143,9 +144,10 @@ public class TextInputView extends KeyboardAwareLinearLayout {
textSendController.setSendListener(listener); textSendController.setSendListener(listener);
} }
public void setAttachImageListener(AttachImageListener imageListener) { public void setAttachImageListener(AttachImageListener imageListener,
WindowManager windowManager) {
attachmentController = (TextAttachmentController) textSendController; attachmentController = (TextAttachmentController) textSendController;
attachmentController.setAttachImageListener(imageListener); attachmentController.setAttachImageListener(imageListener, windowManager);
} }
public void onImageReceived(@Nullable Intent resultData) { public void onImageReceived(@Nullable Intent resultData) {

1
briar-android/src/main/res/layout/text_input_view.xml
View File

@@ -23,6 +23,7 @@
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/text_input_image_height" android:layout_height="@dimen/text_input_image_height"
android:minHeight="@dimen/button_size"
tools:background="@color/msg_status_bubble_background" tools:background="@color/msg_status_bubble_background"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:srcCompat="@tools:sample/avatars"/> tools:srcCompat="@tools:sample/avatars"/>