Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1e2c17b1

Commit 1e2c17b1 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1242-display-image-attachments-multiple' into 'master'

Swipe left/right in image screen for images from same message

See merge request !1012

parents 87377666 a9949660

No related branches found

No related tags found

Loading

Pipeline #2904 passed 6 years ago

Stage: test

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 3 additions, 0 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java 7 additions, 0 deletions

...iarproject/briar/android/conversation/AttachmentItem.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java 6 additions, 2 deletions

...ject/briar/android/conversation/ConversationActivity.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java 71 additions, 77 deletions

...riarproject/briar/android/conversation/ImageActivity.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java 125 additions, 0 deletions

...riarproject/briar/android/conversation/ImageFragment.java
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java 44 additions, 0 deletions

...iarproject/briar/android/conversation/ImageViewModel.java
briar-android/src/main/res/layout/activity_image.xml 3 additions, 4 deletions

briar-android/src/main/res/layout/activity_image.xml
briar-android/src/main/res/layout/fragment_image.xml 9 additions, 0 deletions

briar-android/src/main/res/layout/fragment_image.xml

with 268 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment