Merge pull request #292 from Astagor/share_photo_from_mobile_gallery

Added share photo from gallery on mobile
2020-05-05 09:22:51 +02:00 · 2020-05-05 09:22:51 +02:00 · 24f7bd2a9b
parent 2b3ebe8eec 897b99cdbe
commit 24f7bd2a9b
18 changed files with 77 additions and 20 deletions
--- a/app/src/components/MeetingDrawer/FileSharing/FileSharing.js
+++ b/app/src/components/MeetingDrawer/FileSharing/FileSharing.js
@ -25,6 +25,10 @@ const styles = (theme) =>
 		button :
 		{
 			margin : theme.spacing(1)
+		},
+		shareButtonsWrapper :
+		{
+			display : 'flex'
 		}
 	});

@ -42,6 +46,7 @@ const FileSharing = (props) =>

 	const {
 		canShareFiles,
+		browser,
 		canShare,
 		classes
 	} = props;
@ -57,9 +62,21 @@ const FileSharing = (props) =>
 			defaultMessage : 'File sharing not supported'
 		});

+	const buttonGalleryDescription = canShareFiles ?
+		intl.formatMessage({
+			id             : 'label.shareGalleryFile',
+			defaultMessage : 'Share from gallery'
+		})
+		:
+		intl.formatMessage({
+			id             : 'label.fileSharingUnsupported',
+			defaultMessage : 'File sharing not supported'
+		});
+
 	return (
 		<Paper className={classes.root}>
 			<FileSharingModerator />
+			<div className={classes.shareButtonsWrapper} >
 				<input
 					className={classes.input}
 					type='file'
@ -69,6 +86,14 @@ const FileSharing = (props) =>
 					onClick={(e) => (e.target.value = null)}
 					id='share-files-button'
 				/>
+				<input
+					className={classes.input}
+					type='file'
+					disabled={!canShare}
+					onChange={handleFileChange}
+					accept='image/*'
+					id='share-files-gallery-button'
+				/>
 				<label htmlFor='share-files-button'>
 					<Button
 						variant='contained'
@ -79,7 +104,19 @@ const FileSharing = (props) =>
 						{buttonDescription}
 					</Button>
 				</label>
-
+				{
+					(browser.platform === 'mobile') && canShareFiles && canShare && <label htmlFor='share-files-gallery-button'>
+						<Button
+							variant='contained'
+							component='span'
+							className={classes.button}
+							disabled={!canShareFiles || !canShare}
+						>
+							{buttonGalleryDescription}
+						</Button>
+					</label>
+				}
+			</div>
 			<FileList />
 		</Paper>
 	);
