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

refactor: prevent require cycles warning

Browse Source
This commit is contained in:
ammarahm-ed
2020-04-09 15:13:09 +05:00
parent ac51c4c861
commit 4b7bd58657
8 changed files with 369 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/mobile/index.mobile.js
View File

@@ -1,22 +1,21 @@
import React, {useEffect, createRef} from 'react'; import React, { useEffect, createRef } from 'react';
import Animated from 'react-native-reanimated'; import Animated from 'react-native-reanimated';
import {Menu} from './src/components/Menu'; import { Menu } from './src/components/Menu';
import * as Animatable from 'react-native-animatable'; import * as Animatable from 'react-native-animatable';
import SideMenu from './src/components/SideMenu'; import SideMenu from './src/components/SideMenu';
import NavigationService, { import { EditorPosition } from './src/utils/animations';
AppContainer, import { sideMenuRef } from './src/utils/refs';
} from './src/services/NavigationService'; import { DDS, w } from './src/utils/utils';
import {EditorPosition} from './src/utils/animations';
import {sideMenuRef} from './src/utils/refs';
import {DDS, w} from './src/utils/utils';
import Editor from './src/views/Editor'; import Editor from './src/views/Editor';
import {useTracked} from './src/provider'; import { useTracked } from './src/provider';
import {StatusBar, Platform} from 'react-native'; import { StatusBar, Platform } from 'react-native';
import { AppContainer } from './src/services/AppContainer';
import NavigationService from './src/services/NavigationService';
const editorRef = createRef(); const editorRef = createRef();
export const Initialize = () => { export const Initialize = () => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors} = state; const { colors } = state;
useEffect(() => { useEffect(() => {
if (Platform.OS === 'android') { if (Platform.OS === 'android') {

22
apps/mobile/index.tablet.js
View File

@@ -1,26 +1,26 @@
import React, {createRef, useEffect, useState} from 'react'; import React, { createRef, useEffect, useState } from 'react';
import {Platform, StatusBar, View} from 'react-native'; import { Platform, StatusBar, View } from 'react-native';
import * as Animatable from 'react-native-animatable'; import * as Animatable from 'react-native-animatable';
import {Menu} from './src/components/Menu'; import { Menu } from './src/components/Menu';
import {ModalMenu} from './src/components/ModalMenu'; import { ModalMenu } from './src/components/ModalMenu';
import {useTracked} from './src/provider'; import { useTracked } from './src/provider';
import NavigationService, {
AppContainer,
} from './src/services/NavigationService';
import Editor from './src/views/Editor'; import Editor from './src/views/Editor';
import {eSubscribeEvent, eSendEvent} from './src/services/eventManager'; import { eSubscribeEvent, eSendEvent } from './src/services/eventManager';
import { import {
eOpenFullscreenEditor, eOpenFullscreenEditor,
eCloseFullscreenEditor, eCloseFullscreenEditor,
eOnLoadNote, eOnLoadNote,
} from './src/services/events'; } from './src/services/events';
import { AppContainer } from './src/services/AppContainer';
import NavigationService from './src/services/NavigationService';
const editorRef = createRef(); const editorRef = createRef();
let outColors; let outColors;
export const Initialize = () => { export const Initialize = () => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors} = state; const { colors } = state;
const [fullscreen, setFullscreen] = useState(false); const [fullscreen, setFullscreen] = useState(false);
@@ -56,7 +56,7 @@ export const Initialize = () => {
}; };
useEffect(() => { useEffect(() => {
eSendEvent(eOnLoadNote, {type: 'new'}); eSendEvent(eOnLoadNote, { type: 'new' });
eSubscribeEvent(eOpenFullscreenEditor, showFullScreenEditor); eSubscribeEvent(eOpenFullscreenEditor, showFullScreenEditor);
eSubscribeEvent(eCloseFullscreenEditor, closeFullScreenEditor); eSubscribeEvent(eCloseFullscreenEditor, closeFullScreenEditor);

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

@@ -1,4 +1,4 @@
import React, {createRef, useEffect, useState} from 'react'; import React, { createRef, useEffect, useState } from 'react';
import { import {
Dimensions, Dimensions,
StatusBar, StatusBar,
@@ -22,18 +22,18 @@ import {
SIZE, SIZE,
WEIGHT, WEIGHT,
} from '../../common/common'; } from '../../common/common';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {ACTIONS} from '../../provider/actions'; import { ACTIONS } from '../../provider/actions';
import NavigationService from '../../services/NavigationService'; import NavigationService from '../../services/NavigationService';
import {timeConverter, ToastEvent, DDS, db} from '../../utils/utils'; import { timeConverter, ToastEvent, DDS, db } from '../../utils/utils';
import {openVault} from '../../services/eventManager'; import { openVault } from '../../services/eventManager';
const w = Dimensions.get('window').width; const w = Dimensions.get('window').width;
const h = Dimensions.get('window').height; const h = Dimensions.get('window').height;
const tagsInputRef = createRef(); const tagsInputRef = createRef();
export const ActionSheetComponent = ({ export const ActionSheetComponent = ({
close = () => {}, close = () => { },
item, item,
hasColors = false, hasColors = false,
hasTags = false, hasTags = false,
@@ -41,35 +41,35 @@ export const ActionSheetComponent = ({
columnItems = [], columnItems = [],
}) => { }) => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors, tags, currentEditingNote} = state; const { colors, tags, currentEditingNote } = state;
const [focused, setFocused] = useState(false); const [focused, setFocused] = useState(false);
const [note, setNote] = useState( const [note, setNote] = useState(
item item
? item ? item
: { : {
colors: [], colors: [],
tags: [], tags: [],
pinned: false, pinned: false,
favorite: false, favorite: false,
locked: false, locked: false,
content: { content: {
text: null, text: null,
delta: null, delta: null,
},
dateCreated: null,
}, },
dateCreated: null,
},
); );
function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) { function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) {
let newColors = setColorScheme(colors, accent); let newColors = setColorScheme(colors, accent);
StatusBar.setBarStyle(colors.night ? 'light-content' : 'dark-content'); StatusBar.setBarStyle(colors.night ? 'light-content' : 'dark-content');
dispatch({type: ACTIONS.THEME, colors: newColors}); dispatch({ type: ACTIONS.THEME, colors: newColors });
} }
useEffect(() => { useEffect(() => {
if (item.dateCreated !== null) { if (item.dateCreated !== null) {
setNote({...item}); setNote({ ...item });
} }
}, [item]); }, [item]);
@@ -95,8 +95,8 @@ export const ActionSheetComponent = ({
await db.notes.note(note.id).tag(tag); await db.notes.note(note.id).tag(tag);
setNote({...db.notes.note(note.id).data}); setNote({ ...db.notes.note(note.id).data });
dispatch({type: ACTIONS.TAGS}); dispatch({ type: ACTIONS.TAGS });
tagToAdd = ''; tagToAdd = '';
}; };
@@ -111,14 +111,14 @@ export const ActionSheetComponent = ({
backPressCount = 0; backPressCount = 0;
let tagInputValue = note.tags[note.tags.length - 1]; let tagInputValue = note.tags[note.tags.length - 1];
let oldProps = {...note}; let oldProps = { ...note };
if (oldProps.tags.length === 0) return; if (oldProps.tags.length === 0) return;
await db.notes await db.notes
.note(note.id) .note(note.id)
.untag(oldProps.tags[oldProps.tags.length - 1]); .untag(oldProps.tags[oldProps.tags.length - 1]);
setNote({...db.notes.note(note.id).data}); setNote({ ...db.notes.note(note.id).data });
tagsInputRef.current?.setNativeProps({ tagsInputRef.current?.setNativeProps({
text: tagInputValue, text: tagInputValue,
@@ -182,11 +182,11 @@ export const ActionSheetComponent = ({
if (!toAdd || !toAdd.id) return; if (!toAdd || !toAdd.id) return;
if (!nodispatch) { if (!nodispatch) {
dispatch({type: type}); dispatch({ type: type });
dispatch({type: ACTIONS.PINNED}); dispatch({ type: ACTIONS.PINNED });
dispatch({type: ACTIONS.FAVORITES}); dispatch({ type: ACTIONS.FAVORITES });
} }
setNote({...toAdd}); setNote({ ...toAdd });
}; };
const rowItemsData = [ const rowItemsData = [
@@ -194,8 +194,8 @@ export const ActionSheetComponent = ({
name: 'Add to', name: 'Add to',
icon: 'book-outline', icon: 'book-outline',
func: () => { func: () => {
dispatch({type: ACTIONS.MODAL_NAVIGATOR, enabled: true}); dispatch({ type: ACTIONS.MODAL_NAVIGATOR, enabled: true });
dispatch({type: ACTIONS.SELECTED_ITEMS, item: note}); dispatch({ type: ACTIONS.SELECTED_ITEMS, item: note });
close('movenote'); close('movenote');
}, },
@@ -259,7 +259,7 @@ export const ActionSheetComponent = ({
icon: 'delete-restore', icon: 'delete-restore',
func: async () => { func: async () => {
await db.trash.restore(note.id); await db.trash.restore(note.id);
dispatch({type: ACTIONS.TRASH}); dispatch({ type: ACTIONS.TRASH });
localRefresh(note.type); localRefresh(note.type);
ToastEvent.show( ToastEvent.show(
item.type === 'note' ? 'Note restored' : 'Notebook restored', item.type === 'note' ? 'Note restored' : 'Notebook restored',
@@ -283,10 +283,10 @@ export const ActionSheetComponent = ({
icon: 'theme-light-dark', icon: 'theme-light-dark',
func: () => { func: () => {
if (!colors.night) { if (!colors.night) {
MMKV.setStringAsync('theme', JSON.stringify({night: true})); MMKV.setStringAsync('theme', JSON.stringify({ night: true }));
changeColorScheme(COLOR_SCHEME_DARK); changeColorScheme(COLOR_SCHEME_DARK);
} else { } else {
MMKV.setStringAsync('theme', JSON.stringify({night: false})); MMKV.setStringAsync('theme', JSON.stringify({ night: false }));
changeColorScheme(COLOR_SCHEME_LIGHT); changeColorScheme(COLOR_SCHEME_LIGHT);
} }
}, },
@@ -304,7 +304,7 @@ export const ActionSheetComponent = ({
} else { } else {
await db.notebooks.notebook(note.id).pin(); await db.notebooks.notebook(note.id).pin();
} }
dispatch({type: ACTIONS.PINNED}); dispatch({ type: ACTIONS.PINNED });
localRefresh(item.type); localRefresh(item.type);
}, },
close: false, close: false,
@@ -321,7 +321,7 @@ export const ActionSheetComponent = ({
} else { } else {
await db.notebooks.notebook(note.id).favorite(); await db.notebooks.notebook(note.id).favorite();
} }
dispatch({type: ACTIONS.FAVORITES}); dispatch({ type: ACTIONS.FAVORITES });
localRefresh(item.type); localRefresh(item.type);
}, },
close: false, close: false,
@@ -372,13 +372,13 @@ export const ActionSheetComponent = ({
<TouchableOpacity <TouchableOpacity
key={tag} key={tag}
onPress={async () => { onPress={async () => {
let oldProps = {...note}; let oldProps = { ...note };
try { try {
await db.notes await db.notes
.note(note.id) .note(note.id)
.untag(oldProps.tags[oldProps.tags.indexOf(tag)]); .untag(oldProps.tags[oldProps.tags.indexOf(tag)]);
localRefresh(oldProps.type); localRefresh(oldProps.type);
dispatch({type: ACTIONS.TAGS}); dispatch({ type: ACTIONS.TAGS });
} catch (e) { } catch (e) {
localRefresh(oldProps.type); localRefresh(oldProps.type);
} }
@@ -419,7 +419,7 @@ export const ActionSheetComponent = ({
} else { } else {
await db.notes.note(note.id).color(color); await db.notes.note(note.id).color(color);
} }
dispatch({type: ACTIONS.COLORS}); dispatch({ type: ACTIONS.COLORS });
localRefresh(note.type); localRefresh(note.type);
}} }}
style={{ style={{
@@ -484,64 +484,64 @@ export const ActionSheetComponent = ({
const _renderColumnItem = item => const _renderColumnItem = item =>
(note.id && columnItems.includes(item.name)) || (note.id && columnItems.includes(item.name)) ||
(item.name === 'Dark Mode' && columnItems.includes(item.name)) ? ( (item.name === 'Dark Mode' && columnItems.includes(item.name)) ? (
<TouchableOpacity <TouchableOpacity
key={item.name} key={item.name}
activeOpacity={opacity} activeOpacity={opacity}
onPress={() => { onPress={() => {
item.func(); item.func();
}} }}
style={{
width: '100%',
alignSelf: 'center',
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'flex-end',
paddingHorizontal: 12,
paddingVertical: pv,
}}>
<View
style={{ style={{
width: '100%',
alignSelf: 'center',
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', justifyContent: 'space-between',
alignItems: 'flex-end',
paddingHorizontal: 12,
paddingVertical: pv,
}}> }}>
<Icon <View
style={{ style={{
width: 30, flexDirection: 'row',
}} alignItems: 'center',
name={item.icon}
color={colors.pri}
size={SIZE.md}
/>
<Text
style={{
fontFamily: WEIGHT.regular,
fontSize: SIZE.sm,
color: colors.pri,
}}> }}>
{item.name} <Icon
</Text> style={{
</View> width: 30,
{item.switch ? ( }}
<Icon name={item.icon}
size={SIZE.lg + 2} color={colors.pri}
color={item.on ? colors.accent : colors.icon} size={SIZE.md}
name={item.on ? 'toggle-switch' : 'toggle-switch-off'} />
/> <Text
) : ( style={{
undefined fontFamily: WEIGHT.regular,
)} fontSize: SIZE.sm,
{item.check ? ( color: colors.pri,
<Icon }}>
name={ {item.name}
item.on ? 'check-circle-outline' : 'checkbox-blank-circle-outline' </Text>
} </View>
color={item.on ? colors.accent : colors.icon} {item.switch ? (
size={SIZE.lg + 2} <Icon
/> size={SIZE.lg + 2}
) : null} color={item.on ? colors.accent : colors.icon}
</TouchableOpacity> name={item.on ? 'toggle-switch' : 'toggle-switch-off'}
) : null; />
) : (
undefined
)}
{item.check ? (
<Icon
name={
item.on ? 'check-circle-outline' : 'checkbox-blank-circle-outline'
}
color={item.on ? colors.accent : colors.icon}
size={SIZE.lg + 2}
/>
) : null}
</TouchableOpacity>
) : null;
return ( return (
<View <View
@@ -568,73 +568,73 @@ export const ActionSheetComponent = ({
Please start writing to save your note. Please start writing to save your note.
</Text> </Text>
) : ( ) : (
<View <View
style={{
paddingHorizontal: 12,
alignItems: 'center',
marginVertical: 10,
}}>
<Text
numberOfLines={1}
style={{ style={{
color: colors.pri, paddingHorizontal: 12,
fontSize: SIZE.sm + 1, alignItems: 'center',
fontFamily: WEIGHT.bold, marginVertical: 10,
maxWidth: '100%',
}}> }}>
{note.title.replace('\n', '')} <Text
</Text> numberOfLines={1}
<Text
numberOfLines={2}
style={{
fontSize: SIZE.sm - 1,
color: colors.pri + 'B3',
fontFamily: WEIGHT.regular,
width: '100%',
textAlign: 'center',
maxWidth: '100%',
}}>
{note.type === 'notebook' && note.description
? note.description
: null}
{note.type === 'note'
? note.headline[item.headline.length - 1] === '\n'
? note.headline.slice(0, note.headline.length - 1)
: note.headline
: null}
</Text>
<Text
style={{
color: colors.icon,
fontSize: SIZE.xs - 1,
textAlignVertical: 'center',
fontFamily: WEIGHT.regular,
marginTop: 2.5,
}}>
{note.type === 'note'
? 'Last edited on ' + timeConverter(note.dateEdited)
: null}
{note.type !== 'note' && !note.dateDeleted
? 'Created on ' + timeConverter(note.dateCreated)
: null}
{note.dateDeleted
? 'Deleted on ' + timeConverter(note.dateDeleted)
: null}
</Text>
{note.type !== 'notebook' ? null : (
<View
style={{ style={{
flexDirection: 'row', color: colors.pri,
alignItems: 'center', fontSize: SIZE.sm + 1,
justifyContent: 'center', fontFamily: WEIGHT.bold,
width: '100%',
maxWidth: '100%', maxWidth: '100%',
flexWrap: 'wrap',
}}> }}>
{note && note.topics {note.title.replace('\n', '')}
? note.topics.slice(1, 4).map(topic => ( </Text>
<Text
numberOfLines={2}
style={{
fontSize: SIZE.sm - 1,
color: colors.pri + 'B3',
fontFamily: WEIGHT.regular,
width: '100%',
textAlign: 'center',
maxWidth: '100%',
}}>
{note.type === 'notebook' && note.description
? note.description
: null}
{note.type === 'note'
? note.headline[item.headline.length - 1] === '\n'
? note.headline.slice(0, note.headline.length - 1)
: note.headline
: null}
</Text>
<Text
style={{
color: colors.icon,
fontSize: SIZE.xs - 1,
textAlignVertical: 'center',
fontFamily: WEIGHT.regular,
marginTop: 2.5,
}}>
{note.type === 'note'
? 'Last edited on ' + timeConverter(note.dateEdited)
: null}
{note.type !== 'note' && !note.dateDeleted
? 'Created on ' + timeConverter(note.dateCreated)
: null}
{note.dateDeleted
? 'Deleted on ' + timeConverter(note.dateDeleted)
: null}
</Text>
{note.type !== 'notebook' ? null : (
<View
style={{
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
width: '100%',
maxWidth: '100%',
flexWrap: 'wrap',
}}>
{note && note.topics
? note.topics.slice(1, 4).map(topic => (
<View <View
key={topic.dateCreated.toString() + topic.title} key={topic.dateCreated.toString() + topic.title}
style={{ style={{
@@ -657,29 +657,29 @@ export const ActionSheetComponent = ({
</Text> </Text>
</View> </View>
)) ))
: null} : null}
</View> </View>
)} )}
{note.type !== 'note' ? null : ( {note.type !== 'note' ? null : (
<Text <Text
style={{ style={{
color: colors.accent, color: colors.accent,
fontSize: SIZE.xs - 1, fontSize: SIZE.xs - 1,
textAlignVertical: 'center', textAlignVertical: 'center',
fontFamily: WEIGHT.regular, fontFamily: WEIGHT.regular,
marginTop: 2, marginTop: 2,
borderWidth: 1, borderWidth: 1,
textAlign: 'center', textAlign: 'center',
borderColor: colors.accent, borderColor: colors.accent,
paddingHorizontal: 5, paddingHorizontal: 5,
borderRadius: 2, borderRadius: 2,
}}> }}>
Synced Synced
</Text> </Text>
)} )}
</View> </View>
)} )}
{note.id || note.dateCreated ? ( {note.id || note.dateCreated ? (
<View <View

6
apps/mobile/src/services/AppContainer.js Normal file
View File

@@ -0,0 +1,6 @@
import { TopLevelNavigator } from "./Navigator";
import {
createAppContainer,
} from 'react-navigation';
export const AppContainer = createAppContainer(TopLevelNavigator);

120
apps/mobile/src/services/NavigationService.js
View File

@@ -1,129 +1,9 @@
import { import {
createAppContainer,
NavigationActions, NavigationActions,
StackActions, StackActions,
} from 'react-navigation'; } from 'react-navigation';
import {createStackNavigator} from 'react-navigation-stack';
import AccountSettings from '../views/AccountSettings';
import Editor from '../views/Editor';
import Favorites from '../views/Favorites';
import Folders from '../views/Folders';
import ForgotPassword from '../views/ForgotPassword';
import Home from '../views/Home/index';
import Lists from '../views/Lists';
import ListsEditor from '../views/ListsEditor';
import Login from '../views/Login';
import Notebook from '../views/Notebook';
import Notes from '../views/Notes';
import ReminderEditor from '../views/ReminderEditor';
import Reminders from '../views/Reminders';
import Settings from '../views/Settings';
import Signup from '../views/Signup';
import Tags from '../views/Tags';
import Trash from '../views/Trash';
import AppearanceSettings from '../views/AppearanceSettings';
import EditorSettings from '../views/EditorSettings';
const fade = props => {
const {position, scene} = props;
const index = scene.index;
const translateX = 0;
const translateY = 0;
const opacity = position.interpolate({
inputRange: [index - 0.7, index, index + 0.7],
outputRange: [0.7, 1, 0.7],
});
return {
opacity,
transform: [{translateX}, {translateY}],
};
};
const TopLevelNavigator = createStackNavigator(
{
Home: {
screen: Home,
},
Editor: {
screen: Editor,
navigationOptions: {
gesturesEnabled: false,
},
},
Reminders: {
screen: Reminders,
},
Lists: {
screen: Lists,
},
Folders: {
screen: Folders,
},
Favorites: {
screen: Favorites,
},
ListsEditor: {
screen: ListsEditor,
},
ReminderEditor: {
screen: ReminderEditor,
},
Login: {
screen: Login,
},
Signup: {
screen: Signup,
},
ForgotPassword: {
screen: ForgotPassword,
},
Settings: {
screen: Settings,
},
Trash: {
screen: Trash,
},
Notes: {
screen: Notes,
},
Tags: {
screen: Tags,
},
Notebook: {
screen: Notebook,
},
AccountSettings: {
screen: AccountSettings,
},
AppearanceSettings: {
screen: AppearanceSettings,
},
EditorSettings: {
screen: EditorSettings,
},
},
{
initialRouteName: 'Home',
defaultNavigationOptions: {
gesturesEnabled: false,
headerStyle: {
backgroundColor: 'transparent',
borderBottomWidth: 0,
height: 0,
},
},
cardOverlayEnabled: true,
cardShadowEnabled: true,
animationEnabled: false,
},
);
export const AppContainer = createAppContainer(TopLevelNavigator);
let _navigator; let _navigator;

120
apps/mobile/src/services/Navigator.js Normal file
View File

@@ -0,0 +1,120 @@
import AccountSettings from '../views/AccountSettings';
import Editor from '../views/Editor';
import Favorites from '../views/Favorites';
import Folders from '../views/Folders';
import ForgotPassword from '../views/ForgotPassword';
import Home from '../views/Home/index';
import Lists from '../views/Lists';
import ListsEditor from '../views/ListsEditor';
import Login from '../views/Login';
import Notebook from '../views/Notebook';
import Notes from '../views/Notes';
import ReminderEditor from '../views/ReminderEditor';
import Reminders from '../views/Reminders';
import Settings from '../views/Settings';
import Signup from '../views/Signup';
import Tags from '../views/Tags';
import Trash from '../views/Trash';
import AppearanceSettings from '../views/AppearanceSettings';
import EditorSettings from '../views/EditorSettings';
import { createStackNavigator } from 'react-navigation-stack';
const fade = props => {
const { position, scene } = props;
const index = scene.index;
const translateX = 0;
const translateY = 0;
const opacity = position.interpolate({
inputRange: [index - 0.7, index, index + 0.7],
outputRange: [0.7, 1, 0.7],
});
return {
opacity,
transform: [{ translateX }, { translateY }],
};
};
export const TopLevelNavigator = createStackNavigator(
{
Home: {
screen: Home,
},
Editor: {
screen: Editor,
navigationOptions: {
gesturesEnabled: false,
},
},
Reminders: {
screen: Reminders,
},
Lists: {
screen: Lists,
},
Folders: {
screen: Folders,
},
Favorites: {
screen: Favorites,
},
ListsEditor: {
screen: ListsEditor,
},
ReminderEditor: {
screen: ReminderEditor,
},
Login: {
screen: Login,
},
Signup: {
screen: Signup,
},
ForgotPassword: {
screen: ForgotPassword,
},
Settings: {
screen: Settings,
},
Trash: {
screen: Trash,
},
Notes: {
screen: Notes,
},
Tags: {
screen: Tags,
},
Notebook: {
screen: Notebook,
},
AccountSettings: {
screen: AccountSettings,
},
AppearanceSettings: {
screen: AppearanceSettings,
},
EditorSettings: {
screen: EditorSettings,
},
},
{
initialRouteName: 'Home',
defaultNavigationOptions: {
gesturesEnabled: false,
headerStyle: {
backgroundColor: 'transparent',
borderBottomWidth: 0,
height: 0,
},
},
cardOverlayEnabled: true,
cardShadowEnabled: true,
animationEnabled: false,
},
);

30
apps/mobile/src/views/Tags/index.js
View File

@@ -1,26 +1,22 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {Dimensions, Text, TouchableOpacity, View} from 'react-native'; import { Dimensions, Text, TouchableOpacity, View } from 'react-native';
import {useIsFocused} from 'react-navigation-hooks'; import { useIsFocused } from 'react-navigation-hooks';
import {pv, SIZE, WEIGHT} from '../../common/common'; import { pv, SIZE, WEIGHT } from '../../common/common';
import Container from '../../components/Container'; import Container from '../../components/Container';
import {TagsPlaceHolder} from '../../components/ListPlaceholders'; import { TagsPlaceHolder } from '../../components/ListPlaceholders';
import SimpleList from '../../components/SimpleList'; import SimpleList from '../../components/SimpleList';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {ACTIONS} from '../../provider/actions'; import { ACTIONS } from '../../provider/actions';
import NavigationService from '../../services/NavigationService'; import NavigationService from '../../services/NavigationService';
import {db} from '../../utils/utils';
const w = Dimensions.get('window').width; export const Tags = ({ navigation }) => {
const h = Dimensions.get('window').height;
export const Tags = ({navigation}) => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors, tags} = state; const { colors, tags } = state;
const [refreshing, setRefreshing] = useState(false); const [refreshing, setRefreshing] = useState(false);
const isFocused = useIsFocused(); const isFocused = useIsFocused();
useEffect(() => { useEffect(() => {
if (isFocused) { if (isFocused) {
dispatch({type: ACTIONS.TAGS}); dispatch({ type: ACTIONS.TAGS });
dispatch({ dispatch({
type: ACTIONS.CURRENT_SCREEN, type: ACTIONS.CURRENT_SCREEN,
screen: 'tags', screen: 'tags',
@@ -32,7 +28,7 @@ export const Tags = ({navigation}) => {
//Handle //Handle
}; };
const _renderItem = ({item, index}) => ( const _renderItem = ({ item, index }) => (
<TouchableOpacity <TouchableOpacity
key={item.title} key={item.title}
onPress={() => { onPress={() => {
@@ -73,8 +69,8 @@ export const Tags = ({navigation}) => {
{item && item.noteIds.length && item.noteIds.length > 1 {item && item.noteIds.length && item.noteIds.length > 1
? item.noteIds.length + ' notes' ? item.noteIds.length + ' notes'
: item.noteIds.length === 1 : item.noteIds.length === 1
? item.noteIds.length + ' note' ? item.noteIds.length + ' note'
: null} : null}
</Text> </Text>
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>

72
apps/mobile/src/views/Trash/index.js
View File

@@ -1,22 +1,20 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {useIsFocused} from 'react-navigation-hooks'; import { useIsFocused } from 'react-navigation-hooks';
import Container from '../../components/Container'; import Container from '../../components/Container';
import { import { TrashPlaceHolder } from '../../components/ListPlaceholders';
simpleDialogEvent, import { NotebookItem } from '../../components/NotebookItem';
TEMPLATE_EMPTY_TRASH,
} from '../../components/DialogManager';
import {TrashPlaceHolder} from '../../components/ListPlaceholders';
import {NotebookItem} from '../../components/NotebookItem';
import NoteItem from '../../components/NoteItem'; import NoteItem from '../../components/NoteItem';
import SelectionWrapper from '../../components/SelectionWrapper'; import SelectionWrapper from '../../components/SelectionWrapper';
import SimpleList from '../../components/SimpleList'; import SimpleList from '../../components/SimpleList';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {ACTIONS} from '../../provider/actions'; import { ACTIONS } from '../../provider/actions';
import {db, ToastEvent, w} from '../../utils/utils'; import { db, ToastEvent, w } from '../../utils/utils';
import { simpleDialogEvent } from '../../components/DialogManager/recievers';
import { TEMPLATE_EMPTY_TRASH } from '../../components/DialogManager/templates';
export const Trash = ({navigation}) => { export const Trash = ({ navigation }) => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors, selectionMode, trash} = state; const { colors, selectionMode, trash } = state;
const [refreshing, setRefreshing] = useState(false); const [refreshing, setRefreshing] = useState(false);
const isFocused = useIsFocused(); const isFocused = useIsFocused();
useEffect(() => { useEffect(() => {
@@ -32,7 +30,7 @@ export const Trash = ({navigation}) => {
} }
}, [isFocused]); }, [isFocused]);
const _renderItem = ({item, index}) => ( const _renderItem = ({ item, index }) => (
<SelectionWrapper colors={colors} item={item}> <SelectionWrapper colors={colors} item={item}>
{item.type === 'note' ? ( {item.type === 'note' ? (
<NoteItem <NoteItem
@@ -59,29 +57,29 @@ export const Trash = ({navigation}) => {
isTrash={true} isTrash={true}
/> />
) : ( ) : (
<NotebookItem <NotebookItem
selectionMode={selectionMode} selectionMode={selectionMode}
onLongPress={() => { onLongPress={() => {
if (!selectionMode) { if (!selectionMode) {
dispatch({
type: ACTIONS.SELECTION_MODE,
enabled: !selectionMode,
});
}
dispatch({ dispatch({
type: ACTIONS.SELECTION_MODE, type: ACTIONS.SELECTED_ITEMS,
enabled: !selectionMode, item: item,
}); });
} }}
dispatch({ customStyle={{
type: ACTIONS.SELECTED_ITEMS, width: selectionMode ? w - 74 : '100%',
item: item, marginHorizontal: 0,
}); }}
}} item={item}
customStyle={{ isTrash={true}
width: selectionMode ? w - 74 : '100%', index={index}
marginHorizontal: 0, />
}} )}
item={item}
isTrash={true}
index={index}
/>
)}
</SelectionWrapper> </SelectionWrapper>
); );
@@ -90,8 +88,8 @@ export const Trash = ({navigation}) => {
try { try {
await db.sync(); await db.sync();
dispatch({type: ACTIONS.TRASH}); dispatch({ type: ACTIONS.TRASH });
dispatch({type: ACTIONS.USER}); dispatch({ type: ACTIONS.USER });
setRefreshing(false); setRefreshing(false);
ToastEvent.show('Sync Complete', 'success'); ToastEvent.show('Sync Complete', 'success');
} catch (e) { } catch (e) {