diff --git a/apps/mobile/App.js b/apps/mobile/App.js index 93695c330..5ad57ce8e 100644 --- a/apps/mobile/App.js +++ b/apps/mobile/App.js @@ -120,13 +120,13 @@ const App = () => { try { await db.init(); let user = await db.user.get(); + console.log(user,"USER"); if (user) { dispatch({type: ACTIONS.USER, user: user}); startSyncer(); } } catch (e) { error = e; - console.log(e.message); } finally { dispatch({type: ACTIONS.ALL}); setInit(true); @@ -155,10 +155,8 @@ const App = () => { if (!settings || !settings.includes('fontScale')) { settings = defaultState.settings; settings.fontScale = 1; - console.log(settings, 'SETTINGS'); await MMKV.setStringAsync('settings', JSON.stringify(settings)); } - console.log(e,"Initialize"); } finally { let newColors = await getColorScheme(settings.useSystemTheme); dispatch({type: ACTIONS.SETTINGS, settings: {...settings}}); diff --git a/apps/mobile/android/app/src/main/assets/texteditor.html b/apps/mobile/android/app/src/main/assets/texteditor.html index 99f78cae4..6fb2fde59 100644 --- a/apps/mobile/android/app/src/main/assets/texteditor.html +++ b/apps/mobile/android/app/src/main/assets/texteditor.html @@ -1864,7 +1864,7 @@ } document.getElementById(dropdown).style.top = dropDownTop; document.getElementById(dropdown).style.left = left; - console.log(dropDownTop, left); + //dropdown.css('top', dropDownTop + 'px'); //dropdown.css('left', left + 'px'); @@ -1876,7 +1876,6 @@ let downTop = currentTop - b.offsetHeight - height; - console.log(downTop, 'nat') document.getElementById(dropdown).style.top = downTop + 20; document.getElementById(dropdown).style.left = left; diff --git a/apps/mobile/src/components/Container/ContainerBottomButton.js b/apps/mobile/src/components/Container/ContainerBottomButton.js index 4bdc005f7..ce21a7364 100644 --- a/apps/mobile/src/components/Container/ContainerBottomButton.js +++ b/apps/mobile/src/components/Container/ContainerBottomButton.js @@ -1,6 +1,6 @@ import React, {useEffect, useState} from 'react'; import {Keyboard, Text, View} from 'react-native'; -import {useSafeArea} from 'react-native-safe-area-context'; +import {useSafeAreaInsets} from 'react-native-safe-area-context'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import {pv, SIZE, WEIGHT} from '../../common/common'; import {useTracked} from '../../provider'; @@ -9,12 +9,10 @@ import {PressableButton} from '../PressableButton'; export const ContainerBottomButton = ({root}) => { const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors,containerBottomButton} = state; const [buttonHide, setButtonHide] = useState(false); - const insets = useSafeArea(); - let containerBottomButton = root - ? state.containerBottomButton - : state.indContainerBottomButton; + const insets = useSafeAreaInsets(); + useEffect(() => { Keyboard.addListener('keyboardDidShow', () => { setTimeout(() => { diff --git a/apps/mobile/src/components/Container/index.js b/apps/mobile/src/components/Container/index.js index 8dd72d481..72e824bde 100644 --- a/apps/mobile/src/components/Container/index.js +++ b/apps/mobile/src/components/Container/index.js @@ -1,12 +1,12 @@ import React from 'react'; import {KeyboardAvoidingView, Platform, SafeAreaView} from 'react-native'; -import {useSafeArea} from 'react-native-safe-area-context'; +import { useSafeAreaInsets} from 'react-native-safe-area-context'; import SelectionHeader from '../SelectionHeader'; import {ContainerBottomButton} from './ContainerBottomButton'; import {ContainerTopSection} from './ContainerTopSection'; export const Container = ({children,root}) => { - const insets = useSafeArea(); + const insets = useSafeAreaInsets(); return ( { + _showActionSheet = (data) => { this.setState( { actionSheetData: data, @@ -88,16 +90,15 @@ export class DialogManager extends Component { }; _showMoveNote = () => { - ///this.moveNoteDialog.open(); }; _hideMoveNote = () => { //eSendEvent(eCloseMoveNoteDialog) - // this.moveNoteDialog.close(); + // this.moveNoteDialog.close(); }; - loadNote = i => { + loadNote = (i) => { if (i && i.type === 'new') { this.setState({ item: {}, @@ -110,7 +111,7 @@ export class DialogManager extends Component { } }; - showAddTopic = notebook => { + showAddTopic = (notebook) => { if (notebook) { this.setState({ item: notebook, @@ -144,7 +145,7 @@ export class DialogManager extends Component { eSubscribeEvent(eOpenLoginDialog, this.showLoginDialog); eSubscribeEvent(eCloseLoginDialog, this.hideLoginDialog); - + eSubscribeEvent(eOpenPremiumDialog, this.showPremiumDialog); eSubscribeEvent(eClosePremiumDialog, this.hidePremiumDialog); } @@ -181,7 +182,6 @@ export class DialogManager extends Component { hidePremiumDialog = () => { this.premiumDialog.close(); }; - showLoginDialog = () => { //this.loginDialog.open(); @@ -191,21 +191,21 @@ export class DialogManager extends Component { //this.loginDialog.close(); }; - showAddNotebook = data => { - this.setState( + showAddNotebook = (data) => { + this.setState( { item: data.item ? data.item : {}, }, () => { this.addNotebooksDialog.open(); }, - ); + ); }; hideAddNotebook = () => { this.addNotebooksDialog.close(); }; - _showSimpleDialog = data => { + _showSimpleDialog = (data) => { this.setState( { simpleDialog: data, @@ -215,7 +215,7 @@ export class DialogManager extends Component { }, ); }; - _hideSimpleDialog = data => { + _hideSimpleDialog = (data) => { this.simpleDialog.hide(); }; @@ -255,22 +255,21 @@ export class DialogManager extends Component { break; } case 'movenote': { - // this._showMoveNote(); + // this._showMoveNote(); break; } - case "premium": { + case 'premium': { eSendEvent(eOpenPremiumDialog); break; } - case "export": { - eSendEvent(eOpenExportDialog,[this.state.item]); + case 'export': { + eSendEvent(eOpenExportDialog, [this.state.item]); break; } } } this.show = null; }; - render() { let {colors} = this.props; @@ -278,7 +277,7 @@ export class DialogManager extends Component { return ( <> (this.actionSheet = ref)} + ref={(ref) => (this.actionSheet = ref)} containerStyle={{ backgroundColor: colors.bg, width: DDS.isTab ? 500 : '100%', @@ -313,7 +312,7 @@ export class DialogManager extends Component { }}> { + setWillRefresh={(value) => { this.willRefresh = true; }} hasColors={actionSheetData.colors} @@ -323,7 +322,7 @@ export class DialogManager extends Component { } rowItems={actionSheetData.rowItems} columnItems={actionSheetData.columnItems} - close={value => { + close={(value) => { if (value) { this.show = value; } @@ -333,7 +332,7 @@ export class DialogManager extends Component { (this.simpleDialog = ref)} + ref={(ref) => (this.simpleDialog = ref)} item={item} colors={colors} template={simpleDialog} @@ -341,13 +340,10 @@ export class DialogManager extends Component { - + (this.addTopicsDialog = ref)} + ref={(ref) => (this.addTopicsDialog = ref)} toEdit={item.type === 'topic' ? item : null} notebookID={ actionSheetData.extraData @@ -357,19 +353,25 @@ export class DialogManager extends Component { colors={colors} /> (this.addNotebooksDialog = ref)} + ref={(ref) => (this.addNotebooksDialog = ref)} toEdit={item} colors={colors} /> - this.premiumDialog = ref} colors={colors} /> + (this.premiumDialog = ref)} + colors={colors} + /> - + - + + + + ); } diff --git a/apps/mobile/src/components/ExportDialog/index.js b/apps/mobile/src/components/ExportDialog/index.js index a962a6fee..554f90c05 100644 --- a/apps/mobile/src/components/ExportDialog/index.js +++ b/apps/mobile/src/components/ExportDialog/index.js @@ -145,7 +145,6 @@ const ExportDialog = () => { done={complete} doneText={doneText} onDone={() => { - console.log(result.type, result.filePath); FileViewer.open(result.filePath, { showOpenWithDialog: true, showAppsSuggestions: true, diff --git a/apps/mobile/src/components/Loading/index.js b/apps/mobile/src/components/Loading/index.js index f093c2b92..3ce532f8a 100644 --- a/apps/mobile/src/components/Loading/index.js +++ b/apps/mobile/src/components/Loading/index.js @@ -1,13 +1,8 @@ import React from 'react'; -import { - ActivityIndicator, - StyleSheet, - Text, - View -} from 'react-native'; -import { ph, pv, SIZE, WEIGHT } from '../../common/common'; -import { useTracked } from '../../provider'; -import { Button } from '../Button'; +import {ActivityIndicator, StyleSheet, Text, View} from 'react-native'; +import {ph, pv, SIZE, WEIGHT} from '../../common/common'; +import {useTracked} from '../../provider'; +import {Button} from '../Button'; export const Loading = ({ height = 150, @@ -32,13 +27,7 @@ export const Loading = ({ {doneText} -