Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
briar
briar
Commits
d6c18db9
Verified
Commit
d6c18db9
authored
Dec 03, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[android] set image preview size to 1/4 of screen height
parent
8fe49d99
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
4 deletions
+18
-4
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
...ject/briar/android/conversation/ConversationActivity.java
+1
-1
briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
...rproject/briar/android/view/TextAttachmentController.java
+12
-1
briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
...va/org/briarproject/briar/android/view/TextInputView.java
+4
-2
briar-android/src/main/res/layout/text_input_view.xml
briar-android/src/main/res/layout/text_input_view.xml
+1
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View file @
d6c18db9
...
...
@@ -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
()
);
}
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
View file @
d6c18db9
...
...
@@ -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
);
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
View file @
d6c18db9
...
...
@@ -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
)
{
...
...
briar-android/src/main/res/layout/text_input_view.xml
View file @
d6c18db9
...
...
@@ -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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment