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

rename methods

Browse Source
This commit is contained in:
ammarahm-ed
2020-12-29 17:19:32 +05:00
parent a5b20792b0
commit ce21da0e2a
4 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
apps/mobile/src/components/ActionSheetComponent/index.js
View File

@@ -1,54 +1,51 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {Keyboard} from 'react-native';
import {ScrollView} from 'react-native';
import { import {
ActivityIndicator, ActivityIndicator,
Clipboard, Clipboard,
Dimensions, Dimensions, Keyboard, ScrollView, TouchableOpacity,
TouchableOpacity, View
View,
} from 'react-native'; } from 'react-native';
import Share from 'react-native-share'; import Share from 'react-native-share';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {notesnook} from '../../../e2e/test.ids'; import { notesnook } from '../../../e2e/test.ids';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {Actions} from '../../provider/Actions'; import { Actions } from '../../provider/Actions';
import {DDS} from '../../services/DeviceDetection'; import { DDS } from '../../services/DeviceDetection';
import { import {
eSendEvent, eSendEvent,
openVault, openVault,
sendNoteEditedEvent, sendNoteEditedEvent,
ToastEvent, ToastEvent
} from '../../services/EventManager'; } from '../../services/EventManager';
import PremiumService from '../../services/PremiumService'; import PremiumService from '../../services/PremiumService';
import Sync from '../../services/Sync'; import Sync from '../../services/Sync';
import {editing, toTXT} from '../../utils'; import { editing, toTXT } from '../../utils';
import { import {
ACCENT, ACCENT,
COLOR_SCHEME, COLOR_SCHEME,
COLOR_SCHEME_DARK, COLOR_SCHEME_DARK,
COLOR_SCHEME_LIGHT, COLOR_SCHEME_LIGHT,
setColorScheme, setColorScheme
} from '../../utils/Colors'; } from '../../utils/Colors';
import {db} from '../../utils/DB'; import { db } from '../../utils/DB';
import { import {
eOnNewTopicAdded, eOnNewTopicAdded,
eOpenLoginDialog,
eOpenMoveNoteDialog, eOpenMoveNoteDialog,
eShowGetPremium,
refreshNotesPage, refreshNotesPage
} from '../../utils/Events'; } from '../../utils/Events';
import {deleteItems} from '../../utils/functions'; import { deleteItems } from '../../utils/functions';
import {MMKV} from '../../utils/mmkv'; import { MMKV } from '../../utils/mmkv';
import {opacity, ph, pv, SIZE} from '../../utils/SizeUtils'; import { opacity, pv, SIZE } from '../../utils/SizeUtils';
import {timeConverter} from '../../utils/TimeUtils'; import { timeConverter } from '../../utils/TimeUtils';
import {PremiumTag} from '../Premium/PremiumTag'; import { PremiumTag } from '../Premium/PremiumTag';
import {PressableButton} from '../PressableButton'; import { PressableButton } from '../PressableButton';
import {Toast} from '../Toast'; import { Toast } from '../Toast';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
import {ActionSheetColorsSection} from './ActionSheetColorsSection'; import { ActionSheetColorsSection } from './ActionSheetColorsSection';
import {ActionSheetTagsSection} from './ActionSheetTagsSection'; import { ActionSheetTagsSection } from './ActionSheetTagsSection';
const w = Dimensions.get('window').width; const w = Dimensions.get('window').width;
export const ActionSheetComponent = ({ export const ActionSheetComponent = ({
@@ -489,7 +486,8 @@ export const ActionSheetComponent = ({
}; };
const onScrollEnd = () => { const onScrollEnd = () => {
getRef().current?.childScrollHandler();
getRef().current?.handleChildScrollEnd();
}; };
return ( return (
@@ -697,10 +695,10 @@ export const ActionSheetComponent = ({
) : null} ) : null}
{editing.actionAfterFirstSave.type === 'topic' && {editing.actionAfterFirstSave.type === 'topic' &&
note.notebooks && note.notebooks?.length > 0 &&
note.notebooks.findIndex( note?.notebooks?.findIndex(
(o) => o.id === editing.actionAfterFirstSave.id, (o) => o.topics.indexOf(editing.actionAfterFirstSave.id) > -1,
) ? ( ) > -1 ? (
<PressableButton <PressableButton
type="accent" type="accent"
accentColor="red" accentColor="red"

17
apps/mobile/src/components/MoveNoteDialog/index.js
View File

@@ -9,6 +9,7 @@ import {
eSendEvent, eSendEvent,
eSubscribeEvent, eSubscribeEvent,
eUnSubscribeEvent, eUnSubscribeEvent,
sendNoteEditedEvent,
ToastEvent, ToastEvent,
} from '../../services/EventManager'; } from '../../services/EventManager';
import {db} from '../../utils/DB'; import {db} from '../../utils/DB';
@@ -125,8 +126,10 @@ const MoveNoteComponent = ({close, note, setNote}) => {
if (note && note.id) { if (note && note.id) {
setNote({...db.notes.note(note.id).data}); setNote({...db.notes.note(note.id).data});
sendNoteEditedEvent(note.id);
} }
dispatch({type: Actions.NOTEBOOKS}); dispatch({type: Actions.NOTEBOOKS});
return; return;
} }
@@ -142,6 +145,8 @@ const MoveNoteComponent = ({close, note, setNote}) => {
); );
if (note && note.id) { if (note && note.id) {
setNote({...db.notes.note(note.id).data}); setNote({...db.notes.note(note.id).data});
sendNoteEditedEvent(note.id);
} }
dispatch({type: Actions.NOTEBOOKS}); dispatch({type: Actions.NOTEBOOKS});
}; };
@@ -174,13 +179,13 @@ const MoveNoteComponent = ({close, note, setNote}) => {
<FlatList <FlatList
nestedScrollEnabled={true} nestedScrollEnabled={true}
onScrollEndDrag={() => { onScrollEndDrag={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onMomentumScrollEnd={() => { onMomentumScrollEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onScrollAnimationEnd={() => { onScrollAnimationEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
keyboardShouldPersistTaps="always" keyboardShouldPersistTaps="always"
keyboardDismissMode="none" keyboardDismissMode="none"
@@ -315,13 +320,13 @@ const MoveNoteComponent = ({close, note, setNote}) => {
keyboardShouldPersistTaps="always" keyboardShouldPersistTaps="always"
keyboardDismissMode="none" keyboardDismissMode="none"
onScrollEndDrag={() => { onScrollEndDrag={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onMomentumScrollEnd={() => { onMomentumScrollEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onScrollAnimationEnd={() => { onScrollAnimationEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
style={{ style={{
width: '90%', width: '90%',

6
apps/mobile/src/components/Premium/PremiumDialog.js
View File

@@ -100,12 +100,12 @@ class PremiumDialog extends React.Component {
<ScrollView <ScrollView
nestedScrollEnabled={true} nestedScrollEnabled={true}
onScrollEndDrag={this.actionSheetRef.current?.childScrollHandler} onScrollEndDrag={this.actionSheetRef.current?.handleChildScrollEnd}
onScrollAnimationEnd={ onScrollAnimationEnd={
this.actionSheetRef.current?.childScrollHandler this.actionSheetRef.current?.handleChildScrollEnd
} }
onMomentumScrollEnd={ onMomentumScrollEnd={
this.actionSheetRef.current?.childScrollHandler this.actionSheetRef.current?.handleChildScrollEnd
} }
style={{ style={{
width: '100%', width: '100%',

6
apps/mobile/src/components/RestoreDialog/index.js
View File

@@ -198,13 +198,13 @@ const RestoreDataComponent = ({close, setRestoring, restoring}) => {
<ScrollView <ScrollView
nestedScrollEnabled nestedScrollEnabled
onScrollEndDrag={() => { onScrollEndDrag={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onMomentumScrollEnd={() => { onMomentumScrollEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
onScrollAnimationEnd={() => { onScrollAnimationEnd={() => {
actionSheetRef.current?.childScrollHandler(); actionSheetRef.current?.handleChildScrollEnd();
}} }}
style={{ style={{
paddingHorizontal: 12, paddingHorizontal: 12,