diff --git a/apps/mobile/App.js b/apps/mobile/App.js index f2196a4d8..185ad9117 100644 --- a/apps/mobile/App.js +++ b/apps/mobile/App.js @@ -10,6 +10,7 @@ import {Menu} from './src/components/Menu'; import SideMenu from './src/components/SideMenu'; import Storage from 'notes-core/api/database'; import StorageInterface from './src/utils/storage'; +<<<<<<< HEAD import {useTracked, ACTIONS} from './src/provider'; import {DeviceDetectionService} from './src/utils/deviceDetection'; import { @@ -18,14 +19,26 @@ import { _unSubscribeEvent, } from './src/components/DialogManager'; import {getColorScheme} from './src/common/common'; +======= +import {DeviceDetectionService} from './src/utils/deviceDetection'; +import {DialogManager} from './src/components/DialogManager'; +import {useAppContext} from './src/provider/useAppContext'; +import {AppProvider} from './src/provider'; +import {COLOR_SCHEME_LIGHT} from './src/common/common'; +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 export const DDS = new DeviceDetectionService(); export const db = new Storage(StorageInterface); let sideMenuRef; const App = () => { +<<<<<<< HEAD const [state, dispatch] = useTracked(); const {colors} = state; +======= + const [colors, setColors] = useState(COLOR_SCHEME_LIGHT); + // Global State +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 // Local State const [sidebar, setSidebar] = useState(w * 0.3); @@ -89,7 +102,7 @@ const App = () => { setInit(true); }); }); - }, []); + }); async function updateAppTheme(colors = state.colors) { let newColors = await getColorScheme(colors); @@ -97,12 +110,16 @@ const App = () => { } // Render - if (!init) { return <>; } + return ( +<<<<<<< HEAD <> +======= + +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 { )} +<<<<<<< HEAD +======= + + + +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 ); }; diff --git a/apps/mobile/index.js b/apps/mobile/index.js index b6114df9d..56df3b5c4 100644 --- a/apps/mobile/index.js +++ b/apps/mobile/index.js @@ -5,15 +5,5 @@ import {AppRegistry} from 'react-native'; import App, {db} from './App'; import {name as appName} from './app.json'; -import React, {useEffect} from 'react'; -import {Provider} from './src/provider'; -const AppProvider = () => { - return ( - - - - ); -}; - -AppRegistry.registerComponent(appName, () => AppProvider); +AppRegistry.registerComponent(appName, () => App); diff --git a/apps/mobile/src/components/ActionSheetComponent/index.js b/apps/mobile/src/components/ActionSheetComponent/index.js index fdbc1442c..da9526337 100644 --- a/apps/mobile/src/components/ActionSheetComponent/index.js +++ b/apps/mobile/src/components/ActionSheetComponent/index.js @@ -20,7 +20,8 @@ import Icon from 'react-native-vector-icons/Feather'; import NavigationService from '../../services/NavigationService'; import {db} from '../../../App'; import FastStorage from 'react-native-fast-storage'; -import {useTracked} from '../../provider'; + +import {_recieveEvent, _unSubscribeEvent} from '../DialogManager'; const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; @@ -34,11 +35,11 @@ export const ActionSheetComponent = ({ rowItems = [], columnItems = [], }) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors, updateDB, changeColorScheme} = useAppContext(); // Todo +<<<<<<< HEAD function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) { let newColors = setColorScheme(colors, accent); StatusBar.setBarStyle(newColors.night ? 'light-content' : 'dark-content'); @@ -46,6 +47,8 @@ export const ActionSheetComponent = ({ dispatch({type: ACTIONS.THEME, colors: newColors}); } +======= +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 const [focused, setFocused] = useState(false); const [note, setNote] = useState( item @@ -160,7 +163,7 @@ export const ActionSheetComponent = ({ } } - dispatch({type: type}); + updateDB(); setNote({...toAdd}); }; diff --git a/apps/mobile/src/components/AddNotebookDialog/index.js b/apps/mobile/src/components/AddNotebookDialog/index.js index efe71241a..de1c25d1f 100644 --- a/apps/mobile/src/components/AddNotebookDialog/index.js +++ b/apps/mobile/src/components/AddNotebookDialog/index.js @@ -13,13 +13,12 @@ import {getElevation, ToastEvent} from '../../utils/utils'; import {FlatList, TextInput} from 'react-native-gesture-handler'; import {db, DDS} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + let refs = []; export const AddNotebookDialog = ({visible, close, toEdit = null}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); const [topics, setTopics] = useState(['']); const [title, setTitle] = useState(null); diff --git a/apps/mobile/src/components/AddTopicDialog/index.js b/apps/mobile/src/components/AddTopicDialog/index.js index 2767d5ec1..bfb64f3b1 100644 --- a/apps/mobile/src/components/AddTopicDialog/index.js +++ b/apps/mobile/src/components/AddTopicDialog/index.js @@ -28,7 +28,7 @@ import {FlatList, TextInput} from 'react-native-gesture-handler'; import {useForceUpdate} from '../../views/ListsEditor'; import {db} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const AddTopicDialog = ({ visible, @@ -36,8 +36,7 @@ export const AddTopicDialog = ({ notebookID, toEdit = null, }) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); const [titleFocused, setTitleFocused] = useState(false); let title = null; diff --git a/apps/mobile/src/components/Container/index.js b/apps/mobile/src/components/Container/index.js index 069d9b9e6..cd1e6535e 100644 --- a/apps/mobile/src/components/Container/index.js +++ b/apps/mobile/src/components/Container/index.js @@ -19,7 +19,7 @@ import NavigationService from '../../services/NavigationService'; import * as Animatable from 'react-native-animatable'; import {useAppContext} from '../../provider/useAppContext'; import {DDS} from '../../../App'; -import {useTracked} from '../../provider'; + export const AnimatedSafeAreaView = Animatable.createAnimatableComponent( SafeAreaView, ); @@ -31,8 +31,7 @@ export const Container = ({ noBottomButton = false, }) => { // State - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); const [buttonHide, setButtonHide] = useState(false); diff --git a/apps/mobile/src/components/Dialog/index.js b/apps/mobile/src/components/Dialog/index.js index b0904513d..bf03e1ee0 100644 --- a/apps/mobile/src/components/Dialog/index.js +++ b/apps/mobile/src/components/Dialog/index.js @@ -13,6 +13,10 @@ import { } from '../../common/common'; import Icon from 'react-native-vector-icons/Feather'; import {getElevation, ToastEvent} from '../../utils/utils'; +<<<<<<< HEAD +======= + +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 import {dialogActions, updateEvent} from '../DialogManager'; import {db} from '../../../App'; diff --git a/apps/mobile/src/components/DialogManager/index.js b/apps/mobile/src/components/DialogManager/index.js index d7356be2b..d67893199 100644 --- a/apps/mobile/src/components/DialogManager/index.js +++ b/apps/mobile/src/components/DialogManager/index.js @@ -69,6 +69,10 @@ export class DialogManager extends Component { super(props); this.actionSheet; this.opened = false; +<<<<<<< HEAD +======= + +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 this.state = { item: {}, actionSheetData: { diff --git a/apps/mobile/src/components/EditorMenu/index.js b/apps/mobile/src/components/EditorMenu/index.js index ed6d8d27f..b79dd5148 100644 --- a/apps/mobile/src/components/EditorMenu/index.js +++ b/apps/mobile/src/components/EditorMenu/index.js @@ -26,7 +26,7 @@ import {AnimatedSafeAreaView} from '../../views/Home'; import {TextInput} from 'react-native-gesture-handler'; import {useAppContext} from '../../provider/useAppContext'; import {VaultDialog} from '../VaultDialog'; -import {useTracked} from '../../provider'; + let tagsInputRef; let tagsList; @@ -39,11 +39,9 @@ export const EditorMenu = ({ note, timestamp, }) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors, changeColorScheme} = useAppContext(); // Todo - const changeColorScheme = () => {}; /////// const [unlock, setUnlock] = useState(false); diff --git a/apps/mobile/src/components/ListItem/index.js b/apps/mobile/src/components/ListItem/index.js index 5cc859048..cb5057740 100644 --- a/apps/mobile/src/components/ListItem/index.js +++ b/apps/mobile/src/components/ListItem/index.js @@ -14,12 +14,11 @@ import Icon from 'react-native-vector-icons/Ionicons'; import {getElevation} from '../../utils/utils'; import {FlatList} from 'react-native-gesture-handler'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; export const ListItem = props => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); return ( >>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 export const Menu = ({close = () => {}, hide, update = () => {}}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); // todo diff --git a/apps/mobile/src/components/NoteItem/index.js b/apps/mobile/src/components/NoteItem/index.js index 960fdeb1b..cbb427458 100644 --- a/apps/mobile/src/components/NoteItem/index.js +++ b/apps/mobile/src/components/NoteItem/index.js @@ -67,7 +67,11 @@ export default class NoteItem extends React.Component { update, index, } = this.props; +<<<<<<< HEAD console.log('rendering', index); +======= + console.log('rerendering', index); +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 return ( { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors, updateDB} = useAppContext(); /// - const updateDB = () => {}; const [isVisible, setVisible] = useState(false); const [addTopic, setAddTopic] = useState(false); diff --git a/apps/mobile/src/components/SearchInput/index.js b/apps/mobile/src/components/SearchInput/index.js index 5a31bb32d..fe03bfc5f 100644 --- a/apps/mobile/src/components/SearchInput/index.js +++ b/apps/mobile/src/components/SearchInput/index.js @@ -15,10 +15,9 @@ import {getElevation, w} from '../../utils/utils'; import * as Animatable from 'react-native-animatable'; import {DDS} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const Search = props => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); const [focus, setFocus] = useState(false); diff --git a/apps/mobile/src/components/SelectionHeader/index.js b/apps/mobile/src/components/SelectionHeader/index.js index 0f7ad6e0e..3bee9a753 100644 --- a/apps/mobile/src/components/SelectionHeader/index.js +++ b/apps/mobile/src/components/SelectionHeader/index.js @@ -5,7 +5,7 @@ import {w} from '../../utils/utils'; import Icon from 'react-native-vector-icons/Feather'; import * as Animatable from 'react-native-animatable'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const AnimatedSafeAreaView = Animatable.createAnimatableComponent( SafeAreaView, @@ -13,13 +13,14 @@ export const AnimatedSafeAreaView = Animatable.createAnimatableComponent( export const SelectionHeader = ({navigation}) => { // State - const [state, dispatch] = useTracked(); - const {colors, selectionMode, selectedItemsList} = state; - - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; + const { + colors, + selectionMode, + selectedItemsList, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); // Render diff --git a/apps/mobile/src/components/SelectionWrapper/index.js b/apps/mobile/src/components/SelectionWrapper/index.js index bbe61bb53..d6b68b1ca 100644 --- a/apps/mobile/src/components/SelectionWrapper/index.js +++ b/apps/mobile/src/components/SelectionWrapper/index.js @@ -3,16 +3,18 @@ import {View, TouchableOpacity} from 'react-native'; import {SIZE} from '../../common/common'; import Icon from 'react-native-vector-icons/Feather'; import {w} from '../../utils/utils'; -import {useTracked} from '../../provider'; +import {useAppContext} from '../../provider/useAppContext'; const SelectionWrapper = ({children, item}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, selectedItemsList} = state; + const { + colors, + selectionMode, + selectedItemsList, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; return ( { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); const [toast, setToast] = useState(false); const [message, setMessage] = useState([]); diff --git a/apps/mobile/src/components/header/index.js b/apps/mobile/src/components/header/index.js index 75ec2b986..b255a16fa 100644 --- a/apps/mobile/src/components/header/index.js +++ b/apps/mobile/src/components/header/index.js @@ -7,7 +7,7 @@ import * as Animatable from 'react-native-animatable'; import NavigationService from '../../services/NavigationService'; import {DDS} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + let isOpen = false; export const Header = ({ heading, @@ -18,8 +18,7 @@ export const Header = ({ verticalMenu = false, sendHeight = e => {}, }) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); return ( { } default: throw new Error('unknown action type'); +======= +const AppContext = createContext([defaultState, function() {}]); + +const AppProvider = ({children}) => { + const [state, dispatch] = useImmer({...defaultState}); + const [loading, setLoading] = useState(true); + + async function init() { + let newColors = await getColorScheme(); + dispatch(draft => { + draft.colors = {...newColors}; + draft.notes = db.groupNotes(); + draft.notebooks = db.getNotebooks(); + draft.trash = db.getTrash(); + draft.favorites = db.getFavorites(); + draft.pinned = db.getPinned(); + }); + setLoading(false); +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 } + + useEffect(() => { + init(); + }, []); + + return ( + + {loading ? ( + + Loading... + + ) : ( + children + )} + + ); }; -const useValue = () => useReducer(reducer, defaultState); - -export const {Provider, useTracked} = createContainer(useValue); +export {AppProvider, AppContext}; diff --git a/apps/mobile/src/views/AccountSettings/index.js b/apps/mobile/src/views/AccountSettings/index.js index 10df3ec27..195f3d217 100644 --- a/apps/mobile/src/views/AccountSettings/index.js +++ b/apps/mobile/src/views/AccountSettings/index.js @@ -4,11 +4,10 @@ import {SIZE, pv, opacity, WEIGHT} from '../../common/common'; import {Header} from '../../components/header'; import {AnimatedSafeAreaView} from '../Home'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const AccountSettings = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); return ( >>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; @@ -43,11 +47,7 @@ var title = null; let timer = null; const Editor = ({navigation}) => { // Global State - const [state, dispatch] = useTracked(); - const {colors} = state; - - /// - const updateDB = () => {}; + const {colors, updateDB} = useAppContext(); // Local State diff --git a/apps/mobile/src/views/Favorites/index.js b/apps/mobile/src/views/Favorites/index.js index 1628f3146..3ca20195f 100644 --- a/apps/mobile/src/views/Favorites/index.js +++ b/apps/mobile/src/views/Favorites/index.js @@ -10,15 +10,17 @@ import {NotebookItem} from '../../components/NotebookItem'; import {FavoritesPlaceHolder} from '../../components/ListPlaceholders'; import Container from '../../components/Container'; import {useIsFocused} from 'react-navigation-hooks'; -import {useTracked} from '../../provider'; + export const Favorites = ({navigation}) => { // Global State - const [state, dispatch] = useTracked(); - const {colors, selectionMode, pinned, selectedItemsList, favorites} = state; - - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; + const { + colors, + selectionMode, + favorites, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); // Local State const [text, setText] = useState(''); diff --git a/apps/mobile/src/views/Folders/index.js b/apps/mobile/src/views/Folders/index.js index 0ff5b4a61..9ed8d9a28 100644 --- a/apps/mobile/src/views/Folders/index.js +++ b/apps/mobile/src/views/Folders/index.js @@ -14,16 +14,18 @@ import SelectionHeader from '../../components/SelectionHeader'; import SelectionWrapper from '../../components/SelectionWrapper'; import {w} from '../../utils/utils'; import {useIsFocused} from 'react-navigation-hooks'; -import {useTracked} from '../../provider'; + export const Folders = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, pinned, notebooks} = state; - - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; + const { + colors, + selectionMode, + pinned, + notebooks, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); const [addNotebook, setAddNotebook] = useState(false); const [hideHeader, setHideHeader] = useState(false); diff --git a/apps/mobile/src/views/ForgotPassword/index.js b/apps/mobile/src/views/ForgotPassword/index.js index 5dd8dbd89..839470d01 100644 --- a/apps/mobile/src/views/ForgotPassword/index.js +++ b/apps/mobile/src/views/ForgotPassword/index.js @@ -33,16 +33,17 @@ import {NavigationEvents} from 'react-navigation'; import {Header} from '../../components/header'; import {useForceUpdate} from '../ListsEditor'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const ForgotPassword = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, pinned, selectedItemsList} = state; + const { + colors, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; useEffect(() => { DeviceEventEmitter.emit('hide'); diff --git a/apps/mobile/src/views/Home/index.js b/apps/mobile/src/views/Home/index.js index acda8e6e0..1edf86c87 100755 --- a/apps/mobile/src/views/Home/index.js +++ b/apps/mobile/src/views/Home/index.js @@ -1,5 +1,5 @@ import React, {useEffect, useState} from 'react'; -import {SafeAreaView} from 'react-native'; +import {SafeAreaView, Text} from 'react-native'; import {Search} from '../../components/SearchInput'; import {w, h, SideMenuEvent, ToastEvent} from '../../utils/utils'; import {Header} from '../../components/header'; @@ -11,26 +11,28 @@ import {useAppContext} from '../../provider/useAppContext'; import {DDS} from '../../../App'; import Container from '../../components/Container'; import SelectionHeader from '../../components/SelectionHeader'; -import {useIsFocused} from 'react-navigation-hooks'; -import {useTracked, ACTIONS} from '../../provider'; -import {_recieveEvent, _unSubscribeEvent} from '../../components/DialogManager'; +import {useIsFocused, useFocusEffect} from 'react-navigation-hooks'; +import { + _recieveEvent, + _unSubscribeEvent, + updateEvent, +} from '../../components/DialogManager'; export const AnimatedSafeAreaView = Animatable.createAnimatableComponent( SafeAreaView, ); -let intervals; -let counter = 0; export const Home = ({navigation}) => { // State - - const [state, dispatch] = useTracked(); - const {colors, selectionMode, notes} = state; - - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; + const { + colors, + selectionMode, + pinned, + notes, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); const [text, setText] = useState(''); const [hideHeader, setHideHeader] = useState(false); @@ -47,7 +49,18 @@ export const Home = ({navigation}) => { // Effects useEffect(() => { +<<<<<<< HEAD dispatch({type: ACTIONS.NOTES, payload: 'hello there'}); +======= + _recieveEvent('updateEvent', () => { + updateDB(); + }); + return () => { + _unSubscribeEvent('updateEvent', () => { + updateDB(); + }); + }; +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 }, []); // Functions @@ -103,7 +116,7 @@ export const Home = ({navigation}) => { }; // Render - + console.log('rerender'); return ( { hide={hideHeader} verticalMenu showSearch={() => { + let counter = updateCounter; setHideHeader(false); countUp = 0; countDown = 0; diff --git a/apps/mobile/src/views/Lists/index.js b/apps/mobile/src/views/Lists/index.js index 95e7f1bf0..19f5212be 100644 --- a/apps/mobile/src/views/Lists/index.js +++ b/apps/mobile/src/views/Lists/index.js @@ -24,14 +24,13 @@ import Icon from 'react-native-vector-icons/Ionicons'; import {Reminder} from '../../components/Reminder'; import {ListItem} from '../../components/ListItem'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; export const Lists = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); return ( diff --git a/apps/mobile/src/views/Login/index.js b/apps/mobile/src/views/Login/index.js index 350a0b79e..76de1f531 100644 --- a/apps/mobile/src/views/Login/index.js +++ b/apps/mobile/src/views/Login/index.js @@ -14,10 +14,9 @@ import {NavigationEvents} from 'react-navigation'; import {Header} from '../../components/header'; import {DDS} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const Login = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); useEffect(() => { DeviceEventEmitter.emit('hide'); diff --git a/apps/mobile/src/views/Notebook/index.js b/apps/mobile/src/views/Notebook/index.js index 718fae194..bc5a750f0 100644 --- a/apps/mobile/src/views/Notebook/index.js +++ b/apps/mobile/src/views/Notebook/index.js @@ -9,16 +9,17 @@ import * as Animatable from 'react-native-animatable'; import {useAppContext} from '../../provider/useAppContext'; import {useIsFocused} from 'react-navigation-hooks'; import Container from '../../components/Container'; -import {useTracked} from '../../provider'; + export const Notebook = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, pinned, selectedItemsList} = state; + const { + colors, + selectionMode, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; const params = navigation.state.params; const [hideHeader, setHideHeader] = useState(false); const [buttonHide, setButtonHide] = useState(false); diff --git a/apps/mobile/src/views/Notes/index.js b/apps/mobile/src/views/Notes/index.js index c6221b0d2..1c3d93299 100644 --- a/apps/mobile/src/views/Notes/index.js +++ b/apps/mobile/src/views/Notes/index.js @@ -7,16 +7,17 @@ import * as Animatable from 'react-native-animatable'; import {useAppContext} from '../../provider/useAppContext'; import Container from '../../components/Container'; import {useIsFocused} from 'react-navigation-hooks'; -import {useTracked} from '../../provider'; + export const Notes = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, pinned, selectedItemsList} = state; + const { + colors, + selectionMode, + updateDB, + updateSelectionList, + changeSelectionMode, + } = useAppContext(); - /// - const updateDB = () => {}; - const updateSelectionList = () => {}; - const changeSelectionMode = () => {}; const [hideHeader, setHideHeader] = useState(false); const [margin, setMargin] = useState(200); const [buttonHide, setButtonHide] = useState(false); diff --git a/apps/mobile/src/views/Settings/index.js b/apps/mobile/src/views/Settings/index.js index a455caa29..5ac2a39c0 100644 --- a/apps/mobile/src/views/Settings/index.js +++ b/apps/mobile/src/views/Settings/index.js @@ -24,15 +24,19 @@ import {useAppContext} from '../../provider/useAppContext'; import {useIsFocused} from 'react-navigation-hooks'; import Container from '../../components/Container'; import FastStorage from 'react-native-fast-storage'; -import {useTracked} from '../../provider'; + export const Settings = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors, changeAccentColor, changeColorScheme} = useAppContext(); +<<<<<<< HEAD /// function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) { let newColors = setColorScheme(colors, accent); StatusBar.setBarStyle(newColors.night ? 'light-content' : 'dark-content'); +======= + //const [colors, setColors] = useState(COLOR_SCHEME_LIGHT); + let isFocused = useIsFocused(); +>>>>>>> cfee96fb230bdd33c710a5e72a80ccf2b82a8646 dispatch({type: ACTIONS.THEME, colors: newColors}); } diff --git a/apps/mobile/src/views/Signup/index.js b/apps/mobile/src/views/Signup/index.js index bc9830bf3..1a82497bb 100644 --- a/apps/mobile/src/views/Signup/index.js +++ b/apps/mobile/src/views/Signup/index.js @@ -12,11 +12,10 @@ import {NavigationEvents} from 'react-navigation'; import {Header} from '../../components/header'; import {DDS} from '../../../App'; import {useAppContext} from '../../provider/useAppContext'; -import {useTracked} from '../../provider'; + export const Signup = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors} = useAppContext(); useEffect(() => { DeviceEventEmitter.emit('hide'); return () => { diff --git a/apps/mobile/src/views/Tags/index.js b/apps/mobile/src/views/Tags/index.js index 2d14fd705..f9bc686c9 100644 --- a/apps/mobile/src/views/Tags/index.js +++ b/apps/mobile/src/views/Tags/index.js @@ -5,13 +5,13 @@ import {SIZE, pv, WEIGHT} from '../../common/common'; import {Header} from '../../components/header'; import {useAppContext} from '../../provider/useAppContext'; import {TagsPlaceHolder} from '../../components/ListPlaceholders'; -import {useTracked} from '../../provider'; + const w = Dimensions.get('window').width; const h = Dimensions.get('window').height; export const Tags = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors} = state; + const {colors, tags} = useAppContext(); + let isFocused = useIsFocused(); if (!isFocused) { diff --git a/apps/mobile/src/views/Trash/index.js b/apps/mobile/src/views/Trash/index.js index d7d03c9dc..68d0b7595 100644 --- a/apps/mobile/src/views/Trash/index.js +++ b/apps/mobile/src/views/Trash/index.js @@ -13,15 +13,17 @@ import {TrashPlaceHolder} from '../../components/ListPlaceholders'; import Container from '../../components/Container'; import SelectionHeader from '../../components/SelectionHeader'; import {useIsFocused} from 'react-navigation-hooks'; -import {useTracked} from '../../provider'; + export const Trash = ({navigation}) => { - const [state, dispatch] = useTracked(); - const {colors, selectionMode, trash} = state; - - const updateDB = () => {}; - const changeSelectionMode = () => {}; - const updateSelectionList = () => {}; + const { + colors, + selectionMode, + updateDB, + updateSelectionList, + changeSelectionMode, + trash, + } = useAppContext(); const [dialog, setDialog] = useState(false); let isFocused = useIsFocused();