mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
126 lines
3.2 KiB
TypeScript
126 lines
3.2 KiB
TypeScript
import * as React from 'react';
|
|
import { View, Button, Text } from 'react-native';
|
|
import { themeStyle } from 'lib/theme';
|
|
import { _ } from 'lib/locale';
|
|
|
|
const PopupDialog = require('react-native-popup-dialog').default;
|
|
const { DialogTitle, DialogButton } = require('react-native-popup-dialog');
|
|
const { time } = require('lib/time-utils.js');
|
|
const DateTimePickerModal = require('react-native-modal-datetime-picker').default;
|
|
|
|
export default class SelectDateTimeDialog extends React.PureComponent<any, any> {
|
|
|
|
private dialog_:any = null;
|
|
private shown_:boolean = false;
|
|
|
|
constructor(props:any) {
|
|
super(props);
|
|
|
|
this.state = {
|
|
date: null,
|
|
mode: 'date',
|
|
showPicker: false,
|
|
};
|
|
|
|
this.onReject = this.onReject.bind(this);
|
|
this.onPickerConfirm = this.onPickerConfirm.bind(this);
|
|
this.onPickerCancel = this.onPickerCancel.bind(this);
|
|
this.onSetDate = this.onSetDate.bind(this);
|
|
}
|
|
|
|
UNSAFE_componentWillReceiveProps(newProps:any) {
|
|
if (newProps.date != this.state.date) {
|
|
this.setState({ date: newProps.date });
|
|
}
|
|
|
|
if ('shown' in newProps && newProps.shown != this.shown_) {
|
|
this.show(newProps.shown);
|
|
}
|
|
}
|
|
|
|
show(doShow:boolean = true) {
|
|
if (doShow) {
|
|
this.dialog_.show();
|
|
} else {
|
|
this.dialog_.dismiss();
|
|
}
|
|
|
|
this.shown_ = doShow;
|
|
}
|
|
|
|
dismiss() {
|
|
this.show(false);
|
|
}
|
|
|
|
onAccept() {
|
|
if (this.props.onAccept) this.props.onAccept(this.state.date);
|
|
}
|
|
|
|
onReject() {
|
|
if (this.props.onReject) this.props.onReject();
|
|
}
|
|
|
|
onClear() {
|
|
if (this.props.onAccept) this.props.onAccept(null);
|
|
}
|
|
|
|
onPickerConfirm(selectedDate:Date) {
|
|
this.setState({ date: selectedDate, showPicker: false });
|
|
}
|
|
|
|
onPickerCancel() {
|
|
this.setState({ showPicker: false });
|
|
}
|
|
|
|
onSetDate() {
|
|
this.setState({ showPicker: true });
|
|
}
|
|
|
|
renderContent() {
|
|
if (!this.shown_) return <View/>;
|
|
|
|
const theme = themeStyle(this.props.themeId);
|
|
|
|
return (
|
|
<View style={{ flex: 1, margin: 20, alignItems: 'center' }}>
|
|
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
|
|
{ this.state.date && <Text style={{ ...theme.normalText, marginRight: 10 }}>{time.formatDateToLocal(this.state.date)}</Text> }
|
|
<Button title="Set date" onPress={this.onSetDate} />
|
|
</View>
|
|
<DateTimePickerModal
|
|
date={this.state.date ? this.state.date : new Date()}
|
|
is24Hour={time.use24HourFormat()}
|
|
isVisible={this.state.showPicker}
|
|
mode="datetime"
|
|
onConfirm={this.onPickerConfirm}
|
|
onCancel={this.onPickerCancel}
|
|
/>
|
|
</View>
|
|
);
|
|
}
|
|
|
|
render() {
|
|
const clearAlarmText = _('Clear alarm'); // For unknown reasons, this particular string doesn't get translated if it's directly in the text property below
|
|
|
|
const popupActions = [
|
|
<DialogButton text={_('Save alarm')} align="center" onPress={() => this.onAccept()} key="saveButton" />,
|
|
<DialogButton text={clearAlarmText} align="center" onPress={() => this.onClear()} key="clearButton" />,
|
|
<DialogButton text={_('Cancel')} align="center" onPress={() => this.onReject()} key="cancelButton" />,
|
|
];
|
|
|
|
return (
|
|
<PopupDialog
|
|
ref={(dialog:any) => { this.dialog_ = dialog; }}
|
|
dialogTitle={<DialogTitle title={_('Set alarm')} />}
|
|
actions={popupActions}
|
|
dismissOnTouchOutside={false}
|
|
width={0.9}
|
|
height={350}
|
|
>
|
|
{this.renderContent()}
|
|
</PopupDialog>
|
|
);
|
|
}
|
|
|
|
}
|