Merge pull request #1099 from mozilla/android-implement-share-card

Fix #888 Implement share card.
This commit is contained in:
Danny Coates 2019-01-16 13:26:41 -08:00 committed by GitHub
commit a6a8fa6528
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 7 deletions

View file

@ -1,7 +1,16 @@
/* global Android */
const html = require('choo/html');
const raw = require('choo/html/raw');
const assets = require('../../common/assets');
const { bytes, copyToClipboard, list, percent, timeLeft } = require('../utils');
const {
browserName,
bytes,
copyToClipboard,
list,
percent,
timeLeft
} = require('../utils');
const expiryOptions = require('./expiryOptions');
function expiryInfo(translate, archive) {
@ -140,6 +149,26 @@ function archiveDetails(translate, archive) {
}
module.exports = function(state, emit, archive) {
const copyOrShare =
browserName() !== 'android-app'
? html`
<button
class="text-blue hover:text-blue-dark focus:text-blue-darker self-end font-medium flex items-center"
onclick=${copy}
>
<img src="${assets.get('copy-16.svg')}" class="mr-2" /> ${
state.translate('copyUrlHover')
}
</button>
`
: html`
<button
class="text-blue hover:text-blue-dark focus:text-blue-darker self-end font-medium flex items-center"
onclick=${share}
>
<img src="${assets.get('share-16.svg')}" class="mr-2" /> Share
</button>
`;
return html`
<send-archive
id="archive-${archive.id}"
@ -162,12 +191,7 @@ module.exports = function(state, emit, archive) {
</div>
${archiveDetails(state.translate, archive)}
<hr class="w-full border-t my-4">
<button
class="text-blue hover:text-blue-dark focus:text-blue-darker self-end font-medium flex items-center"
onclick=${copy}>
<img src="${assets.get('copy-16.svg')}" class="mr-2"/>
${state.translate('copyUrlHover')}
</button>
${copyOrShare}
</send-archive>`;
function copy(event) {
@ -185,6 +209,11 @@ module.exports = function(state, emit, archive) {
event.stopPropagation();
emit('delete', { file: archive, location: 'success-screen' });
}
function share(event) {
event.stopPropagation();
Android.shareUrl(archive.url);
}
};
module.exports.wip = function(state, emit) {