Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

end note editing on swipe if note is locked

Browse Source
This commit is contained in:
ammarahm-ed
2020-12-23 13:33:44 +05:00
parent 459030f7ab
commit 4ebf35b09d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/mobile/initializer.root.js
View File

@@ -19,6 +19,7 @@ import {
} from './src/services/EventManager'; } from './src/services/EventManager';
import {editing, setWidthHeight} from './src/utils'; import {editing, setWidthHeight} from './src/utils';
import { import {
eClearEditor,
eCloseFullscreenEditor, eCloseFullscreenEditor,
eCloseSideMenu, eCloseSideMenu,
eOnLoadNote, eOnLoadNote,
@@ -27,7 +28,7 @@ import {
} from './src/utils/Events'; } from './src/utils/Events';
import {editorRef, tabBarRef} from './src/utils/Refs'; import {editorRef, tabBarRef} from './src/utils/Refs';
import {EditorWrapper} from './src/views/Editor/EditorWrapper'; import {EditorWrapper} from './src/views/Editor/EditorWrapper';
import {getIntent, getNote, post} from './src/views/Editor/Functions'; import {clearEditor, getIntent, getNote, post} from './src/views/Editor/Functions';
let {width, height} = Dimensions.get('window'); let {width, height} = Dimensions.get('window');
let movedAway = true; let movedAway = true;
@@ -39,12 +40,16 @@ const onChangeTab = async (obj) => {
if (getIntent()) return; if (getIntent()) return;
movedAway = false; movedAway = false;
currentTab = 1; currentTab = 1;
if (!editing.currentlyEditing || !getNote()) { if (!editing.currentlyEditing || !getNote()) {
eSendEvent(eOnLoadNote, {type: 'new'}); eSendEvent(eOnLoadNote, {type: 'new'});
editing.currentlyEditing = true; editing.currentlyEditing = true;
} }
} else { } else {
if (obj.from === 1) { if (obj.from === 1) {
if (getNote()?.locked) {
eSendEvent(eClearEditor);
}
movedAway = true; movedAway = true;
post('blur'); post('blur');
} }

3
apps/mobile/src/views/Editor/EditorHeader.js
View File

@@ -104,9 +104,8 @@ const EditorHeader = () => {
const onCallClear = async () => { const onCallClear = async () => {
if (editing.currentlyEditing) { if (editing.currentlyEditing) {
exitEditorAnimation(); await _onBackPress()
} }
await clearEditor();
}; };
useEffect(() => { useEffect(() => {

3
apps/mobile/src/views/Editor/Functions.js
View File

@@ -1,18 +1,15 @@
import {createRef} from 'react'; import {createRef} from 'react';
import {Linking, Platform} from 'react-native'; import {Linking, Platform} from 'react-native';
import SplashScreen from 'react-native-splash-screen';
import {updateEvent} from '../../components/DialogManager/recievers'; import {updateEvent} from '../../components/DialogManager/recievers';
import {Actions} from '../../provider/Actions'; import {Actions} from '../../provider/Actions';
import {DDS} from '../../services/DeviceDetection'; import {DDS} from '../../services/DeviceDetection';
import {eSendEvent, sendNoteEditedEvent} from '../../services/EventManager'; import {eSendEvent, sendNoteEditedEvent} from '../../services/EventManager';
import IntentService from '../../services/IntentService';
import {editing} from '../../utils'; import {editing} from '../../utils';
import {COLORS_NOTE, COLOR_SCHEME} from '../../utils/Colors'; import {COLORS_NOTE, COLOR_SCHEME} from '../../utils/Colors';
import {hexToRGBA} from '../../utils/ColorUtils'; import {hexToRGBA} from '../../utils/ColorUtils';
import {db} from '../../utils/DB'; import {db} from '../../utils/DB';
import { import {
eOnLoadNote, eOnLoadNote,
eOpenSideMenu,
eShowGetPremium, eShowGetPremium,
refreshNotesPage, refreshNotesPage,
} from '../../utils/Events'; } from '../../utils/Events';