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

update

Browse Source
This commit is contained in:
ammarahm-ed
2020-04-06 13:14:27 +05:00
parent 377a1058a5
commit 52c2cf13df
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/mobile/src/components/MergeEditor/index.js
View File

@@ -1,10 +1,10 @@
import React, {createRef, useEffect, useState} from 'react';
import {Modal, Text, TouchableOpacity, View} from 'react-native';
import Animated, {Easing} from 'react-native-reanimated';
import React, { createRef, useEffect, useState } from 'react';
import { Modal, Text, TouchableOpacity, View } from 'react-native';
import Animated, { Easing } from 'react-native-reanimated';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import WebView from 'react-native-webview';
import {normalize, SIZE, WEIGHT} from '../../common/common';
import {useTracked} from '../../provider';
import { normalize, SIZE, WEIGHT } from '../../common/common';
import { useTracked } from '../../provider';
import {
eSubscribeEvent,
eUnSubscribeEvent,
@@ -15,15 +15,14 @@ import {
eShowMergeDialog,
refreshNotesPage,
} from '../../services/events';
import {getElevation, h, db} from '../../utils/utils';
import {simpleDialogEvent, updateEvent} from '../DialogManager/recievers';
import {TEMPLATE_APPLY_CHANGES} from '../DialogManager/templates';
import {ACTIONS} from '../../provider/actions';
import { getElevation, h, db } from '../../utils/utils';
import { simpleDialogEvent, updateEvent } from '../DialogManager/recievers';
import { TEMPLATE_APPLY_CHANGES } from '../DialogManager/templates';
import { ACTIONS } from '../../provider/actions';
const {Value, timing} = Animated;
const { Value, timing } = Animated;
const firstWebViewHeight = new Value(h * 0.5 - 50);
const secondWebViewHeight = new Value(h * 0.5 - 50);
const primaryWebView = createRef();
const secondaryWebView = createRef();
let note = null;
@@ -78,7 +77,7 @@ let secondaryText = '';
const MergeEditor = () => {
const [state, dispatch] = useTracked();
const {colors} = state;
const { colors } = state;
const [visible, setVisible] = useState(false);
const [primary, setPrimary] = useState(true);
const [secondary, setSecondary] = useState(true);
@@ -97,7 +96,7 @@ const MergeEditor = () => {
type: 'delta',
value: primaryDelta,
});
let c = {...colors};
let c = { ...colors };
c.factor = normalize(1);
postMessageToPrimaryWebView({
type: 'theme',
@@ -110,7 +109,7 @@ const MergeEditor = () => {
type: 'delta',
value: secondaryDelta,
});
let c = {...colors};
let c = { ...colors };
c.factor = normalize(1);
postMessageToSecondaryWebView({
type: 'theme',
@@ -182,8 +181,8 @@ const MergeEditor = () => {
});
}
eSendEvent(refreshNotesPage);
updateEvent({type: ACTIONS.NOTES});
updateEvent({type: ACTIONS.FAVORITES});
updateEvent({ type: ACTIONS.NOTES });
updateEvent({ type: ACTIONS.FAVORITES });
close();
};
@@ -468,7 +467,7 @@ const MergeEditor = () => {
onMessage={onMessageFromPrimaryWebView}
source={
Platform.OS === 'ios'
? {uri: sourceUri}
? { uri: sourceUri }
: {
uri: 'file:///android_asset/plaineditor.html',
baseUrl: 'file:///android_asset/',
@@ -647,7 +646,7 @@ const MergeEditor = () => {
onMessage={onMessageFromSecondaryWebView}
source={
Platform.OS === 'ios'
? {uri: sourceUri}
? { uri: sourceUri }
: {
uri: 'file:///android_asset/plaineditor.html',
baseUrl: 'file:///android_asset/',