@ -87,6 +124,7 @@ const FileSharing = (props) =>

 FileSharing.propTypes = {
 	roomClient    : PropTypes.any.isRequired,
+	browser       : PropTypes.object.isRequired,
 	canShareFiles : PropTypes.bool.isRequired,
 	tabOpen       : PropTypes.bool.isRequired,
 	canShare      : PropTypes.bool.isRequired,
@ -97,6 +135,7 @@ const mapStateToProps = (state) =>
 {
 	return {
 		canShareFiles : state.me.canShareFiles,
+		browser       : state.me.browser,
 		tabOpen       : state.toolarea.currentToolTab === 'files',
 		canShare      :
 			state.me.roles.some((role) =>
@ -113,6 +152,7 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.room.permissionsFromRoles === next.room.permissionsFromRoles &&
+				prev.me.browser === next.me.browser &&
 				prev.me.roles === next.me.roles &&
 				prev.me.canShareFiles === next.me.canShareFiles &&
 				prev.toolarea.currentToolTab === next.toolarea.currentToolTab
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@ -92,6 +92,7 @@
 	"label.filesharing": "文件共享",
 	"label.participants": "参与者",
 	"label.shareFile": "共享文件",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "不支持文件共享",
 	"label.unknown": "未知",
 	"label.democratic": "民主视图",
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@ -91,6 +91,7 @@
 	"label.filesharing": "Sdílení souborů",
 	"label.participants": "Účastníci",
 	"label.shareFile": "Sdílet soubor",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Sdílení souborů není podporováno",
 	"label.unknown": "Neznámý",
 	"label.democratic": "Rozvržení: Demokratické",
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Dateien",
 	"label.participants": "Teilnehmer",
 	"label.shareFile": "Datei hochladen",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Dateifreigabe nicht unterstützt",
 	"label.unknown": "Unbekannt",
 	"label.democratic": "Demokratisch",
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Fildeling",
 	"label.participants": "Deltagere",
 	"label.shareFile": "Del fil",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Fildeling er ikke understøttet",
 	"label.unknown": "Ukendt",
 	"label.democracy": "Galleri visning",
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Διαμοιρασμοός αρχείου",
 	"label.participants": "Συμμετέχοντες",
 	"label.shareFile": "Διαμοιραστείτε ένα αρχείο",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Ο διαμοιρασμός αρχείων δεν υποστηρίζεται",
 	"label.unknown": "Άγνωστο",
 	"label.democratic": null,
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@ -92,6 +92,7 @@
 	"label.filesharing": "File sharing",
 	"label.participants": "Participants",
 	"label.shareFile": "Share file",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "File sharing not supported",
 	"label.unknown": "Unknown",
 	"label.democratic": "Democratic view",
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Compartir ficheros",
 	"label.participants": "Participantes",
 	"label.shareFile": "Compartir fichero",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Compartir ficheros no está disponible",
 	"label.unknown": "Desconocido",
 	"label.democratic": "Vista democrática",
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Partage de fichier",
 	"label.participants": "Participants",
 	"label.shareFile": "Partager un fichier",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Partage de fichier non supporté",
 	"label.unknown": "Inconnu",
 	"label.democratic": "Vue démocratique",
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Dijeljenje datoteka",
 	"label.participants": "Sudionici",
 	"label.shareFile": "Dijeli datoteku",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Dijeljenje datoteka nije podržano",
 	"label.unknown": "Nepoznato",
 	"label.democratic":"Demokratski prikaz",
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Fájl megosztás",
 	"label.participants": "Résztvevők",
 	"label.shareFile": "Fájl megosztása",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Fájl megosztás nem támogatott",
 	"label.unknown": "Ismeretlen",
 	"label.democratic": "Egyforma képméretű képkiosztás",
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@ -91,6 +91,7 @@
 	"label.filesharing": "Condivisione file",
 	"label.participants": "Partecipanti",
 	"label.shareFile": "Condividi file",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Condivisione file non supportata",
 	"label.unknown": "Sconosciuto",
 	"label.democratic": "Vista Democratica",
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Fildeling",
 	"label.participants": "Deltakere",
 	"label.shareFile": "Del fil",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Fildeling ikke støttet",
 	"label.unknown": "Ukjent",
 	"label.democratic": "Demokratisk",
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Udostępnianie plików",
 	"label.participants": "Uczestnicy",
 	"label.shareFile": "Udostępnij plik",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Udostępnianie plików nie jest obsługiwane",
 	"label.unknown": "Nieznane",
 	"label.democratic": "Układ demokratyczny",
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Partilha de ficheiro",
 	"label.participants": "Participantes",
 	"label.shareFile": "Partilhar ficheiro",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Partilha de ficheiro não disponível",
 	"label.unknown": "Desconhecido",
 	"label.democratic": "Vista democrática",
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Partajarea fișierelor",
 	"label.participants": "Participanți",
 	"label.shareFile": "Partajează fișierul",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Partajarea fișierelor nu este acceptată",
 	"label.unknown": "Necunoscut",
 	"label.democratic": "Distribuție egală a dimensiunii imaginii", 
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Dosya paylaşım",
 	"label.participants": "Katılımcı",
 	"label.shareFile": "Dosya paylaş",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Dosya paylaşımı desteklenmiyor",
 	"label.unknown": "Bilinmeyen",
 	"label.democratic": "Demokratik görünüm",
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@ -92,6 +92,7 @@
 	"label.filesharing": "Обмін файлами",
 	"label.participants": "Учасники",
 	"label.shareFile": "Надіслати файл",
+	"label.shareGalleryFile": null,
 	"label.fileSharingUnsupported": "Обмін файлами не підтримується",
 	"label.unknown": "Невідомо",
 	"label.democrat": "Демократичний вигляд",