self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-27 23:28:38 +02:00
Code Issues Releases Activity

iOS: Restored camera roll functionality

Browse Source
This commit is contained in:
Laurent Cozic
2020-10-15 12:11:13 +01:00
parent 75f5edf2ad
commit 8e2875a91c
8 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/components/NoteBodyViewer.tsx
View File

@ -140,8 +140,6 @@ export default class NoteBodyViewer extends Component {
const tempFile = `${Setting.value('resourceDir')}/NoteBodyViewer.html`
await shim.fsDriver().writeFile(tempFile, html, 'utf8');
console.info('WROTE TO ', tempFile);
// On iOS scalesPageToFit work like this:
//
// Find the widest image, resize it *and everything else* by x% so that

45
ReactNativeClient/lib/components/screens/note.js
View File

@ -37,7 +37,7 @@ const NoteBodyViewer = require('lib/components/NoteBodyViewer').default;
const DocumentPicker = require('react-native-document-picker').default;
const ImageResizer = require('react-native-image-resizer').default;
const shared = require('lib/components/shared/note-screen-shared.js');
// const ImagePicker = require('react-native-image-picker');
const ImagePicker = require('react-native-image-picker').default;
const SelectDateTimeDialog = require('lib/components/SelectDateTimeDialog').default;
const ShareExtension = require('lib/ShareExtension.js').default;
const CameraView = require('lib/components/CameraView');
@ -506,13 +506,13 @@ class NoteScreenComponent extends BaseScreenComponent {
});
}
// showImagePicker(options) {
// return new Promise((resolve) => {
// ImagePicker.launchImageLibrary(options, response => {
// resolve(response);
// });
// });
// }
showImagePicker(options) {
return new Promise((resolve) => {
ImagePicker.launchImageLibrary(options, response => {
resolve(response);
});
});
}
async resizeImage(localFilePath, targetPath, mimeType) {
const maxSize = Resource.IMAGE_MAX_DIMENSION;
@ -664,10 +664,10 @@ class NoteScreenComponent extends BaseScreenComponent {
this.scheduleSave();
}
// async attachPhoto_onPress() {
// const response = await this.showImagePicker({ mediaType: 'photo', noData: true });
// await this.attachFile(response, 'image');
// }
async attachPhoto_onPress() {
const response = await this.showImagePicker({ mediaType: 'photo', noData: true });
await this.attachFile(response, 'image');
}
takePhoto_onPress() {
this.setState({ showCamera: true });
@ -821,15 +821,24 @@ class NoteScreenComponent extends BaseScreenComponent {
output.push({
title: _('Attach...'),
onPress: async () => {
const buttonId = await dialogs.pop(this, _('Choose an option'), [
{ text: _('Attach file'), id: 'attachFile' },
{ text: _('Take photo'), id: 'takePhoto' },
// { text: _('Attach photo'), id: 'attachPhoto' },
]);
const buttons = [];
// On iOS, it will show "local files", which means certain files saved from the browser
// and the iCloud files, but it doesn't include photos and images from the CameraRoll
//
// On Android, it will depend on the phone, but usually it will allow browing all files and photos.
buttons.push({ text: _('Attach file'), id: 'attachFile' });
// Disabled on Android because it doesn't work due to permission issues, but enabled on iOS
// because that's only way to browse photos from the camera roll.
if (Platform.OS === 'ios') buttons.push({ text: _('Attach photo'), id: 'attachPhoto' });
buttons.push({ text: _('Take photo'), id: 'takePhoto' });
const buttonId = await dialogs.pop(this, _('Choose an option'), buttons);
if (buttonId === 'takePhoto') this.takePhoto_onPress();
if (buttonId === 'attachFile') this.attachFile_onPress();
// if (buttonId === 'attachPhoto') this.attachPhoto_onPress();
if (buttonId === 'attachPhoto') this.attachPhoto_onPress();
},
});
}