minor fixes

This commit is contained in:
ammarahm-ed
2020-12-08 12:49:02 +05:00
parent 8a3be52086
commit 177b6df958
4 changed files with 48 additions and 29 deletions

View File

@@ -1,36 +1,36 @@
import React, {useCallback, useEffect, useState} from 'react'; import React, { useCallback, useEffect, useState } from 'react';
import { import {
ActivityIndicator, ActivityIndicator,
Platform, Platform,
RefreshControl, RefreshControl,
useWindowDimensions, useWindowDimensions,
View, View
} from 'react-native'; } from 'react-native';
import {TouchableWithoutFeedback} from 'react-native-gesture-handler'; import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
import {useSafeAreaInsets} from 'react-native-safe-area-context'; import { useSafeAreaInsets } from 'react-native-safe-area-context';
import {DataProvider, LayoutProvider, RecyclerListView} from 'recyclerlistview'; import { DataProvider, LayoutProvider, RecyclerListView } from 'recyclerlistview';
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 {eSendEvent, ToastEvent} from '../../services/EventManager'; import { eSendEvent, ToastEvent } from '../../services/EventManager';
import {dHeight} from '../../utils'; import { dHeight } from '../../utils';
import {db} from '../../utils/DB'; import { COLORS_NOTE } from '../../utils/Colors';
import { db } from '../../utils/DB';
import { import {
eOpenJumpToDialog, eOpenJumpToDialog,
eOpenLoginDialog, eOpenLoginDialog,
eScrollEvent, eScrollEvent
} from '../../utils/Events'; } from '../../utils/Events';
import {SIZE} from '../../utils/SizeUtils'; import { SIZE } from '../../utils/SizeUtils';
import {sleep} from '../../utils/TimeUtils'; import { Button } from '../Button';
import {Button} from '../Button'; import { HeaderMenu } from '../Header/HeaderMenu';
import {HeaderMenu} from '../Header/HeaderMenu';
import Seperator from '../Seperator'; import Seperator from '../Seperator';
import TagItem from '../TagItem'; import TagItem from '../TagItem';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
import {ListHeaderComponent} from './ListHeaderComponent'; import { ListHeaderComponent } from './ListHeaderComponent';
import {NotebookItemWrapper} from './NotebookItemWrapper'; import { NotebookItemWrapper } from './NotebookItemWrapper';
import {NoteItemWrapper} from './NoteItemWrapper'; import { NoteItemWrapper } from './NoteItemWrapper';
const header = { const header = {
type: 'MAIN_HEADER', type: 'MAIN_HEADER',
@@ -47,12 +47,12 @@ const SimpleList = ({
jumpToDialog, jumpToDialog,
placeholderData, placeholderData,
loading, loading,
headerProps={ headerProps = {
heading:"Home" heading: 'Home',
} },
}) => { }) => {
const [state, dispatch] = useTracked(); const [state, dispatch] = useTracked();
const {colors, searchResults,headerTextState} = state; const {colors, searchResults, headerTextState} = state;
const [refreshing, setRefreshing] = useState(false); const [refreshing, setRefreshing] = useState(false);
const [dataProvider, setDataProvider] = useState( const [dataProvider, setDataProvider] = useState(
new DataProvider((r1, r2) => { new DataProvider((r1, r2) => {
@@ -186,7 +186,11 @@ const SimpleList = ({
type="accent" type="accent"
fontSize={SIZE.md} fontSize={SIZE.md}
accentColor="bg" accentColor="bg"
accentText={headerTextState.heading.toLowerCase() || "accent"} accentText={
COLORS_NOTE[headerTextState.heading.toLowerCase()]
? headerTextState.heading.toLowerCase()
: 'accent'
}
/> />
) : loading ? ( ) : loading ? (
<ActivityIndicator color={colors.accent} /> <ActivityIndicator color={colors.accent} />
@@ -270,7 +274,12 @@ const SimpleList = ({
); );
case 'MAIN_HEADER': case 'MAIN_HEADER':
return ( return (
<ListHeaderComponent title={headerProps.heading} type={dataType} index={index} data={listData} /> <ListHeaderComponent
title={headerProps.heading}
type={dataType}
index={index}
data={listData}
/>
); );
case 'header': case 'header':
return <RenderSectionHeader item={data} index={index} />; return <RenderSectionHeader item={data} index={index} />;

View File

@@ -68,12 +68,15 @@ const forSlide = ({current, next, inverted, layouts: {screen}}) => {
const screenOptionsForAnimation = { const screenOptionsForAnimation = {
animationEnabled: true, animationEnabled: true,
cardStyleInterpolator: forSlide, cardStyleInterpolator: forSlide,
gestureEnabled:true
}; };
export const NavigatorStack = React.memo( export const NavigatorStack = React.memo(
() => { () => {
React.useEffect(() => { React.useEffect(() => {
sleep(1000).then(() => { sleep(2000).then(() => {
console.log(SettingsService.get().homepage); console.log(SettingsService.get().homepage);
let headerState = { let headerState = {
heading: SettingsService.get().homepage, heading: SettingsService.get().homepage,
@@ -84,14 +87,18 @@ export const NavigatorStack = React.memo(
}); });
}, []); }, []);
return ( return (
<Container root={true}> <Container root={true}>
<NavigationContainer independent={true} ref={rootNavigatorRef}> <NavigationContainer
independent={true} ref={rootNavigatorRef}>
<Stack.Navigator <Stack.Navigator
initialRouteName={SettingsService.get().homepage} initialRouteName={SettingsService.get().homepage}
screenOptions={{ screenOptions={{
headerShown: false, headerShown: false,
animationEnabled: false, animationEnabled: false,
gestureEnabled:false
}}> }}>
<Stack.Screen name="Notes" component={Home} /> <Stack.Screen name="Notes" component={Home} />
<Stack.Screen name="Notebooks" component={Folders} /> <Stack.Screen name="Notebooks" component={Folders} />

View File

@@ -85,6 +85,7 @@ export const Home = ({route, navigation}) => {
return ( return (
<> <>
<SimpleList <SimpleList
data={notes} data={notes}
scrollRef={scrollRef} scrollRef={scrollRef}

View File

@@ -62,11 +62,13 @@ export const Notes = ({route, navigation}) => {
} }
if (route.params.menu) { if (route.params.menu) {
navigation.setOptions({ navigation.setOptions({
animationEnabled:false animationEnabled:false,
gestureEnabled:false
}) })
} else { } else {
navigation.setOptions({ navigation.setOptions({
animationEnabled:true animationEnabled:true,
gestureEnabled:true
}) })
} }
let allNotes = []; let allNotes = [];