From de88957a628102c4173f4843d4f014707e983e4e Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Thu, 29 Dec 2022 15:25:30 +0100 Subject: [PATCH] save tmp clean + Videos OK --- ComApp/src/App.js | 4 +- ComApp/src/App/Views/VideoScreen.js | 33 ++++-- ComApp/src/I18n.js | 6 +- ComApp/src/Locales/de.json | 157 --------------------------- ComApp/src/Locales/en.json | 157 --------------------------- ComApp/src/Locales/fr.json | 162 ---------------------------- 6 files changed, 30 insertions(+), 489 deletions(-) delete mode 100644 ComApp/src/Locales/de.json delete mode 100644 ComApp/src/Locales/en.json delete mode 100644 ComApp/src/Locales/fr.json diff --git a/ComApp/src/App.js b/ComApp/src/App.js index 8eb3684..fa9d90e 100644 --- a/ComApp/src/App.js +++ b/ComApp/src/App.js @@ -22,15 +22,13 @@ import SyncScreen from './App/Views/SyncScreen'; import HomeScreen from './App/Views/HomeScreen'; import DirectoriesScreen from './App/Views/DirectoriesScreen'; import PDFScreen from './App/Views/PDFScreen'; +import VideoScreen from './App/Views/VideoScreen'; import OnlyVideosScreen from './App/Views/OnlyVideosScreen'; import ContactScreen from './App/Views/ContactScreen'; import ContactDetailsScreen from './App/Views/ContactDetailsScreen'; import SearchScreen from "./App/Views/SearchScreen"; import MySpaceScreen from './App/Views/MySpaceScreen'; // END V2 - -import VideoScreen from './Views/Video'; - // V2 //SplashScreen.preventAutoHideAsync(); //Keep diff --git a/ComApp/src/App/Views/VideoScreen.js b/ComApp/src/App/Views/VideoScreen.js index 99a2cdf..6b0ec69 100644 --- a/ComApp/src/App/Views/VideoScreen.js +++ b/ComApp/src/App/Views/VideoScreen.js @@ -3,26 +3,45 @@ import { View, Dimensions } from 'react-native'; // FileSytem import * as FileSystem from 'expo-file-system'; // Video -import { Video } from 'expo-av'; +import { ResizeMode } from 'expo-av'; import VideoPlayer from 'expo-video-player'; class VideoScreen extends React.Component { render() { const { uuid } = this.props.route.params; + let width = Dimensions.get("window").width; + let height = Dimensions.get("window").height; + + // if portrait + if (height > width) { + let tmpHeight = height; + height = width - 150; + width = tmpHeight + 100; + } else { + height = height - 100; + } return ( - + ); diff --git a/ComApp/src/I18n.js b/ComApp/src/I18n.js index f67cde5..57fcae8 100644 --- a/ComApp/src/I18n.js +++ b/ComApp/src/I18n.js @@ -1,8 +1,8 @@ import { I18n } from 'i18n-js'; -import fr from './Locales/fr'; -import en from './Locales/en'; -import de from './Locales/de'; +import fr from './Resources/Locales/fr'; +import en from './Resources/Locales/en'; +import de from './Resources/Locales/de'; const i18n = new I18n({ fr: fr, diff --git a/ComApp/src/Locales/de.json b/ComApp/src/Locales/de.json deleted file mode 100644 index 522ecf7..0000000 --- a/ComApp/src/Locales/de.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "global": { - "yes": "Ja", - "no": "Nein", - "home": "Startseite", - "search": "Suche", - "login": "Verbindung", - "email": "Email", - "message_sent": "Email geschickt", - "message_will_be_sent_after_sync": "Die Nachricht wird nach Synchronisation geschickt", - "warning": "Achtung", - "synchronization": "Synchronisation ", - "videos": "Videos", - "contacts": "Kontakt", - "confirmation": "Bestätigung", - "name": "Name", - "firstname": "Vorname", - "address": "Adresse", - "phone": "Telefonnummer", - "company": "Firma", - "add": "Addieren", - "cancel": "Abbrechen", - "subject": "Betreff", - "message": "Nachricht", - "send": "Senden", - "required": "erforderlich", - "save": "Speichern", - "retry": "Noch einmal versuchen", - "next": "Nächstes" - }, - "app": { - "file_sharing": " Dateifreigabe", - "folders": "Ordner", - "video": "Video", - "contact_details": "Kontaktdaten", - "results_search": "Suchergebnisse", - "my_space": "Mein Raum" - }, - "login_s": { - "install": "Installieren", - "username": "Benutzername", - "password": "Passwort" - }, - "home_s": { - "1": "Die Gruppe", - "2": "Unsere Marken", - "3": "Andere" - }, - "search_s": { - "no_result": "Keine Ergebnisse" - }, - "sync_s": { - "download": "Download", - "update_completed": "Update abgeschlossen", - "updating_docs": "Dokumentaktualisierung", - "updating_folders": "Dateien aktualisieren", - "sending_flyers": "Brochure senden", - "updating_contacts": "Kontakt aktualisieren", - "user_install_completed": "Benutzerinstallation abgeschlossen", - "updating_users": "Benutzer-Update", - "user_install": "Benutzerinstallation", - "start_sync": "Synchronisation starten", - "new_app_version": "Eine neue Version der Anwendung ist verfügbar!", - "open_store": "Öffnen Sie den App Store" - }, - "contact_s": { - "contact_transferred": "Kontakt weiterleiten", - "contact_will_be_sent_after_sync": "Der Kontakt wird nach der Synchronisation gesendet", - "confirm_contact_delete": "Möchten Sie diesen Kontakt wirklich löschen?", - "contact_deleted": "Kontakt gelöscht", - "contact_added": "Kontakt hinzugefügt", - "send_flyer": "Senden Sie eine Broschüre", - "select_contact": "Wählen Sie den Kontakt", - "transfer": "weiterleiten", - "contact_list": "Kontaktliste", - "documents_list": "Liste der Dokumente" - }, - "contact_details_s": { - "visits": "Besuche", - "notes": "Notes", - "contact_saved": "Kontakt gespeichert", - "confirm_visit_delete": "Sind Sie sicher, dass Sie diesen Besuch löschen möchten?", - "qrcode_not_vcard_format": "Dieser QRCode ist nicht im vCard-Format", - "customer": "Kunde", - "prospect": "potenzieller Kunde", - "other": "Andere", - "description": "Beschreibung", - "no_visits": "Kein Besuch", - "visit_name": "Besuchsname" - }, - "error": { - "error": "Fehler ", - "tablet_not_connected_internet": "Das Tablet ist nicht mit dem Internet verbunden.", - "tablet_not_synced_last_user": "Das Tablet wurde vom vorherigen Benutzer nicht synchronisiert", - "incorrect_credentials": "Falsche Anmeldeinformationen", - "must_fill_login_fields": "Sie müssen die Verbindungsfelder ausfüllen", - "invalid_email_address": "Ungültige E-Mail-Adresse", - "error_has_occurred": "Ein Fehler ist aufgetreten", - "must_be_connected_internet_sync": "Sie müssen mit dem Internet verbunden sein, um die Synchronisierung zu starten", - "incomplete_form": "Unvollständiges Formular", - "fill_all_fields_and_1_doc_min": "Bitte füllen Sie alle Felder, mindestens 1 Dokument und eine gültige E-Mail-Adresse aus.", - "fill_other_field": "Füllen Sie das Beschreibungsfeld für: Andere", - "specify_type_contact": "Bitte geben Sie die Art des Kontakts an", - "invalid_name": "ungültiger Name", - "invalid_firstname": "ungültiger Vorname", - "camera_permission_denied": "Kameraerlaubnis verweigert", - "pending_camera_permission": "Warten auf Kameraerlaubnis" - }, - "custom": { - "select-1": { - "title": "Art des Geschäfts", - "c1": "Einzelhandel", - "c2": "Home Service / Freezer Center", - "c3": "Restauration Tischservice", - "c4": "Fast Food und Snacking", - "c5": "Cafeteria / Selbstbedienungsladen", - "c6": "Catering-Unternehmen", - "c7": "Freihändige Verpflegung / Centrale Küche", - "c8": "Unabhängiger Vertriebspartner", - "c9": "Bäckerei Konditorei", - "c10": "Lebensmittel Zwischenprodukte", - "c11": "Destocker", - "c12": "Halal-Handel", - "c13": "Verpflegung von Unterkünften", - "c14": "Zentrale Geschäftsrestauration", - "c15": "Catering und Park", - "c16": "Verpflegung von Transport", - "c17": "Öffentlicher Markt", - "c18": "Cash", - "c19": "Nationaler Vertriebspartner", - "c20": "Rungis", - "c21": "Schlachthof", - "c22": "Andere" - }, - "select-2": { - "title": "Site", - "c1": "Celvia Dinde", - "c2": "Celvia Elaborés", - "c3": "Celvia Sérent", - "c4": "Procanar", - "c5": "Celtys", - "c6": "Farmor", - "c7": "Robichon", - "c8": "Les Volailles de Kerana", - "c9": "Bosher Volaille", - "c10": "LDC Bretagne", - "c11": "Doux Farmor", - "c12": "Favreau" - }, - "interest": { - "p1": "Huhn", - "p2": "Pute", - "p3": "Ente", - "p4": "Andere" - } - } -} diff --git a/ComApp/src/Locales/en.json b/ComApp/src/Locales/en.json deleted file mode 100644 index 94d6926..0000000 --- a/ComApp/src/Locales/en.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "global": { - "yes": "Yes", - "no": "No", - "home": "Home", - "search": "Search", - "login": "Login", - "email": "Email", - "message_sent": "Message Sent", - "message_will_be_sent_after_sync": "Message will be send after synchronization", - "warning": "Warning", - "synchronization": "Synchronization", - "videos": "Videos", - "contacts": "Contacts", - "confirmation": "Confirmation", - "name": "Lastname", - "firstname": "Firstname", - "address": "Adress", - "phone": "Phone number", - "company": "Company", - "add": "Add", - "cancel": "Cancel", - "subject": "Object", - "message": "Message", - "send": "Send", - "required": "required", - "save": "Save", - "retry": "Retry", - "next": "Next" - }, - "app": { - "file_sharing": "File Sharing", - "folders": "Folders", - "video": "Video", - "contact_details": "Contact information", - "results_search": "Search results", - "my_space": "Personal Dashboard" - }, - "login_s": { - "install": "Install", - "username": "Username", - "password": "Password" - }, - "home_s": { - "1": "The Group", - "2": "Our Brands", - "3": "Others" - }, - "search_s": { - "no_result": "No Result" - }, - "sync_s": { - "download": "Download", - "update_completed": "Update Done", - "updating_docs": "Updating documents", - "updating_folders": "Updating folders", - "sending_flyers": "Sending documents", - "updating_contacts": "Updating contacts", - "user_install_completed": "User install completed", - "updating_users": "Updating Users", - "user_install": "Installing Users", - "start_sync": "START SYNCHRONIZATION", - "new_app_version": "A new version of the application is available!", - "open_store": "Open the store" - }, - "contact_s": { - "contact_transferred": "Contact Transferred", - "contact_will_be_sent_after_sync": "The contact will be sent after synchronization", - "confirm_contact_delete": "Are you sure to delete this contact ?", - "contact_deleted": "Contact deleted", - "contact_added": "Contact added", - "send_flyer": "Send a document", - "select_contact": "Select the contact", - "transfer": "Transfer", - "contact_list": "Contact List", - "documents_list": "Documents List" - }, - "contact_details_s": { - "visits": "Visits", - "notes": "Notes", - "contact_saved": "Contact saved", - "confirm_visit_delete": "are you sure to delete this visit ?", - "qrcode_not_vcard_format": "This QRCode is not a VCard", - "customer": "Customer", - "prospect": "Prospect", - "other": "Other", - "description": "Description", - "no_visits": "No visits available", - "visit_name": "visits name" - }, - "error": { - "error": "Error", - "tablet_not_connected_internet": "The tablet is not connected to Internet", - "tablet_not_synced_last_user": "The previous user didn't synchronised the tablet", - "incorrect_credentials": "Incorrect Credentials", - "must_fill_login_fields": "You must fill the login fields.", - "invalid_email_address": "Invalid E-mail adress", - "error_has_occurred": "An error occured", - "must_be_connected_internet_sync": "You must be connected to internet to be able to synchronize", - "incomplete_form": "Incomplete Form", - "fill_all_fields_and_1_doc_min": "Please fill up all the fields, at least one document and a valid e-mail adress", - "fill_other_field": "You must fill the description field for : Other", - "specify_type_contact": "You must specify the contact type", - "invalid_name": "Invalid lastname", - "invalid_firstname": "Invalid firstname", - "camera_permission_denied": "Camera Permission Denied", - "pending_camera_permission": "Waiting for the camera permission" - }, - "custom": { - "select-1": { - "title": "Type of business", - "c1": "Retail trade", - "c2": "Home Service / Freezer Center", - "c3": "Catering table service", - "c4": "Fast food and snacking", - "c5": "Cafeteria / Self Service", - "c6": "Catering company", - "c7": "Contract catering / Central kitchen", - "c8": "Independent distributor", - "c9": "Bakery and pastry shop", - "c10": "Intermediate Food Products", - "c11": "Destocker", - "c12": "Halal trade", - "c13": "Accommodation catering", - "c14": "Commercial catering centre", - "c15": "Event catering and park", - "c16": "Restoration of transport", - "c17": "Public procurement", - "c18": "Cash", - "c19": "National distributor", - "c20": "Rungis", - "c21": "Slaughterhouse", - "c22": "Other" - }, - "select-2": { - "title": "Site", - "c1": "Celvia Dinde", - "c2": "Celvia Elaborés", - "c3": "Celvia Sérent", - "c4": "Procanar", - "c5": "Celtys", - "c6": "Farmor", - "c7": "Robichon", - "c8": "Les Volailles de Kerana", - "c9": "Bosher Volaille", - "c10": "LDC Bretagne", - "c11": "Doux Farmor", - "c12": "Favreau" - }, - "interest": { - "p1": "Chicken", - "p2": "Turkey", - "p3": "Duck", - "p4": "Other" - } - } -} diff --git a/ComApp/src/Locales/fr.json b/ComApp/src/Locales/fr.json deleted file mode 100644 index cac7764..0000000 --- a/ComApp/src/Locales/fr.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "install": { - "install": "Installer", - "installation": "Installation" - }, - "global": { - "yes": "Oui", - "no": "Non", - "home": "Accueil", - "search": "Recherche", - "login": "Connexion", - "email": "Email", - "message_sent": "Message envoyé", - "message_will_be_sent_after_sync": "Le message sera envoyé après synchronisation", - "warning": "Attention", - "synchronization": "Synchronisation", - "videos": "Vidéos", - "contacts": "Contacts", - "confirmation": "Confirmation", - "name": "Nom", - "firstname": "Prénom", - "address": "Adresse", - "phone": "Téléphone", - "company": "Société", - "add": "Ajouter", - "cancel": "Annuler", - "subject": "Objet", - "message": "Message", - "send": "Envoyer", - "required": "requis", - "save": "Enregistrer", - "retry": "Réessayer", - "next": "Suivant" - }, - "app": { - "file_sharing": "Partage de fichier", - "folders": "Dossiers", - "video": "Vidéo", - "contact_details": "Détails du contact", - "results_search": "Résultat(s) de votre recherche", - "my_space": "Mon espace" - }, - "login_s": { - "install": "Installer", - "username": "Identifiant", - "password": "Mot de passe" - }, - "home_s": { - "1": "Le Groupe", - "2": "Nos Marques", - "3": "Autres" - }, - "search_s": { - "no_result": "Aucun résultat" - }, - "sync_s": { - "back_home": "Retour à l'accueil", - "download": "Téléchargement", - "update_completed": "Mise à jour effectuée", - "updating_docs": "Mise à jour des documents", - "updating_folders": "Mise à jour des dossiers", - "sending_flyers": "Envoi des brochures", - "updating_contacts": "Mise à jour des contacts", - "user_install_completed": "Installation des utilisateurs effectuée", - "updating_users": "Mise à jour des utilisateurs", - "user_install": "Installation des utilisateurs", - "start_sync": "LANCER LA SYNCHRONISATION", - "new_app_version": "Une nouvelle version de l'application est disponible !", - "open_store": "Ouvrir le store" - }, - "contact_s": { - "contact_transferred": "Contact transféré", - "contact_will_be_sent_after_sync": "Le contact sera envoyé après synchronisation", - "confirm_contact_delete": "Êtes-vous sûr de vouloir supprimer ce contact ?", - "contact_deleted": "Contact supprimé", - "contact_added": "Contact ajouté", - "send_flyer": "Envoyer une brochure", - "select_contact": "Sélectionnez le contact", - "transfer": "Transférer", - "contact_list": "Liste des contacts", - "documents_list": "Liste des documents" - }, - "contact_details_s": { - "visits": "Visites", - "notes": "Notes", - "contact_saved": "Contact enregistré", - "confirm_visit_delete": "Êtes-vous sûr de vouloir supprimer cette visite ?", - "qrcode_not_vcard_format": "Ce QRCode n'est pas au format vCard", - "customer": "Client", - "prospect": "Prospect", - "other": "Autre", - "description": "Description", - "no_visits": "Aucune visites", - "visit_name": "Nom de la visite" - }, - "error": { - "error": "Erreur", - "tablet_not_connected_internet": "La tablette n'est pas connectée à internet.", - "tablet_not_synced_last_user": "La tablette n'as pas été synchronisée par l'utilisateur précédent.", - "incorrect_credentials": "Identifiants incorrect.", - "must_fill_login_fields": "Vous devez-remplir les champs de connexion.", - "invalid_email_address": "Adresse email invalide", - "error_has_occurred": "Une erreur est survenue", - "must_be_connected_internet_sync": "Vous devez être connecté à internet pour lancer la synchronisation", - "incomplete_form": "Formulaire incomplet", - "fill_all_fields_and_1_doc_min": "Veuillez remplir tous les champs, 1 document minimum et une adresse email valide", - "fill_other_field": "Vous devez remplir le champs description pour : Autre", - "specify_type_contact": "Vous devez préciser le type de contact", - "invalid_name": "Nom invalide", - "invalid_firstname": "Prénom invalide", - "camera_permission_denied": "Permission caméra refusée", - "pending_camera_permission": "En attente de permission caméra" - }, - "custom": { - "select-1": { - "title": "Type de commerce", - "c1": "Commerce de détail", - "c2": "Home Service / Freezer Center", - "c3": "Restauration service à table", - "c4": "Fast food et snacking", - "c5": "Cafétaria / Self Service", - "c6": "Société de restauration", - "c7": "Restauration gré à gré / cuisine Centrale", - "c8": "Distributeur indépendant", - "c9": "Boulangerie pâtisserie", - "c10": "PAI", - "c11": "Destockeur", - "c12": "Commerce Halal", - "c13": "Restauration d'hébergement", - "c14": "Centrale restauration commerciale", - "c15": "Restauration évenementielle et parc", - "c16": "Restauration de transport", - "c17": "Marché public", - "c18": "Cash", - "c19": "Distributeur national", - "c20": "Rungis", - "c21": "Abbatoir", - "c22": "Autre" - }, - "select-2": { - "title": "Site", - "c1": "Celvia Dinde", - "c2": "Celvia Elaborés", - "c3": "Celvia Sérent", - "c4": "Procanar", - "c5": "Celtys", - "c6": "Farmor", - "c7": "Robichon", - "c8": "Les Volailles de Kerana", - "c9": "Bosher Volaille", - "c10": "LDC Bretagne", - "c11": "Doux Farmor", - "c12": "Favreau" - }, - "interest": { - "p1": "Poulet", - "p2": "Dinde", - "p3": "Canard", - "p4": "Autre" - } - } -}