Merge branch '346-full-screen-qr-code' into 'master' (bfd22cfc) · Commits · Julian Dehm / briar · GitLab

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

bfd22cfc

Commit bfd22cfc authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '346-full-screen-qr-code' into 'master'

Add fullscreen button to QR code view

Closes #346

See merge request akwizgran/briar!734

parents ea0223ef 74fe36c4

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 34 additions, 0 deletions

...roject/briar/android/keyagreement/ShowQrCodeFragment.java
briar-android/src/main/res/drawable/ic_fullscreen_black_48dp.xml 4 additions, 0 deletions

...ndroid/src/main/res/drawable/ic_fullscreen_black_48dp.xml
briar-android/src/main/res/drawable/ic_fullscreen_exit_black_48dp.xml 4 additions, 0 deletions

...d/src/main/res/drawable/ic_fullscreen_exit_black_48dp.xml
briar-android/src/main/res/layout-land/fragment_keyagreement_qr.xml 45 additions, 31 deletions

...oid/src/main/res/layout-land/fragment_keyagreement_qr.xml
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml 45 additions, 31 deletions

...-android/src/main/res/layout/fragment_keyagreement_qr.xml
briar-android/src/main/res/values/strings.xml 2 additions, 0 deletions

briar-android/src/main/res/values/strings.xml

with 134 additions and 62 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