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

fix merge editor ui

Browse Source
This commit is contained in:
ammarahm-ed
2021-01-13 16:32:35 +05:00
parent d71288dc44
commit e14d5e10c4
3 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/mobile/android/app/src/main/assets/plaineditor.html
View File

@@ -69,6 +69,7 @@
setTheme();
attachEditorListeners();
}
loadAction()
</script>

1
apps/mobile/html/Web.bundle/site/plaineditor.html
View File

@@ -70,6 +70,7 @@
setTheme();
attachEditorListeners();
}
loadAction()
</script>

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

@@ -141,10 +141,9 @@ const MergeEditor = () => {
};
const onMessageFromPrimaryWebView = (evt) => {
if (evt.nativeEvent.data !== '') {
let data = JSON.parse(evt.nativeEvent.data);
if (data.type === 'delta') {
primaryData = data.data;
}
@@ -152,11 +151,9 @@ const MergeEditor = () => {
};
const onMessageFromSecondaryWebView = (evt) => {
if (evt.nativeEvent.data === '') {
let data = JSON.parse(evt.nativeEvent.data);
if (data.type === 'delta') {
secondaryData = data.data;
}
}
@@ -362,6 +359,7 @@ const MergeEditor = () => {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
maxWidth: '50%',
}}>
<Icon
style={{
@@ -404,7 +402,10 @@ const MergeEditor = () => {
alignItems: 'center',
justifyContent: 'space-between',
}}>
<Paragraph color={colors.icon} size={SIZE.xxs}>
<Paragraph
style={{maxWidth: '80%'}}
color={colors.icon}
size={SIZE.xs}>
Saved on {timeConverter(primaryData.dateEdited)}
</Paragraph>
<Icon
@@ -440,17 +441,21 @@ const MergeEditor = () => {
onPress={onPressDiscardFromPrimaryWebView}
/>
) : null}
<View style={{width: 10}} />
{keepContentFrom === 'secondary' ? null : (
<Button
width={null}
height={40}
title={keepContentFrom === 'primary' ? 'Undo' : 'Keep'}
onPress={onPressKeepFromPrimaryWebView}
color={
keepContentFrom === 'primary' ? colors.errorText : 'accent'
}
/>
<>
<View style={{width: 10}} />
<Button
width={null}
height={40}
title={keepContentFrom === 'primary' ? 'Undo' : 'Keep'}
onPress={onPressKeepFromPrimaryWebView}
color={
keepContentFrom === 'primary'
? colors.errorText
: 'accent'
}
/>
</>
)}
</View>
</View>
@@ -507,6 +512,7 @@ const MergeEditor = () => {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
maxWidth: '50%',
}}>
<TouchableOpacity
onPress={() => {
@@ -537,7 +543,10 @@ const MergeEditor = () => {
alignItems: 'center',
justifyContent: 'space-between',
}}>
<Paragraph color={colors.icon} size={SIZE.xs}>
<Paragraph
style={{maxWidth: '80%'}}
color={colors.icon}
size={SIZE.xs}>
Saved on {timeConverter(secondaryData.dateEdited)}
</Paragraph>
<Icon
@@ -573,18 +582,21 @@ const MergeEditor = () => {
onPress={onPressDiscardFromSecondaryWebView}
/>
) : null}
<View style={{width: 10}} />
{keepContentFrom === 'primary' ? null : (
<Button
width={null}
title={keepContentFrom === 'secondary' ? 'Undo' : 'Keep'}
onPress={onPressKeepFromSecondaryWebView}
color={
keepContentFrom === 'secondary'
? colors.errorText
: 'accent'
}
/>
<>
<View style={{width: 10}} />
<Button
width={null}
title={keepContentFrom === 'secondary' ? 'Undo' : 'Keep'}
onPress={onPressKeepFromSecondaryWebView}
color={
keepContentFrom === 'secondary'
? colors.errorText
: 'accent'
}
/>
</>
)}
</View>
</View>