diff --git a/apps/mobile/App.js b/apps/mobile/App.js index 19552e5ba..d1e088b0e 100644 --- a/apps/mobile/App.js +++ b/apps/mobile/App.js @@ -109,6 +109,7 @@ const Overlay = ({onLoad}) => { }); setOpacity(false); await sleep(150); + eSendEvent(eOpenSideMenu); Animated.timing(opacityV, { toValue: 0, duration: 150, diff --git a/apps/mobile/AppRootEvents.js b/apps/mobile/AppRootEvents.js index ed4d7c008..bd409ab09 100644 --- a/apps/mobile/AppRootEvents.js +++ b/apps/mobile/AppRootEvents.js @@ -19,7 +19,7 @@ import PremiumService from './src/services/PremiumService'; import SettingsService from './src/services/SettingsService'; import Sync from './src/services/Sync'; import {APP_VERSION, editing} from './src/utils'; -import {COLOR_SCHEME} from './src/utils/Colors'; +import {COLOR_SCHEME, updateStatusBarColor} from './src/utils/Colors'; import {db} from './src/utils/DB'; import { eClearEditor, @@ -36,16 +36,6 @@ let prevTransactionId = null; let subsriptionSuccessListener; let subsriptionErrorListener; -function updateStatusBarColor() { - StatusBar.setBarStyle( - COLOR_SCHEME.night ? 'light-content' : 'dark-content', - true, - ); - if (Platform.OS === 'android') { - StatusBar.setBackgroundColor('transparent', true); - StatusBar.setTranslucent(true, true); - } -} async function storeAppState() { if (editing.currentlyEditing) { diff --git a/apps/mobile/initializer.root.js b/apps/mobile/initializer.root.js index 86aac072a..31624157d 100644 --- a/apps/mobile/initializer.root.js +++ b/apps/mobile/initializer.root.js @@ -1,39 +1,41 @@ import { activateKeepAwake, - deactivateKeepAwake + deactivateKeepAwake, } from '@sayem314/react-native-keep-awake'; -import React, { useCallback, useEffect, useState } from 'react'; -import { Dimensions, View } from 'react-native'; +import React, {useCallback, useEffect, useState} from 'react'; +import {Dimensions, View} from 'react-native'; import ScrollableTabView from 'react-native-scrollable-tab-view'; -import { notesnook } from './e2e/test.ids'; +import {notesnook} from './e2e/test.ids'; import ContextMenu from './src/components/ContextMenu'; -import { DialogManager } from './src/components/DialogManager'; -import { DummyText } from './src/components/DummyText'; -import { Menu } from './src/components/Menu'; +import {DialogManager} from './src/components/DialogManager'; +import {DummyText} from './src/components/DummyText'; +import {Menu} from './src/components/Menu'; import Splash from './src/components/SplashScreen'; -import { Toast } from './src/components/Toast'; -import { NavigationStack } from './src/navigation/Drawer'; -import { NavigatorStack } from './src/navigation/NavigatorStack'; -import { useTracked } from './src/provider'; -import { Actions } from './src/provider/Actions'; -import { DDS } from './src/services/DeviceDetection'; +import {Toast} from './src/components/Toast'; +import {NavigationStack} from './src/navigation/Drawer'; +import {NavigatorStack} from './src/navigation/NavigatorStack'; +import {useTracked} from './src/provider'; +import {Actions} from './src/provider/Actions'; +import {DDS} from './src/services/DeviceDetection'; import { eSendEvent, eSubscribeEvent, - eUnSubscribeEvent + eUnSubscribeEvent, } from './src/services/EventManager'; -import { editing, setWidthHeight } from './src/utils'; +import {editing, setWidthHeight} from './src/utils'; +import {updateStatusBarColor} from './src/utils/Colors'; import { eClearEditor, eCloseFullscreenEditor, eCloseSideMenu, eOnLoadNote, eOpenFullscreenEditor, - eOpenSideMenu + eOpenSideMenu, } from './src/utils/Events'; -import { editorRef, tabBarRef } from './src/utils/Refs'; -import { EditorWrapper } from './src/views/Editor/EditorWrapper'; -import { EditorWebView, getNote } from './src/views/Editor/Functions'; +import {editorRef, tabBarRef} from './src/utils/Refs'; +import {sleep} from './src/utils/TimeUtils'; +import {EditorWrapper} from './src/views/Editor/EditorWrapper'; +import {EditorWebView, getNote} from './src/views/Editor/Functions'; import tiny from './src/views/Editor/tiny/tiny'; let {width, height} = Dimensions.get('window'); let layoutTimer = null; @@ -51,13 +53,17 @@ const onChangeTab = async (obj) => { eSendEvent(eOnLoadNote, {type: 'new'}); editing.currentlyEditing = true; } + sleep(1000).then(() => { + updateStatusBarColor(); + }); } else { if (obj.from === 1) { + updateStatusBarColor(); deactivateKeepAwake(); if (getNote()?.locked) { eSendEvent(eClearEditor); } - eSendEvent("showTooltip"); + eSendEvent('showTooltip'); editing.movedAway = true; tiny.call(EditorWebView, tiny.blur); } @@ -182,7 +188,6 @@ const AppStack = React.memo( let size = event?.nativeEvent?.layout; updatedDimensions = size; if (!size || (size.width === dimensions.width && deviceMode !== null)) { - DDS.setSize(size); //console.log(deviceMode, 'MODE__'); dispatch({type: Actions.DEVICE_MODE, state: deviceMode}); diff --git a/apps/mobile/src/utils/Colors.js b/apps/mobile/src/utils/Colors.js index 7c1cb3493..047080a01 100644 --- a/apps/mobile/src/utils/Colors.js +++ b/apps/mobile/src/utils/Colors.js @@ -24,7 +24,7 @@ const fixedColors = { fg: ACCENT.color, normal: 'black', icon: 'gray', - transGray:"#00000010", + transGray: '#00000010', errorBg: '#FFB6C1', errorText: '#ff6961', successBg: '#DFF2BF', @@ -103,3 +103,14 @@ export function setAccentColor(color) { return ACCENT; } + +export function updateStatusBarColor() { + StatusBar.setBarStyle( + COLOR_SCHEME.night ? 'light-content' : 'dark-content', + true, + ); + if (Platform.OS === 'android') { + StatusBar.setBackgroundColor('transparent', true); + StatusBar.setTranslucent(true, true); + } +}