Skip to content

Commit

Permalink
Merge pull request #29 from RaghavJit/main
Browse files Browse the repository at this point in the history 
added new components
  • Loading branch information
@RaghavJit
RaghavJit authored Feb 12, 2023
2 parents dc81ec1 + cc6c30a commit e14635a
Show file tree
Hide file tree
Showing 7 changed files with 341 additions and 119 deletions.
12 changes: 12 additions & 0 deletions code/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import AddTask from "./MyComp/AddTask";
import ViewTask from "./MyComp/ViewTask";
import Settings from "./MyComp/Settings";
import SetWallpaper from "./MyComp/SetWallpaper"
import MyProfile from "./MyComp/MyProfile";
import QuickTasker from "./MyComp/QuickTasker";
const colors = ['#e4def2', '#e2ddd8','#eef8ef','#2d414e','#E0DFE3']

function App() {
Expand Down Expand Up @@ -35,6 +37,16 @@ function App() {
name="SetWallpaper"
component={SetWallpaper}
/>
<Stack.Screen
options={{title:"All Tasks", statusBarColor:colors[3]}}
name="MyProfile"
component={MyProfile}
/>
<Stack.Screen
options={{title:"All Tasks", statusBarColor:colors[3]}}
name="QuickTasker"
component={QuickTasker}
/>
</Stack.Navigator>
</NavigationContainer>
);
Expand Down
233 changes: 121 additions & 112 deletions code/MyComp/AddTask.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import DatePicker from 'react-native-date-picker'
import FontAwesome5 from 'react-native-vector-icons/FontAwesome';

// following line includes database functions
import { addNewTask, resetAIjson, resetHIjson, removeTaskByID, editTaskByID, TaskArray } from '../brain/testing';
import { addNewTask, resetAIjson, resetHIjson, removeTaskByID, editTaskByID, TaskArray, organiseTask } from '../brain/testing';

import DurationBtn from './DurationBtn';

Expand Down Expand Up @@ -63,12 +63,12 @@ const styles = StyleSheet.create({
borderRadius: input.borderRadius,
fontSize: input.fontSize,
},
inputBtns:{
backgroundColor:colors[3],
width: Width*0.97,
height:Height*0.07,
borderRadius: Scale*6,
margin:Scale*2
inputBtns: {
backgroundColor: colors[3],
width: Width * 0.97,
height: Height * 0.07,
borderRadius: Scale * 6,
margin: Scale * 2
},

ModalOuter: {
Expand Down Expand Up @@ -121,148 +121,157 @@ function AddTask() {
const [desc, setDesc] = useState('Desc')
const [priorVisible, setPriorVisible] = useState(false);
const [priority, setPrior] = useState("");




const RNFS = require('react-native-fs')
// const filePath = `${RNFS.DocumentDirectoryPath}/Avalible_ID.json`;

function testing() {
const date1 = new Date('2023-02-11');
const date2 = new Date('2023-02-01');

const diffInMs = date1.getTime() - date2.getTime();
console.log(diffInMs)
}

return (

<View>
<TextInput
style={styles.title}
onChangeText={(e)=>{setTitle(e)}}
onChangeText={(e) => { setTitle(e) }}

>{title}</TextInput>

<TextInput
style={styles.desc}
onChangeText={(e)=>{setDesc(e)}}
onChangeText={(e) => { setDesc(e) }}

>{desc}</TextInput>


<View style={{flex:1,flexWrap:'wrap' ,flexDirection:'row'}}>
<View style={{ flex: 1, flexWrap: 'wrap', flexDirection: 'row' }}>

{/* datebtn */}
<TouchableOpacity
style={styles.inputBtns}
onPress={() => setDateVisible(true)}
>
<View
style={{flexDirection:'row', padding:scale*3}}
>
<View style={{paddingHorizontal: Width*0.03}}>

<FontAwesome5 name={'calendar'} size={iconSize} color={colors[5]}/>
</View>
<Text
style={{
color: colors[5],
fontWeight:'bold',
fontSize: Scale*7,
paddingHorizontal: Width*0.04
}}
>Choose Date and Time</Text>
</View>
</TouchableOpacity>
<DatePicker
modal
open={dateVisible}
date={date}
onConfirm={(date) => {
setDateVisible(false)
setDate(date)
console.log(date)
}}
onCancel={() => {
setDateVisible(false)
}}
/>
{/* priorityBtn */}
{/* datebtn */}
<TouchableOpacity
style={styles.inputBtns}
onPress={()=>{setPriorVisible(true)}}
>
<View
style={{flexDirection:'row', padding:scale*3}}
style={styles.inputBtns}
onPress={() => setDateVisible(true)}
>
<View style={{paddingHorizontal: Width*0.03}}>
<FontAwesome5 name={'star'} size={iconSize} color={colors[5]}/>
</View>
<Text
style={{
color: colors[5],
fontWeight:'bold',
fontSize: Scale*7,
paddingHorizontal: Width*0.12
<View
style={{ flexDirection: 'row', padding: scale * 3 }}
>
<View style={{ paddingHorizontal: Width * 0.03 }}>

<FontAwesome5 name={'calendar'} size={iconSize} color={colors[5]} />
</View>
<Text
style={{
color: colors[5],
fontWeight: 'bold',
fontSize: Scale * 7,
paddingHorizontal: Width * 0.04
}}
>Choose Date and Time</Text>
</View>
</TouchableOpacity>
<DatePicker
modal
open={dateVisible}
date={date}
onConfirm={(date) => {
setDateVisible(false)
setDate(date)
console.log(date)
}}
onCancel={() => {
setDateVisible(false)
}}
>Choose Priority</Text>
</View>
{/* priority modal */}
<Modal
animationType='fade'
transparent={true}
visible={priorVisible}
/>
{/* priorityBtn */}
<TouchableOpacity
style={styles.inputBtns}
onPress={() => { setPriorVisible(true) }}
>
<View
style={styles.ModalOuter}
style={{ flexDirection: 'row', padding: scale * 3 }}
>
<View style={{ paddingHorizontal: Width * 0.03 }}>
<FontAwesome5 name={'star'} size={iconSize} color={colors[5]} />
</View>
<Text
style={{
color: colors[5],
fontWeight: 'bold',
fontSize: Scale * 7,
paddingHorizontal: Width * 0.12
}}
>Choose Priority</Text>
</View>
{/* priority modal */}
<Modal
animationType='fade'
transparent={true}
visible={priorVisible}
>
<View
style={styles.ModalIner}
style={styles.ModalOuter}
>
<TouchableOpacity
style={styles.modalOption1}
title="Option 1"
onPress={() => {
setPrior("High");
setPriorVisible(false);
}}
><Text style={styles.optionText}>High</Text></TouchableOpacity>
<TouchableOpacity
style={styles.modalOption2}
title="Option 2"
onPress={() => {
setPrior("Moderate");
setPriorVisible(false);
}}
><Text style={styles.optionText}>Moderate</Text></TouchableOpacity>
<TouchableOpacity
style={styles.modalOption3}
onPress={() => {
setPrior("Low");
setPriorVisible(false);
}}
><Text style={styles.optionText}>Low</Text></TouchableOpacity>
<View
style={styles.ModalIner}
>
<TouchableOpacity
style={styles.modalOption1}
title="Option 1"
onPress={() => {
setPrior("High");
setPriorVisible(false);
}}
><Text style={styles.optionText}>High</Text></TouchableOpacity>
<TouchableOpacity
style={styles.modalOption2}
title="Option 2"
onPress={() => {
setPrior("Moderate");
setPriorVisible(false);
}}
><Text style={styles.optionText}>Moderate</Text></TouchableOpacity>
<TouchableOpacity
style={styles.modalOption3}
onPress={() => {
setPrior("Low");
setPriorVisible(false);
}}
><Text style={styles.optionText}>Low</Text></TouchableOpacity>
</View>
</View>
</View>
</Modal>
</Modal>
</TouchableOpacity>


{/* save task btn */}
{/* save task btn */}
<TouchableOpacity

style={styles.inputBtns}
onPress={()=>{addNewTask(title, desc, date, priority, 0)}}
onPress={() => { addNewTask(title, desc, '00', priority, '0') }}
><View
style={{flexDirection:'row' ,padding:scale*3}}
style={{ flexDirection: 'row', padding: scale * 3 }}
>
<View style={{paddingHorizontal: Width*0.03}}>
<FontAwesome5 name={'check'} size={iconSize} color={colors[5]}/>
</View>
<Text
style={{
color: colors[5],
fontWeight:'bold',
fontSize: Scale*7,
paddingHorizontal: Width*0.25
}}
>Save</Text>
</View>
</TouchableOpacity>
</View>
<View style={{ paddingHorizontal: Width * 0.03 }}>
<FontAwesome5 name={'check'} size={iconSize} color={colors[5]} />
</View>
<Text
style={{
color: colors[5],
fontWeight: 'bold',
fontSize: Scale * 7,
paddingHorizontal: Width * 0.25
}}
>Save</Text>
</View>
</TouchableOpacity>
</View>
</View>


Expand Down
15 changes: 11 additions & 4 deletions code/MyComp/Home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import ViewTask from './ViewTask';
import {Appearance} from 'react-native';
import Settings from './Settings';
import SetWallpaper from './SetWallpaper';
import QuickTasker from './QuickTasker';
import MyProfile from './MyProfile';

const {scale} = Dimensions.get("window")
const {width, height} = Dimensions.get("screen")
Expand Down Expand Up @@ -48,19 +50,24 @@ const Home = ({navigation}) => {

</TouchableOpacity>

<TouchableOpacity style={styles.TouchableOpacity2}>
<TouchableOpacity style={styles.TouchableOpacity2}
onPress={() => {navigation.navigate(QuickTasker)}}
>

<View style={styles.TouchableOpacityView}>
<FontAwesome5 name={'question'} size={iconSize} color={colors[3]}/>
</View>

<Text style={styles.TouchableOpacityText1}>
How To Use
<Text style={styles.TouchableOpacityText1}
>
Zap Tasker
</Text>

</TouchableOpacity>

<TouchableOpacity style={styles.TouchableOpacity3}>
<TouchableOpacity style={styles.TouchableOpacity3}
onPress={()=>{navigation.navigate(MyProfile)}}
>

<View style={styles.TouchableOpacityView}>
<FontAwesome5 name='user' size={iconSize} color={colors[3]}/>
Expand Down
Loading

0 comments on commit e14635a

Please sign in to comment.