diff --git a/apps/mobile/src/components/ActionSheet/index.js b/apps/mobile/src/components/ActionSheet/index.js
index 49bc15295..388e3da07 100644
--- a/apps/mobile/src/components/ActionSheet/index.js
+++ b/apps/mobile/src/components/ActionSheet/index.js
@@ -258,6 +258,9 @@ export default class ActionSheet extends Component {
overScrollMode="always"
style={[styles.scrollview]}>
+
-
-
+ }}>
- {noTextMode || !DDS.isTab ? null : (
-
- notesnook
-
- )}
-
- {DDS.isTab ? (
+ {DDS.isTab && noTextMode ? (
{
- noTextMode ? eSendEvent(eOpenModalMenu) : close();
+ eSendEvent(eOpenModalMenu);
}}
style={{
alignItems: 'center',
@@ -169,8 +158,8 @@ export const Menu = ({
style={{
marginTop: noTextMode ? 0 : 7.5,
}}
- name={noTextMode ? 'menu' : 'x'}
- size={noTextMode ? SIZE.lg : SIZE.xxl}
+ name="menu"
+ size={SIZE.lg}
color={colors.pri}
/>
@@ -629,17 +618,17 @@ export const Menu = ({
justifyContent: noTextMode ? 'center' : 'flex-start',
alignItems: 'center',
flexDirection: 'row',
- backgroundColor: colors.accent,
+ backgroundColor: noTextMode ? 'transparent' : colors.accent,
borderRadius: 5,
- paddingHorizontal: 6,
+ paddingHorizontal: noTextMode ? 0 : 6,
}}>
diff --git a/apps/mobile/src/components/ModalMenu/index.js b/apps/mobile/src/components/ModalMenu/index.js
index c74657644..852b751f8 100644
--- a/apps/mobile/src/components/ModalMenu/index.js
+++ b/apps/mobile/src/components/ModalMenu/index.js
@@ -44,7 +44,7 @@ export class ModalMenu extends Component {
this.setState({
visible: 'false',
});
- }, 200);
+ }, 100);
},
);
};
@@ -56,7 +56,7 @@ export class ModalMenu extends Component {
{
setTimeout(() => {
this.setState({
@@ -64,7 +64,6 @@ export class ModalMenu extends Component {
});
}, 0);
}}
- animationType="fade"
onRequestClose={() => this.setState({visible: false})}>
diff --git a/apps/mobile/src/components/NotesList/index.js b/apps/mobile/src/components/NotesList/index.js
index 7fb337ae9..d221dbe63 100644
--- a/apps/mobile/src/components/NotesList/index.js
+++ b/apps/mobile/src/components/NotesList/index.js
@@ -17,7 +17,7 @@ import {ToastEvent, hexToRGBA} from '../../utils/utils';
import {NotesPlaceHolder} from '../ListPlaceholders';
import NoteItem from '../NoteItem';
import SelectionWrapper from '../SelectionWrapper';
-import {db} from '../../../App';
+import {db, DDS} from '../../../App';
export const NotesList = ({isGrouped = false}) => {
const [state, dispatch] = useTracked();
@@ -68,7 +68,9 @@ export const NotesList = ({isGrouped = false}) => {
marginTop:
Platform.OS == 'ios'
? notes[0] && !selectionMode
- ? 135
+ ? DDS.isTab
+ ? 115
+ : 135
: 135 - 60
: notes[0] && !selectionMode
? 155
@@ -147,7 +149,9 @@ export const NotesList = ({isGrouped = false}) => {
marginTop:
Platform.OS == 'ios'
? notes[0]
- ? 135
+ ? DDS.isTab
+ ? 115
+ : 135
: 135 - 60
: notes[0]
? 155
diff --git a/apps/mobile/src/views/Editor/index.js b/apps/mobile/src/views/Editor/index.js
index 54280b8a7..c687a80b7 100755
--- a/apps/mobile/src/views/Editor/index.js
+++ b/apps/mobile/src/views/Editor/index.js
@@ -50,8 +50,7 @@ const Editor = ({navigation, noMenu}) => {
const [state, dispatch] = useTracked();
const {colors} = state;
const [loading, setLoading] = useState(true);
-
- let fullscreen = false;
+ const [fullscreen, setFullscreen] = useState(false);
// FUNCTIONS
@@ -105,14 +104,8 @@ const Editor = ({navigation, noMenu}) => {
content = null;
note = {};
saveCounter = 0;
+ EditorWebView.reload();
- post('clear');
- post(
- JSON.stringify({
- type: 'title',
- value: null,
- }),
- );
post('focusTitle');
};
@@ -377,28 +370,17 @@ const Editor = ({navigation, noMenu}) => {
right: 0,
top: 0,
}}>
- {DDS.isTab ? (
+ {DDS.isTab && !fullscreen ? (
{
- if (fullscreen) {
- fullscreen = false;
- eSendEvent(eCloseFullscreenEditor);
- post(
- JSON.stringify({
- type: 'nomenu',
- value: true,
- }),
- );
- } else {
- eSendEvent(eOpenFullscreenEditor);
- fullscreen = true;
- post(
- JSON.stringify({
- type: 'nomenu',
- value: false,
- }),
- );
- }
+ eSendEvent(eOpenFullscreenEditor);
+ setFullscreen(true);
+ post(
+ JSON.stringify({
+ type: 'nomenu',
+ value: false,
+ }),
+ );
}}
style={{
width: 60,
@@ -408,7 +390,7 @@ const Editor = ({navigation, noMenu}) => {
paddingRight: 12,
zIndex: 800,
}}>
-
+
) : null}
{
);
};
+ const closeFullscreen = () => {
+ setFullscreen(false);
+ };
+
// EFFECTS
+ useEffect(() => {
+ eSubscribeEvent(eCloseFullscreenEditor, closeFullscreen);
+
+ return () => {
+ eUnSubscribeEvent(eCloseFullscreenEditor, closeFullscreen);
+ };
+ });
useEffect(() => {
let handleBack;
if (!noMenu && DDS.isTab) {
diff --git a/apps/mobile/src/views/Home/index.js b/apps/mobile/src/views/Home/index.js
index 380a047d8..fc3fdbb43 100755
--- a/apps/mobile/src/views/Home/index.js
+++ b/apps/mobile/src/views/Home/index.js
@@ -11,7 +11,7 @@ import {ACTIONS} from '../../provider/actions';
import {eSendEvent} from '../../services/eventManager';
import NavigationService from '../../services/NavigationService';
import {SideMenuEvent} from '../../utils/utils';
-import {eScrollEvent} from '../../services/events';
+import {eScrollEvent, eOnLoadNote} from '../../services/events';
let count = 0;
export const AnimatedSafeAreaView = Animatable.createAnimatableComponent(
SafeAreaView,