diff --git a/apps/mobile/App.js b/apps/mobile/App.js
index 39a51cfd8..d77335863 100644
--- a/apps/mobile/App.js
+++ b/apps/mobile/App.js
@@ -1,12 +1,10 @@
-import React, {useEffect, useState} from 'react';
-import {View} from 'react-native';
+import React, {useEffect} from 'react';
import Orientation from 'react-native-orientation';
-import Animated, {Easing} from 'react-native-reanimated';
-import AnimatedProgress from 'react-native-reanimated-progress-bar';
import {SafeAreaProvider} from 'react-native-safe-area-context';
import SplashScreen from 'react-native-splash-screen';
import {AppRootEvents} from './AppRootEvents';
import {RootView} from './initializer.root';
+import AppLoader from './src/components/AppLoader';
import {useTracked} from './src/provider';
import {Actions} from './src/provider/Actions';
import {DDS} from './src/services/DeviceDetection';
@@ -15,19 +13,11 @@ import {
eSubscribeEvent,
eUnSubscribeEvent,
} from './src/services/EventManager';
-import Navigation from './src/services/Navigation';
import SettingsService from './src/services/SettingsService';
-import {
- changeAppScale,
- changeContainerScale,
- ContainerScale,
-} from './src/utils/Animations';
import {db} from './src/utils/DB';
import {eDispatchAction, eOpenSideMenu} from './src/utils/Events';
-import {sleep} from './src/utils/TimeUtils';
import EditorRoot from './src/views/Editor/EditorRoot';
-
let initStatus = false;
const App = () => {
const [, dispatch] = useTracked();
@@ -35,8 +25,6 @@ const App = () => {
useEffect(() => {
(async () => {
try {
- scaleV.setValue(0.95);
- opacityV.setValue(1);
Orientation.getOrientation((e, r) => {
DDS.checkSmallTab(r);
dispatch({
@@ -84,95 +72,9 @@ const App = () => {
-
+
);
};
export default App;
-
-const scaleV = new Animated.Value(0.95);
-const opacityV = new Animated.Value(1);
-const Overlay = ({onLoad}) => {
- const [state, dispatch] = useTracked();
- const colors = state.colors;
- const [loading, setLoading] = useState(true);
- const [progress, setProgress] = useState(4);
- const [opacity, setOpacity] = useState(true);
-
- const load = async () => {
- db.notes.init().then(() => {
- init = true;
- dispatch({type: Actions.NOTES});
- dispatch({type: Actions.FAVORITES});
- dispatch({type: Actions.LOADING, loading: false});
- eSendEvent(eOpenSideMenu);
- });
- setOpacity(false);
- await sleep(150);
- eSendEvent(eOpenSideMenu);
- Animated.timing(opacityV, {
- toValue: 0,
- duration: 150,
- easing: Easing.out(Easing.ease),
- }).start();
- Animated.timing(scaleV, {
- toValue: 1,
- duration: 150,
- easing: Easing.out(Easing.ease),
- }).start();
- changeContainerScale(ContainerScale, 1, 500);
- await sleep(150);
- setLoading(false);
- animation = false;
- };
-
- useEffect(() => {
- eSubscribeEvent('load_overlay', load);
- onLoad();
- return () => {
- eUnSubscribeEvent('load_overlay', load);
- };
- }, []);
-
- return (
- loading && (
-
- {
- setLoading(false);
- }}
- style={{
- backgroundColor: colors.bg,
- width: '100%',
- height: '100%',
- justifyContent: 'center',
- alignItems: 'center',
- borderRadius: 10,
- opacity: opacityV,
- }}>
-
-
-
-
-
- )
- );
-};
diff --git a/apps/mobile/android/app/src/main/assets/compressor.min.js b/apps/mobile/android/app/src/main/assets/compressor.min.js
new file mode 100644
index 000000000..2dfb18a3d
--- /dev/null
+++ b/apps/mobile/android/app/src/main/assets/compressor.min.js
@@ -0,0 +1,10 @@
+/*!
+ * Compressor.js v1.0.7
+ * https://fengyuanchen.github.io/compressorjs
+ *
+ * Copyright 2018-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2020-11-28T07:13:17.754Z
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).Compressor=t()}(this,function(){"use strict";function n(e,t){for(var r=0;rf.convertSize&&"image/png"===f.mimeType&&(v="#fff",f.mimeType="image/jpeg"),m.fillStyle=v,m.fillRect(0,0,o,e),f.beforeDraw&&f.beforeDraw.call(this,m,d),this.aborted||(m.save(),m.translate(o/2,e/2),m.rotate(i*Math.PI/180),m.scale(l,c),m.drawImage(h,w,g,n,y),m.restore(),f.drew&&f.drew.call(this,m,d),this.aborted||(m=function(e){t.aborted||t.done({naturalWidth:r,naturalHeight:a,result:e})},d.toBlob?d.toBlob(m,f.mimeType,f.quality):m(U(d.toDataURL(f.mimeType,f.quality)))))}},{key:"done",value:function(e){var t=e.naturalWidth,r=e.naturalHeight,a=e.result,n=this.file,i=this.image,e=this.options;g&&!e.checkOrientation&&g.revokeObjectURL(i.src),!a||e.strict&&a.size>n.size&&e.mimeType===n.type&&!(e.width>t||e.height>r||e.minWidth>t||e.minHeight>r)?a=n:(r=new Date,a.lastModified=r.getTime(),a.lastModifiedDate=r,a.name=n.name,a.name&&a.type!==n.type&&(a.name=a.name.replace(y,("jpeg"===(n=B(n=a.type)?n.substr(6):"")&&(n="jpg"),".".concat(n))))),this.result=a,e.success&&e.success.call(this,a)}},{key:"fail",value:function(e){var t=this.options;if(!t.error)throw e;t.error.call(this,e)}},{key:"abort",value:function(){this.aborted||(this.aborted=!0,this.reader?this.reader.abort():this.image.complete?this.fail(new Error("The compression process has been aborted.")):(this.image.onload=null,this.image.onabort()))}}])&&n(e.prototype,t),a&&n(e,a),r}()});
\ No newline at end of file
diff --git a/apps/mobile/android/app/src/main/assets/constants.js b/apps/mobile/android/app/src/main/assets/constants.js
index b906f7396..9b552aa93 100644
--- a/apps/mobile/android/app/src/main/assets/constants.js
+++ b/apps/mobile/android/app/src/main/assets/constants.js
@@ -22,55 +22,54 @@ let pageTheme = {
};
const markdownPatterns = [
- { start: "*", end: "*", format: "italic" },
- { start: "**", end: "**", format: "bold" },
- { start: "`", end: "`", format: "code" },
- { start: "#", format: "h1" },
- { start: "##", format: "h2" },
- { start: "###", format: "h3" },
- { start: "####", format: "h4" },
- { start: "#####", format: "h5" },
- { start: "######", format: "h6" },
- { start: "* ", cmd: "InsertUnorderedList" },
- { start: "- ", cmd: "InsertUnorderedList" },
- { start: "> ", format: "blockquote" },
+ {start: '*', end: '*', format: 'italic'},
+ {start: '**', end: '**', format: 'bold'},
+ {start: '`', end: '`', format: 'code'},
+ {start: '#', format: 'h1'},
+ {start: '##', format: 'h2'},
+ {start: '###', format: 'h3'},
+ {start: '####', format: 'h4'},
+ {start: '#####', format: 'h5'},
+ {start: '######', format: 'h6'},
+ {start: '* ', cmd: 'InsertUnorderedList'},
+ {start: '- ', cmd: 'InsertUnorderedList'},
+ {start: '> ', format: 'blockquote'},
{
- start: "1. ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "decimal" },
+ start: '1. ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'decimal'},
},
{
- start: "1) ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "decimal" },
+ start: '1) ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'decimal'},
},
{
- start: "a. ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "lower-alpha" },
+ start: 'a. ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'lower-alpha'},
},
{
- start: "a) ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "lower-alpha" },
+ start: 'a) ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'lower-alpha'},
},
{
- start: "i. ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "lower-roman" },
+ start: 'i. ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'lower-roman'},
},
{
- start: "i) ",
- cmd: "InsertOrderedList",
- value: { "list-style-type": "lower-roman" },
+ start: 'i) ',
+ cmd: 'InsertOrderedList',
+ value: {'list-style-type': 'lower-roman'},
},
- { start: "---", replacement: "
" },
- { start: "--", replacement: "—" },
- { start: "-", replacement: "—" },
- { start: "(c)", replacement: "©" },
+ {start: '---', replacement: '
'},
+ {start: '--', replacement: '—'},
+ {start: '-', replacement: '—'},
+ {start: '(c)', replacement: '©'},
];
-
function dark() {
if (!tinymce.activeEditor) return;
tinymce.activeEditor.dom.styleSheetLoader.unload(
@@ -144,22 +143,24 @@ var minifyImg = function (
resolve,
imageArguments = 0.7,
) {
- var image, oldWidth, oldHeight, newHeight, canvas, ctx, newDataUrl;
- new Promise(function (resolve) {
- image = new Image();
- image.src = dataUrl;
- resolve('Done : ');
- }).then((d) => {
- oldWidth = image.width;
- oldHeight = image.height;
- newHeight = Math.floor((oldHeight / oldWidth) * newWidth);
- canvas = document.createElement('canvas');
- canvas.width = newWidth;
- canvas.height = newHeight;
- ctx = canvas.getContext('2d');
- ctx.drawImage(image, 0, 0, newWidth, newHeight);
- newDataUrl = canvas.toDataURL(undefined, imageArguments);
- resolve(newDataUrl);
+ fetch(dataUrl).then(async (res) => {
+ let blob = await res.blob();
+ new Compressor(blob, {
+ quality: imageArguments,
+ width: newWidth,
+ mimeType:imageType,
+ success: (result) => {
+ let fileReader = new FileReader();
+ fileReader.onloadend = function () {
+ resolve(fileReader.result);
+ fileReader.onloadend = null;
+ };
+ fileReader.readAsDataURL(result);
+ },
+ error: (err) => {
+ console.log(err.message);
+ },
+ });
});
};
@@ -173,13 +174,13 @@ function loadImage() {
console.log(e, 'loaded error');
minifyImg(
reader.result,
- 600,
+ 1024,
'image/jpeg',
(r) => {
var content = `
`;
editor.insertContent(content);
},
- 0.7,
+ 0.6,
);
fileInput.removeEventListener('change', listener);
reader.removeEventListener('load', load);
diff --git a/apps/mobile/android/app/src/main/assets/index.html b/apps/mobile/android/app/src/main/assets/index.html
index a3c686ab3..a33efa6b6 100644
--- a/apps/mobile/android/app/src/main/assets/index.html
+++ b/apps/mobile/android/app/src/main/assets/index.html
@@ -25,19 +25,19 @@
Powered by Tiny
-
+
+
diff --git a/apps/mobile/android/app/src/main/assets/init.js b/apps/mobile/android/app/src/main/assets/init.js
index 820cc58e8..824913b25 100644
--- a/apps/mobile/android/app/src/main/assets/init.js
+++ b/apps/mobile/android/app/src/main/assets/init.js
@@ -21,15 +21,15 @@ function init_tiny(size) {
skin_url: 'dist/skins/notesnook',
content_css: 'dist/skins/notesnook',
plugins: [
- "mychecklist advlist autolink textpattern hr lists link noneditable image",
- "searchreplace mycode",
- "media imagetools table paste wordcount autoresize directionality",
+ 'mychecklist advlist autolink textpattern hr lists link noneditable image',
+ 'searchreplace mycode',
+ 'media imagetools table paste wordcount autoresize directionality',
],
toolbar: false,
paste_data_images: true,
- images_upload_handler: function (blobInfo, success, failure) {
+ /* images_upload_handler: function (blobInfo, success, failure) {
success('data:' + blobInfo.blob().type + ';base64,' + blobInfo.base64());
- },
+ }, */
statusbar: false,
textpattern_patterns: markdownPatterns,
contextmenu: false,
@@ -43,6 +43,24 @@ function init_tiny(size) {
pre.codeblock {
overflow-x:auto;
}
+ img {
+ max-width:100% !important;
+ height:auto !important;
+ }
+ iframe {
+ max-width:100% !important;
+ }
+ table {
+ display: block !important;
+ overflow-x: auto !important;
+ white-space: nowrap !important;
+ max-width:100% !important;
+ width:100% !important;
+ height:auto !important;
+ }
+ td {
+ min-width:20vw !important;
+ }
`,
browser_spellcheck: true,
autoresize_bottom_margin: 120,
@@ -74,7 +92,7 @@ function init_tiny(size) {
editor.on('SetContent', (event) => {
if (!event.paste) {
reactNativeEventHandler('noteLoaded', true);
- }
+ }
if (event.paste) {
isLoading = false;
onChange(event);
@@ -95,10 +113,8 @@ function init_tiny(size) {
}
window.prevContent = "";
const onChange = (event) => {
- if (event.type === "nodechange" && !event.selectionChange) return;
- if (editor.getContent() === window.prevContent) return;
- window.prevContent = editor.getContent();
-
+ if (event.type === 'nodechange' && !event.selectionChange) return;
+
if (isLoading) {
isLoading = false;
return;
diff --git a/apps/mobile/html/Web.bundle/site/compressor.min.js b/apps/mobile/html/Web.bundle/site/compressor.min.js
new file mode 100644
index 000000000..2dfb18a3d
--- /dev/null
+++ b/apps/mobile/html/Web.bundle/site/compressor.min.js
@@ -0,0 +1,10 @@
+/*!
+ * Compressor.js v1.0.7
+ * https://fengyuanchen.github.io/compressorjs
+ *
+ * Copyright 2018-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2020-11-28T07:13:17.754Z
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).Compressor=t()}(this,function(){"use strict";function n(e,t){for(var r=0;rf.convertSize&&"image/png"===f.mimeType&&(v="#fff",f.mimeType="image/jpeg"),m.fillStyle=v,m.fillRect(0,0,o,e),f.beforeDraw&&f.beforeDraw.call(this,m,d),this.aborted||(m.save(),m.translate(o/2,e/2),m.rotate(i*Math.PI/180),m.scale(l,c),m.drawImage(h,w,g,n,y),m.restore(),f.drew&&f.drew.call(this,m,d),this.aborted||(m=function(e){t.aborted||t.done({naturalWidth:r,naturalHeight:a,result:e})},d.toBlob?d.toBlob(m,f.mimeType,f.quality):m(U(d.toDataURL(f.mimeType,f.quality)))))}},{key:"done",value:function(e){var t=e.naturalWidth,r=e.naturalHeight,a=e.result,n=this.file,i=this.image,e=this.options;g&&!e.checkOrientation&&g.revokeObjectURL(i.src),!a||e.strict&&a.size>n.size&&e.mimeType===n.type&&!(e.width>t||e.height>r||e.minWidth>t||e.minHeight>r)?a=n:(r=new Date,a.lastModified=r.getTime(),a.lastModifiedDate=r,a.name=n.name,a.name&&a.type!==n.type&&(a.name=a.name.replace(y,("jpeg"===(n=B(n=a.type)?n.substr(6):"")&&(n="jpg"),".".concat(n))))),this.result=a,e.success&&e.success.call(this,a)}},{key:"fail",value:function(e){var t=this.options;if(!t.error)throw e;t.error.call(this,e)}},{key:"abort",value:function(){this.aborted||(this.aborted=!0,this.reader?this.reader.abort():this.image.complete?this.fail(new Error("The compression process has been aborted.")):(this.image.onload=null,this.image.onabort()))}}])&&n(e.prototype,t),a&&n(e,a),r}()});
\ No newline at end of file
diff --git a/apps/mobile/html/Web.bundle/site/constants.js b/apps/mobile/html/Web.bundle/site/constants.js
index b906f7396..40fca3813 100644
--- a/apps/mobile/html/Web.bundle/site/constants.js
+++ b/apps/mobile/html/Web.bundle/site/constants.js
@@ -136,7 +136,6 @@ function setTheme() {
css.appendChild(document.createTextNode(node));
document.getElementsByTagName('head')[0].appendChild(css);
}
-
var minifyImg = function (
dataUrl,
newWidth,
@@ -144,22 +143,24 @@ var minifyImg = function (
resolve,
imageArguments = 0.7,
) {
- var image, oldWidth, oldHeight, newHeight, canvas, ctx, newDataUrl;
- new Promise(function (resolve) {
- image = new Image();
- image.src = dataUrl;
- resolve('Done : ');
- }).then((d) => {
- oldWidth = image.width;
- oldHeight = image.height;
- newHeight = Math.floor((oldHeight / oldWidth) * newWidth);
- canvas = document.createElement('canvas');
- canvas.width = newWidth;
- canvas.height = newHeight;
- ctx = canvas.getContext('2d');
- ctx.drawImage(image, 0, 0, newWidth, newHeight);
- newDataUrl = canvas.toDataURL(undefined, imageArguments);
- resolve(newDataUrl);
+ fetch(dataUrl).then(async (res) => {
+ let blob = await res.blob();
+ new Compressor(blob, {
+ quality: imageArguments,
+ width: newWidth,
+ mimeType:imageType,
+ success: (result) => {
+ let fileReader = new FileReader();
+ fileReader.onloadend = function () {
+ resolve(fileReader.result);
+ fileReader.onloadend = null;
+ };
+ fileReader.readAsDataURL(result);
+ },
+ error: (err) => {
+ console.log(err.message);
+ },
+ });
});
};
@@ -173,13 +174,13 @@ function loadImage() {
console.log(e, 'loaded error');
minifyImg(
reader.result,
- 600,
+ 1024,
'image/jpeg',
(r) => {
var content = ``;
editor.insertContent(content);
},
- 0.7,
+ 0.8,
);
fileInput.removeEventListener('change', listener);
reader.removeEventListener('load', load);
diff --git a/apps/mobile/html/Web.bundle/site/index.html b/apps/mobile/html/Web.bundle/site/index.html
index 7eb05fe76..811f607c4 100644
--- a/apps/mobile/html/Web.bundle/site/index.html
+++ b/apps/mobile/html/Web.bundle/site/index.html
@@ -25,13 +25,14 @@
Powered by Tiny
-
+
+
diff --git a/apps/mobile/html/Web.bundle/site/init.js b/apps/mobile/html/Web.bundle/site/init.js
index 820cc58e8..452a8cfa7 100644
--- a/apps/mobile/html/Web.bundle/site/init.js
+++ b/apps/mobile/html/Web.bundle/site/init.js
@@ -27,9 +27,9 @@ function init_tiny(size) {
],
toolbar: false,
paste_data_images: true,
- images_upload_handler: function (blobInfo, success, failure) {
- success('data:' + blobInfo.blob().type + ';base64,' + blobInfo.base64());
- },
+ // images_upload_handler: function (blobInfo, success, failure) {
+ // success('data:' + blobInfo.blob().type + ';base64,' + blobInfo.base64());
+ // },
statusbar: false,
textpattern_patterns: markdownPatterns,
contextmenu: false,
@@ -43,6 +43,24 @@ function init_tiny(size) {
pre.codeblock {
overflow-x:auto;
}
+ img {
+ max-width:100% !important;
+ height:auto !important;
+ }
+ iframe {
+ max-width:100% !important;
+ }
+ table {
+ display: block !important;
+ overflow-x: auto !important;
+ white-space: nowrap !important;
+ max-width:100% !important;
+ width:100% !important;
+ height:auto !important;
+ }
+ td {
+ min-width:20vw !important;
+ }
`,
browser_spellcheck: true,
autoresize_bottom_margin: 120,
@@ -96,8 +114,7 @@ function init_tiny(size) {
window.prevContent = "";
const onChange = (event) => {
if (event.type === "nodechange" && !event.selectionChange) return;
- if (editor.getContent() === window.prevContent) return;
- window.prevContent = editor.getContent();
+
if (isLoading) {
isLoading = false;
diff --git a/apps/mobile/initializer.root.js b/apps/mobile/initializer.root.js
index 0249559fa..431ef42b8 100644
--- a/apps/mobile/initializer.root.js
+++ b/apps/mobile/initializer.root.js
@@ -48,7 +48,7 @@ const onChangeTab = async (obj) => {
currentTab = 1;
activateKeepAwake();
eSendEvent('navigate');
-
+ eSendEvent(eClearEditor, 'addHandler');
if (!editing.currentlyEditing || !getNote()) {
eSendEvent(eOnLoadNote, {type: 'new'});
editing.currentlyEditing = true;
@@ -60,6 +60,7 @@ const onChangeTab = async (obj) => {
if (obj.from === 1) {
updateStatusBarColor();
deactivateKeepAwake();
+ eSendEvent(eClearEditor, 'removeHandler');
if (getNote()?.locked) {
eSendEvent(eClearEditor);
}
diff --git a/apps/mobile/src/assets/images/notesnook-logo-png.png b/apps/mobile/src/assets/images/notesnook-logo-png.png
index 57eeb66ee..f51f3215e 100644
Binary files a/apps/mobile/src/assets/images/notesnook-logo-png.png and b/apps/mobile/src/assets/images/notesnook-logo-png.png differ
diff --git a/apps/mobile/src/components/ActionSheetComponent/ActionSheetWrapper.js b/apps/mobile/src/components/ActionSheetComponent/ActionSheetWrapper.js
index 420fe878a..a9a523e18 100644
--- a/apps/mobile/src/components/ActionSheetComponent/ActionSheetWrapper.js
+++ b/apps/mobile/src/components/ActionSheetComponent/ActionSheetWrapper.js
@@ -74,7 +74,7 @@ const ActionSheetWrapper = ({
return (
{
const [state, dispatch] = useTracked();
- const {colors, premiumUser, user} = state;
+ const {colors, user} = state;
const [refreshing, setRefreshing] = useState(false);
const [isPinnedToMenu, setIsPinnedToMenu] = useState(false);
const [note, setNote] = useState(item);
+ const [noteInTopic, setNoteInTopic] = useState(
+ editing.actionAfterFirstSave.type === 'topic' &&
+ db.notebooks
+ .notebook(editing.actionAfterFirstSave.notebook)
+ .topics.topic(editing.actionAfterFirstSave.id)
+ .has(item.id),
+ );
function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) {
let newColors = setColorScheme(colors, accent);
@@ -138,12 +145,12 @@ export const ActionSheetComponent = ({
name: 'Add to',
icon: 'book-outline',
func: () => {
+ close();
dispatch({type: Actions.CLEAR_SELECTION});
dispatch({type: Actions.SELECTED_ITEMS, item: note});
- close();
setTimeout(() => {
eSendEvent(eOpenMoveNoteDialog, note);
- }, 400);
+ }, 300);
},
},
{
@@ -151,6 +158,7 @@ export const ActionSheetComponent = ({
icon: 'share-variant',
func: async () => {
if (note.locked) {
+ close();
openVault({
item: item,
novault: true,
@@ -181,8 +189,9 @@ export const ActionSheetComponent = ({
name: 'Delete',
icon: 'delete',
func: async () => {
+ close();
if (note.locked) {
- close();
+
await sleep(300);
openVault({
deleteNote: true,
@@ -194,12 +203,12 @@ export const ActionSheetComponent = ({
});
} else {
try {
+ close();
await deleteItems(note);
} catch (e) {
//console.log(e);
}
}
- close();
},
},
{
@@ -246,6 +255,7 @@ export const ActionSheetComponent = ({
name: 'Restore',
icon: 'delete-restore',
func: async () => {
+ close();
await db.trash.restore(note.id);
Navigation.setRoutesToUpdate([
Navigation.routeNames.Tags,
@@ -264,7 +274,7 @@ export const ActionSheetComponent = ({
: 'Notebook restored from trash',
type: 'success',
});
- close();
+
},
},
{
@@ -300,6 +310,7 @@ export const ActionSheetComponent = ({
icon: 'pin',
func: async () => {
if (!note.id) return;
+ close();
if (note.type === 'note') {
if (db.notes.pinned.length === 3 && !note.pinned) {
ToastEvent.show({
@@ -322,7 +333,7 @@ export const ActionSheetComponent = ({
await db.notebooks.notebook(note.id).pin();
}
localRefresh(item.type);
- close();
+
},
close: false,
check: true,
@@ -335,6 +346,7 @@ export const ActionSheetComponent = ({
icon: 'star',
func: async () => {
if (!note.id) return;
+ close();
if (note.type === 'note') {
await db.notes.note(note.id).favorite();
} else {
@@ -346,7 +358,7 @@ export const ActionSheetComponent = ({
forced: true,
});
localRefresh(item.type, true);
- close();
+
},
close: false,
check: true,
@@ -361,6 +373,7 @@ export const ActionSheetComponent = ({
: 'Add Shortcut to Menu',
icon: isPinnedToMenu ? 'link-variant-remove' : 'link-variant',
func: async () => {
+ close();
try {
if (isPinnedToMenu) {
await db.settings.unpin(note.id);
@@ -377,6 +390,7 @@ export const ActionSheetComponent = ({
setIsPinnedToMenu(db.settings.isPinned(note.id));
dispatch({type: Actions.MENU_PINS});
} catch (e) {}
+
},
close: false,
check: true,
@@ -724,11 +738,7 @@ export const ActionSheetComponent = ({
) : null}
- {editing.actionAfterFirstSave.type === 'topic' &&
- note.notebooks?.length > 0 &&
- note?.notebooks?.findIndex(
- (o) => o.topics.indexOf(editing.actionAfterFirstSave.id) > -1,
- ) > -1 ? (
+ {noteInTopic ? (
{
+ const [state, dispatch] = useTracked();
+ const colors = state.colors;
+ const [loading, setLoading] = useState(true);
+ const [opacity, setOpacity] = useState(true);
+
+ const load = async () => {
+ eSendEvent(eOpenSideMenu);
+ setOpacity(false);
+ await sleep(2);
+ Animated.timing(opacityV, {
+ toValue: 0,
+ duration: 150,
+ easing: Easing.out(Easing.ease),
+ }).start();
+ db.notes.init().then(() => {
+ dispatch({type: Actions.NOTES});
+ dispatch({type: Actions.FAVORITES});
+ dispatch({type: Actions.LOADING, loading: false});
+ eSendEvent(eOpenSideMenu);
+ });
+ changeContainerScale(ContainerScale, 1, 600);
+ await sleep(150);
+ setLoading(false);
+ animation = false;
+ };
+
+ useEffect(() => {
+ eSubscribeEvent('load_overlay', load);
+ onLoad();
+ return () => {
+ eUnSubscribeEvent('load_overlay', load);
+ };
+ }, []);
+
+ return (
+ loading && (
+
+ {
+ setLoading(false);
+ }}
+ style={{
+ backgroundColor: colors.bg,
+ width: '100%',
+ height: '100%',
+ justifyContent: 'center',
+ alignItems: 'center',
+ borderRadius: 10,
+ opacity: opacityV,
+ }}>
+
+
+
+
+
+ )
+ );
+};
+
+export default AppLoader;
diff --git a/apps/mobile/src/components/Container/ContainerBottomButton.js b/apps/mobile/src/components/Container/ContainerBottomButton.js
index 37cfb5395..164d9fdd9 100644
--- a/apps/mobile/src/components/Container/ContainerBottomButton.js
+++ b/apps/mobile/src/components/Container/ContainerBottomButton.js
@@ -11,17 +11,15 @@ import {normalize, SIZE} from '../../utils/SizeUtils';
import {PressableButton} from '../PressableButton';
import RNTooltips from 'react-native-tooltips';
-const translateY = new Animated.Value(0);
+//const translateY = new Animated.Value(0);
export const ContainerBottomButton = ({
title,
onPress,
color = 'accent',
shouldShow = false,
}) => {
- const [state] = useTracked();
- const {colors} = state;
const insets = useSafeAreaInsets();
-
+/*
function animate(translate) {
Animated.timing(translateY, {
toValue: translate,
@@ -48,7 +46,7 @@ export const ContainerBottomButton = ({
Keyboard.removeListener('keyboardDidHide', onKeyboardHide);
};
}, []);
-
+ */
return DDS.isLargeTablet() && !shouldShow ? null : (
{
return (
{
marginLeft: -5,
marginRight:DDS.isLargeTablet()? 10 : 25,
}}
+ left={40}
+ top={40}
+ right={DDS.isLargeTablet()? 10 : 25}
onPress={onLeftButtonPress}
onLongPress={() => {
Navigation.popToTop();
diff --git a/apps/mobile/src/components/MoveNoteDialog/index.js b/apps/mobile/src/components/MoveNoteDialog/index.js
index ac32e4659..cb44a303e 100644
--- a/apps/mobile/src/components/MoveNoteDialog/index.js
+++ b/apps/mobile/src/components/MoveNoteDialog/index.js
@@ -12,6 +12,7 @@ import {
ToastEvent,
} from '../../services/EventManager';
import Navigation from '../../services/Navigation';
+import { getTotalNotes } from '../../utils';
import {db} from '../../utils/DB';
import {eOpenMoveNoteDialog} from '../../utils/Events';
import {pv, SIZE} from '../../utils/SizeUtils';
@@ -81,7 +82,7 @@ const MoveNoteComponent = ({close, note, setNote}) => {
const [expanded, setExpanded] = useState('');
const [notebookInputFocused, setNotebookInputFocused] = useState(false);
const [topicInputFocused, setTopicInputFocused] = useState(false);
-
+ const [noteExists, setNoteExists] = useState([]);
const addNewNotebook = async () => {
if (!newNotebookTitle || newNotebookTitle.trim().length === 0)
return ToastEvent.show({
@@ -117,14 +118,7 @@ const MoveNoteComponent = ({close, note, setNote}) => {
};
const handlePress = async (item, index) => {
- if (
- note?.notebooks?.findIndex(
- (o) =>
- o.topics.findIndex((i) => {
- return i === item.id;
- }) > -1,
- ) > -1
- ) {
+ if (note && item.notes.indexOf(note.id) > -1) {
await db.notebooks
.notebook(item.notebookId)
.topics.topic(item.id)
@@ -163,6 +157,19 @@ const MoveNoteComponent = ({close, note, setNote}) => {
dispatch({type: Actions.NOTEBOOKS});
};
+ useEffect(() => {
+ if (!note?.id) return;
+ let ids = [];
+ for (let i = 0; i < notebooks.length; i++) {
+ for (let t = 0; t < notebooks[i].topics.length; t++) {
+ if (notebooks[i].topics[t].notes.indexOf(note.id) > -1) {
+ ids.push(notebooks[i].id);
+ }
+ }
+ }
+ setNoteExists(ids);
+ }, []);
+
return (
<>
@@ -290,7 +297,9 @@ const MoveNoteComponent = ({close, note, setNote}) => {
marginBottom: 5,
borderBottomWidth: 1,
borderBottomColor:
- expanded === item.id ? colors.accent : colors.nav,
+ expanded === item.id || noteExists.indexOf(item.id) > -1
+ ? colors.accent
+ : colors.nav,
}}>
{
}}>
-1
+ ? colors.accent
+ : null
+ }
size={SIZE.md}>
{item.title}
- Notebook{' '}
- {item.totalNotes +
+ {getTotalNotes(item) +
' notes' +
' & ' +
item.topics.length +
@@ -431,12 +443,10 @@ const MoveNoteComponent = ({close, note, setNote}) => {
{item.title}
- {item.totalNotes + ' notes'}
+ {item.notes.length + ' notes'}
- {note?.notebooks?.findIndex(
- (o) => o.topics.indexOf(item.id) > -1,
- ) > -1 ? (
+ {note && item.notes.indexOf(note.id) > -1 ? (
{error && (
diff --git a/apps/mobile/src/views/Editor/EditorRoot.js b/apps/mobile/src/views/Editor/EditorRoot.js
index fc0fdc7f9..64f5ca788 100644
--- a/apps/mobile/src/views/Editor/EditorRoot.js
+++ b/apps/mobile/src/views/Editor/EditorRoot.js
@@ -28,7 +28,7 @@ import {
saveNote,
setIntent,
} from './Functions';
-import { toolbarRef } from './tiny/toolbar/constants';
+import {toolbarRef} from './tiny/toolbar/constants';
let handleBack;
let tapCount = 0;
@@ -67,7 +67,6 @@ const EditorRoot = () => {
await loadNote(item);
InteractionManager.runAfterInteractions(() => {
Keyboard.addListener('keyboardDidShow', () => {
-
if (!editing.movedAway) {
editing.isFocused = true;
}
@@ -82,7 +81,26 @@ const EditorRoot = () => {
});
};
- const onCallClear = async () => {
+ const onCallClear = async (value) => {
+ if (value === 'removeHandler') {
+ if (handleBack) {
+ handleBack.remove();
+ handleBack = null;
+ }
+ return;
+ }
+ if (value === 'addHandler') {
+ if (handleBack) {
+ handleBack.remove();
+ handleBack = null;
+ }
+
+ handleBack = BackHandler.addEventListener(
+ 'hardwareBackPress',
+ _onHardwareBackPress,
+ );
+ return;
+ }
if (editing.currentlyEditing) {
await _onBackPress();
}
@@ -96,12 +114,12 @@ const EditorRoot = () => {
};
const _onBackPress = async () => {
- eSendEvent("showTooltip");
+ eSendEvent('showTooltip');
toolbarRef.current?.scrollTo({
- x:0,
- y:0,
- animated:false
- })
+ x: 0,
+ y: 0,
+ animated: false,
+ });
editing.currentlyEditing = false;
if (DDS.isLargeTablet()) {
if (fullscreen) {
diff --git a/apps/mobile/src/views/Editor/Functions.js b/apps/mobile/src/views/Editor/Functions.js
index cfd5457cb..287a10624 100644
--- a/apps/mobile/src/views/Editor/Functions.js
+++ b/apps/mobile/src/views/Editor/Functions.js
@@ -1,20 +1,20 @@
-import {createRef} from 'react';
-import {Platform} from 'react-native';
-import {updateEvent} from '../../components/DialogManager/recievers';
-import {Actions} from '../../provider/Actions';
-import {DDS} from '../../services/DeviceDetection';
-import {eSendEvent, sendNoteEditedEvent} from '../../services/EventManager';
+import { createRef } from 'react';
+import { Platform } from 'react-native';
+import { updateEvent } from '../../components/DialogManager/recievers';
+import { Actions } from '../../provider/Actions';
+import { DDS } from '../../services/DeviceDetection';
+import { eSendEvent, sendNoteEditedEvent } from '../../services/EventManager';
import Navigation from '../../services/Navigation';
-import {editing} from '../../utils';
-import {COLORS_NOTE, COLOR_SCHEME} from '../../utils/Colors';
-import {hexToRGBA} from '../../utils/ColorUtils';
-import {db} from '../../utils/DB';
-import {eOnLoadNote, eShowGetPremium} from '../../utils/Events';
-import {openLinkInBrowser} from '../../utils/functions';
-import {MMKV} from '../../utils/mmkv';
-import {tabBarRef} from '../../utils/Refs';
-import {normalize} from '../../utils/SizeUtils';
-import {sleep, timeConverter} from '../../utils/TimeUtils';
+import { editing } from '../../utils';
+import { COLORS_NOTE, COLOR_SCHEME } from '../../utils/Colors';
+import { hexToRGBA } from '../../utils/ColorUtils';
+import { db } from '../../utils/DB';
+import { eOnLoadNote, eShowGetPremium } from '../../utils/Events';
+import { openLinkInBrowser } from '../../utils/functions';
+import { MMKV } from '../../utils/mmkv';
+import { tabBarRef } from '../../utils/Refs';
+import { normalize } from '../../utils/SizeUtils';
+import { sleep, timeConverter } from '../../utils/TimeUtils';
import tiny from './tiny/tiny';
export let EditorWebView = createRef();
@@ -121,9 +121,7 @@ export const _onShouldStartLoadWithRequest = async (request) => {
if (request.url.includes('https')) {
openLinkInBrowser(request.url, appColors)
.catch((e) => {})
- .then((r) => {
- console.log('closed');
- });
+ .then((r) => {});
return false;
} else {
@@ -146,8 +144,13 @@ async function setNote(item) {
content.type = note.content.type;
} else {
let data = await db.content.raw(note.contentId);
- content.data = data.data;
- content.type = data.type;
+ if (!data) {
+ content.data = '';
+ content.type = 'tiny';
+ } else {
+ content.data = data.data;
+ content.type = data.type;
+ }
}
}
@@ -191,6 +194,8 @@ export const loadNote = async (item) => {
return;
}
eSendEvent('loadingNote', item);
+ eSendEvent('webviewreset');
+ webviewInit = false;
editing.isFocused = false;
clearTimer();
await setNote(item);
@@ -216,14 +221,13 @@ const checkStatus = (reset = false) => {
if (!webviewOK) {
if (!reset) {
checkStatus(true);
- console.log('checking again');
+
return;
}
webviewInit = false;
EditorWebView = createRef();
eSendEvent('webviewreset');
} else {
- console.log('webview is running', webviewOK);
}
}, 3500);
};
@@ -251,20 +255,25 @@ export const _onMessage = async (evt) => {
eSendEvent('historyEvent', message.value);
break;
case 'tiny':
- content = {
- type: message.type,
- data: message.value,
- };
- onNoteChange();
+ if (message.value !== content.data) {
+ content = {
+ type: message.type,
+ data: message.value,
+ };
+ onNoteChange();
+ } else {
+ console.log('not saving');
+ }
break;
case 'title':
- console.log('TITLE', message.value);
noteEdited = true;
- title = message.value;
- eSendEvent('editorScroll', {
- title: message.value,
- });
- onNoteChange();
+ if (message.value !== title) {
+ title = message.value;
+ eSendEvent('editorScroll', {
+ title: message.value,
+ });
+ onNoteChange();
+ }
break;
case 'scroll':
eSendEvent('editorScroll', message);
@@ -296,7 +305,6 @@ export const _onMessage = async (evt) => {
webviewOK = true;
break;
case 'focus':
- console.log('focus gained', message.value);
editing.focusType = message.value;
break;
case 'selectionchange':
@@ -322,9 +330,13 @@ function onNoteChange() {
export async function clearEditor() {
tiny.call(EditorWebView, tiny.reset, true);
clearTimer();
- if (noteEdited && id) {
- await saveNote(false);
+ if (
+ (content?.data && content.data?.trim().length > 0) ||
+ (title && title.trim().length > 0)
+ ) {
+ await saveNote();
}
+ clearNote();
editing.focusType = null;
updateEvent({type: Actions.CURRENT_EDITING_NOTE, id: null});
sendNoteEditedEvent({
@@ -338,8 +350,6 @@ export async function clearEditor() {
saveCounter = 0;
tiny.call(EditorWebView, tiny.updateDateEdited(''), true);
tiny.call(EditorWebView, tiny.updateSavingState(''), true);
-
- clearNote();
}
async function setNoteInEditorAfterSaving(oldId, currentId) {
@@ -411,7 +421,7 @@ export async function saveNote() {
clearNote();
return;
}
- console.log('saving note is called here');
+
let locked = id ? db.notes.note(id).data.locked : null;
let noteData = {
@@ -423,8 +433,6 @@ export async function saveNote() {
id: id,
};
- console.log(noteData);
-
if (!locked) {
let noteId = await db.notes.add(noteData);
if (!id || saveCounter < 3) {
@@ -452,9 +460,7 @@ export async function saveNote() {
let n = db.notes.note(id)?.data?.dateEdited;
tiny.call(EditorWebView, tiny.updateDateEdited(timeConverter(n)));
tiny.call(EditorWebView, tiny.updateSavingState('Saved'));
- } catch (e) {
- console.log(e, 'error in saving');
- }
+ } catch (e) {}
}
export async function onWebViewLoad(premium, colors) {
@@ -484,10 +490,25 @@ const loadNoteInEditor = async () => {
if (!webviewInit) return;
saveCounter = 0;
if (note?.id) {
- console.log(content.data);
tiny.call(EditorWebView, tiny.setTitle(title));
intent = false;
- tiny.call(EditorWebView, tiny.html(content.data));
+
+ if (!content || !content.data || content?.data?.length === 0) {
+ tiny.call(
+ EditorWebView,
+ `
+ window.ReactNativeWebView.postMessage(
+ JSON.stringify({
+ type: 'noteLoaded',
+ value: true,
+ }),
+ );
+ `,
+ );
+ } else {
+ tiny.call(EditorWebView, tiny.html(content.data));
+ }
+
setColors();
tiny.call(
EditorWebView,
diff --git a/apps/mobile/src/views/Editor/index.js b/apps/mobile/src/views/Editor/index.js
index cecc79937..fc9cc2784 100755
--- a/apps/mobile/src/views/Editor/index.js
+++ b/apps/mobile/src/views/Editor/index.js
@@ -2,14 +2,18 @@ import React, {useEffect, useState} from 'react';
import {Platform, ScrollView, TextInput} from 'react-native';
import WebView from 'react-native-webview';
import {notesnook} from '../../../e2e/test.ids';
-import {Loading} from '../../components/Loading';
import {useTracked} from '../../provider';
-import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager';
+import {
+ eSendEvent,
+ eSubscribeEvent,
+ eUnSubscribeEvent,
+} from '../../services/EventManager';
import {getCurrentColors} from '../../utils/Colors';
import {sleep} from '../../utils/TimeUtils';
import EditorHeader from './EditorHeader';
import {
EditorWebView,
+ getNote,
injectedJS,
onWebViewLoad,
sourceUri,
@@ -40,18 +44,19 @@ const Editor = React.memo(
const [state] = useTracked();
const {premiumUser} = state;
const [resetting, setResetting] = useState(false);
- const [localLoading, setLocalLoading] = useState(false);
const onLoad = async () => {
await onWebViewLoad(premiumUser, getCurrentColors());
};
- const onResetRequested = async () => {
- setLocalLoading(true);
+ const onResetRequested = async (noload) => {
+ !noload && eSendEvent('loadingNote', getNote()?.id ? getNote() : {});
setResetting(true);
- await sleep(10);
+ await sleep(30);
setResetting(false);
- await sleep(1000);
- setLocalLoading(false);
+ if (!getNote()) {
+ await sleep(10);
+ eSendEvent('loadingNote', null);
+ }
};
useEffect(() => {
@@ -62,15 +67,8 @@ const Editor = React.memo(
};
}, []);
- return resetting ? (
-
- ) : (
+ return resetting ? null : (
<>
- {localLoading && }
-
diff --git a/apps/mobile/src/views/Editor/tiny/tiny.js b/apps/mobile/src/views/Editor/tiny/tiny.js
index 37c2d3013..75cfd3e7a 100644
--- a/apps/mobile/src/views/Editor/tiny/tiny.js
+++ b/apps/mobile/src/views/Editor/tiny/tiny.js
@@ -1,4 +1,4 @@
-import {EditorWebView, getWebviewInit} from '../Functions';
+import { getWebviewInit } from '../Functions';
const reset = `
isLoading = true;
diff --git a/apps/mobile/src/views/Editor/tiny/toolbar/commands.js b/apps/mobile/src/views/Editor/tiny/toolbar/commands.js
index 594e78f3c..5d1ec8b9e 100644
--- a/apps/mobile/src/views/Editor/tiny/toolbar/commands.js
+++ b/apps/mobile/src/views/Editor/tiny/toolbar/commands.js
@@ -60,13 +60,13 @@ export const execCommands = {
formatSelection(`
minifyImg(
"${b64}",
- 600,
+ 1024,
'image/jpeg',
(r) => {
var content = "![]()
";
editor.undoManager.transact(() => editor.execCommand("mceInsertContent",false,content));
},
- 0.7,
+ 0.6,
);
`);
});
diff --git a/apps/mobile/src/views/Notebook/index.js b/apps/mobile/src/views/Notebook/index.js
index d449ed6af..5659e0d97 100644
--- a/apps/mobile/src/views/Notebook/index.js
+++ b/apps/mobile/src/views/Notebook/index.js
@@ -16,6 +16,7 @@ import {
eOpenAddTopicDialog,
eScrollEvent,
} from '../../utils/Events';
+import {sleep} from '../../utils/TimeUtils';
export const Notebook = ({route, navigation}) => {
const [topics, setTopics] = useState(route.params.notebook.topics);
@@ -25,15 +26,18 @@ export const Notebook = ({route, navigation}) => {
let ranAfterInteractions = false;
- const runAfterInteractions = (time = 300) => {
+ const runAfterInteractions = (time = 150) => {
InteractionManager.runAfterInteractions(() => {
let notebook = db.notebooks.notebook(params.notebook?.id).data;
params.notebook = notebook;
- params.title = params.notebook.title
+ params.title = params.notebook.title;
setTopics(notebook.topics);
- if (loading) {
- setLoading(false);
- }
+ sleep(10).then((r) => {
+ if (loading) {
+ setLoading(false);
+ }
+ });
+
Navigation.routeNeedsUpdate('Notebook', () => {
onLoad();
});
@@ -51,15 +55,15 @@ export const Notebook = ({route, navigation}) => {
}
updateSearch();
ranAfterInteractions = false;
- },time);
+ }, time);
};
const onLoad = (data) => {
if (data) {
setLoading(true);
params = data;
}
- console.log('calling on load')
- runAfterInteractions(data? 500 : 1);
+
+ runAfterInteractions(data ? 150 : 1);
};
useEffect(() => {
diff --git a/apps/mobile/src/views/Notes/index.js b/apps/mobile/src/views/Notes/index.js
index 300a3d774..1c3631ce7 100644
--- a/apps/mobile/src/views/Notes/index.js
+++ b/apps/mobile/src/views/Notes/index.js
@@ -22,6 +22,7 @@ import {
refreshNotesPage,
} from '../../utils/Events';
import {tabBarRef} from '../../utils/Refs';
+import {sleep} from '../../utils/TimeUtils';
export const Notes = ({route, navigation}) => {
const [state, dispatch] = useTracked();
@@ -32,15 +33,33 @@ export const Notes = ({route, navigation}) => {
let pageIsLoaded = false;
let ranAfterInteractions = false;
- const runAfterInteractions = (time = 300) => {
+ const runAfterInteractions = (time = 150) => {
InteractionManager.runAfterInteractions(() => {
- if (localLoad) {
- setLocalLoad(false);
- }
Navigation.routeNeedsUpdate('NotesPage', () => {
init();
});
-
+ let _notes = [];
+ if (params.type === 'tag') {
+ _notes = db.notes.tagged(params.tag?.id);
+ } else if (params.type === 'color') {
+ _notes = db.notes.colored(params.color?.id);
+ } else {
+ _notes = db.notebooks
+ .notebook(params.notebookId)
+ .topics.topic(params.id).all;
+ }
+ if (
+ (params.type === 'tag' || params.type === 'color') &&
+ (!_notes || _notes.length === 0)
+ ) {
+ Navigation.goBack();
+ }
+ setNotes(_notes);
+ if (localLoad) {
+ sleep(10).then((r) => {
+ setLocalLoad(false);
+ });
+ }
if (params.menu) {
navigation.setOptions({
animationEnabled: false,
@@ -52,26 +71,6 @@ export const Notes = ({route, navigation}) => {
gestureEnabled: Platform.OS === 'ios',
});
}
-
- let _notes = [];
- if (params.type === 'tag') {
- _notes = db.notes.tagged(params.tag?.id);
- } else if (params.type === 'color') {
- _notes = db.notes.colored(params.color?.id);
- } else {
- _notes = db.notebooks
- .notebook(params.notebookId)
- .topics.topic(params.id).all;
- }
-
- if (
- (params.type === 'tag' || params.type === 'color') &&
- (!_notes || _notes.length === 0)
- ) {
- Navigation.goBack();
- }
-
- setNotes([..._notes]);
updateSearch();
dispatch({
type: Actions.CONTAINER_BOTTOM_BUTTON,
@@ -100,7 +99,6 @@ export const Notes = ({route, navigation}) => {
}, []);
const setActionAfterFirstSave = () => {
- console.log('setting action after first save',params);
if (params.type === 'tag') {
editing.actionAfterFirstSave = {
type: 'tag',
@@ -124,12 +122,11 @@ export const Notes = ({route, navigation}) => {
if (data) {
setLocalLoad(true);
params = data;
-
}
setActionAfterFirstSave();
if (!ranAfterInteractions) {
ranAfterInteractions = true;
- runAfterInteractions(data ? 500 : 1);
+ runAfterInteractions(data ? 150 : 1);
}
if (!pageIsLoaded) {
@@ -222,47 +219,53 @@ export const Notes = ({route, navigation}) => {
}
};
+ const headerProps = {
+ heading:
+ params.type === 'tag'
+ ? '#' + params.title
+ : params.title.slice(0, 1).toUpperCase() + params.title.slice(1),
+ color: params.type === 'color' ? params.title.toLowerCase() : null,
+ paragraph:
+ route.params.type === 'topic' && route.params.title !== 'General'
+ ? 'Edit topic'
+ : null,
+ onPress: () => {
+ if (route.params.type !== 'topic') return;
+ eSendEvent(eOpenAddTopicDialog, {
+ notebookId: route.params.notebookId,
+ toEdit: route.params,
+ });
+ },
+ icon: 'pencil',
+ };
+
+ const _refreshCallback = () => {
+ init();
+ };
+
+ const placeholderData = {
+ heading: 'Your notes',
+ paragraph: 'You have not added any notes yet.',
+ button: 'Add your first Note',
+ action: _onPressBottomButton,
+ loading: 'Loading your notes.',
+ };
+
+ const isFocused = () => navigation.isFocused();
+
return (
<>
{
- init();
- }}
- headerProps={{
- heading:
- params.type === 'tag'
- ? '#' + params.title
- : params.title.slice(0, 1).toUpperCase() + params.title.slice(1),
- color: params.type === 'color' ? params.title.toLowerCase() : null,
- paragraph:
- route.params.type === 'topic' && route.params.title !== 'General'
- ? 'Edit topic'
- : null,
- onPress: () => {
- console.log(route.params);
- if (route.params.type !== 'topic') return;
-
- eSendEvent(eOpenAddTopicDialog, {
- notebookId: route.params.notebookId,
- toEdit: route.params,
- });
- },
- icon: 'pencil',
- }}
+ refreshCallback={_refreshCallback}
+ headerProps={headerProps}
loading={loading || localLoad}
- focused={() => navigation.isFocused()}
+ focused={isFocused}
placeholderText={`Add some notes to this" ${
params.type ? params.type : 'topic.'
}`}
- placeholderData={{
- heading: 'Your notes',
- paragraph: 'You have not added any notes yet.',
- button: 'Add your first Note',
- action: _onPressBottomButton,
- loading: 'Loading your notes.',
- }}
+ placeholderData={placeholderData}
/>