v2.0.0

- Added UAC (Regular, Rider, Agent)
kushendesilva · Feb 18, 2022 · d8dddba · d8dddba
1 parent 31d58b0
commit d8dddba
Show file tree

Hide file tree

Showing 26 changed files with 1,148 additions and 193 deletions.
diff --git a/README.md b/README.md
@@ -5,9 +5,29 @@
 
 - 📫 How to reach me **kushenthimira@gmail.com**
 
+<h3 align="left">Features</h3>
+
+- [x] Create Account
+- [x] Login
+- [x] Reset Password
+- [x] UAC (Account Types - Regular, Rider, Agent)
+- [x] Dark Theme
+- [x] New Request (Cash on Delivery)
+- [x] List Requests (With Queries)
+- [x] Select Date & Time
+- [x] List Requests (With Queries)
+- [x] Track Status of Requests
+- [x] Get Current Location
+- [ ] Select / Change Location
+- [ ] Navigation Support (Pickup Location & Drop Location)
+- [ ] Track Requests / Deliveries
+- [ ] Price Estimation
+- [ ] Add Payment Methods
+- [ ] Manage Payment Methods
+
 <h3 align="left">Resources</h3>
 
-- 📱 Downloadable APK available <a href="https://github.com/kushenthimira/pickngo/releases/download/v1.1.0/pickngo.apk" target="blank">**here**</a>
+- 📱 Downloadable APK available <a href="https://github.com/kushenthimira/pickngo/releases/download/v2.0.0/pickngo.apk" target="blank">**here**</a>
 
 |                                                                   |                                                                   |                                                                   |
 | :---------------------------------------------------------------: | :---------------------------------------------------------------: | :---------------------------------------------------------------: |

diff --git a/app.json b/app.json
@@ -3,7 +3,7 @@
     "name": "Pick & Go",
     "slug": "pickngo",
     "owner": "kushenthimira",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -20,7 +20,7 @@
       "permissions": ["LOCATION"],
       "adaptiveIcon": {
         "foregroundImage": "./assets/icon.png",
-        "backgroundColor": "#ffffff"
+        "backgroundColor": "#262E48"
       },
       "config": {
         "googleMaps": { "apiKey": "AIzaSyD87ToWqo4Y8vIjlgURucGldvbD5h44l3k" }

diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/previews/10.png b/assets/previews/10.png
diff --git a/assets/previews/12.png b/assets/previews/12.png
diff --git a/assets/previews/5.png b/assets/previews/5.png
diff --git a/assets/previews/6.png b/assets/previews/6.png
diff --git a/assets/previews/7.png b/assets/previews/7.png
diff --git a/src/components/InfoCard.js b/src/components/InfoCard.js
@@ -26,6 +26,9 @@ export const InfoCard = ({
         <Text category="s1" style={{ fontWeight: "bold", marginTop: 5 }}>
           Drop Location: <Text category="s1">{drop}</Text>
         </Text>
+        <Text category="s1" style={{ fontWeight: "bold", marginTop: 5 }}>
+          Payment Method: <Text category="s1">Cash on Delivery</Text>
+        </Text>
       </Layout>
     }
   >

diff --git a/src/components/LocationCard.js b/src/components/LocationCard.js
@@ -7,13 +7,16 @@ import {
   useTheme,
   Button,
 } from "@ui-kitten/components";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
 
 export const LocationCard = ({
   title = "Pickup Location",
   location,
   onPress,
   style,
   icon = "pin",
+  btnText = "Change",
+  vector = false,
 }) => {
   const theme = useTheme();
   return (
@@ -49,11 +52,21 @@ export const LocationCard = ({
               backgroundColor: theme["color-info-100"],
             }}
           >
-            <Icon
-              style={{ width: 25, height: 25, marginRight: 25 }}
-              fill={theme["color-info-default"]}
-              name={icon}
-            />
+            {vector == false ? (
+              <Icon
+                style={{ width: 25, height: 25, marginRight: 25 }}
+                fill={theme["color-info-default"]}
+                name={icon}
+              />
+            ) : (
+              <MaterialCommunityIcons
+                style={{ marginRight: 25 }}
+                name={icon}
+                size={25}
+                color={theme["color-info-default"]}
+              />
+            )}
+
             <Layout
               style={{
                 justifyContent: "center",
@@ -78,7 +91,7 @@ export const LocationCard = ({
             </Layout>
           </Layout>
           <Button onPress={onPress} style={{ borderRadius: 20 }} status="info">
-            Change
+            {btnText}
           </Button>
         </Layout>
       </Layout>

diff --git a/src/components/NewCard.js b/src/components/NewCard.js
@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Text, Card, useTheme, Button } from "@ui-kitten/components";
 import { ThemeContext } from "../configs/Theme";
 
-export const NewCard = ({ onPress }) => {
+export const NewCard = ({ onPress, isProfile = false }) => {
   const themeContext = useContext(ThemeContext);
   const theme = useTheme();
   return (
@@ -37,12 +37,22 @@ export const NewCard = ({ onPress }) => {
         are ready to deliver fast and first-rate customer service.
       </Text>
       <Button
+        disabled={isProfile}
         onPress={onPress}
         style={{ borderRadius: 5, marginVertical: 20 }}
         status="control"
       >
         New Request
       </Button>
+      {isProfile && (
+        <Button
+          onPress={onPress}
+          style={{ borderRadius: 5, marginBottom: 20, marginTop: -10 }}
+          status="control"
+        >
+          Complete Profile
+        </Button>
+      )}
     </Card>
   );
 };
diff --git a/src/components/OngoingCard.js b/src/components/OngoingCard.js
@@ -57,12 +57,12 @@ export const OngoingCard = ({ onPress, style }) => {
                   color: theme["color-info-default"],
                 }}
               >
-                Ongoing Deliveries
+                Ongoing Requests
               </Text>
             </Layout>
           </Layout>
           <Button onPress={onPress} style={{ borderRadius: 20 }} status="info">
-            Track
+            Find
           </Button>
         </Layout>
       </Layout>

diff --git a/src/components/PaymentCard.js b/src/components/PaymentCard.js
@@ -14,7 +14,7 @@ export const PaymentCard = ({ type, number, onPress, style }) => {
   const themeContext = useContext(ThemeContext);
   const TrashIcon = (props) => <Icon {...props} name="trash-2" />;
   return (
-    <Card disabled style={{ marginHorizontal: "3%", marginVertical: "1%" }}>
+    <Card disabled style={{ marginHorizontal: "5%", marginVertical: "1%" }}>
       <Layout>
         <Layout
           style={

diff --git a/src/components/ProfileCard.js b/src/components/ProfileCard.js
@@ -16,6 +16,7 @@ export const ProfileCard = ({
   onEditPress,
   name,
   addName = false,
+  staff = false,
 }) => {
   const themeContext = useContext(ThemeContext);
   const LogoutIcon = (props) => <Icon {...props} name="log-out" />;
@@ -35,47 +36,67 @@ export const ProfileCard = ({
             flexDirection: "row",
           }}
         >
-          <Pressable
-            onPress={onEditPress}
-            style={{
-              flexDirection: "row",
-              justifyContent: "space-evenly",
-              backgroundColor: theme["color-info-100"],
-              padding: 10,
-              borderRadius: 25,
-              elevation: 2,
-              marginRight: 15,
-            }}
-          >
-            <Icon
-              style={{ width: 40, height: 40 }}
-              fill={theme["color-info-default"]}
-              name="person"
-            />
-            <Layout
+          {staff == false ? (
+            <Pressable
+              onPress={onEditPress}
               style={{
-                backgroundColor:
-                  themeContext.theme == "light"
-                    ? theme["color-info-default"]
-                    : theme["color-info-400"],
-                padding: 5,
+                flexDirection: "row",
+                justifyContent: "space-evenly",
+                backgroundColor: theme["color-info-100"],
+                padding: 10,
                 borderRadius: 25,
                 elevation: 2,
-                position: "absolute",
-                right: -3,
-                top: -3,
+                marginRight: 15,
               }}
             >
               <Icon
+                style={{ width: 40, height: 40 }}
+                fill={theme["color-info-default"]}
+                name="person"
+              />
+              <Layout
                 style={{
-                  width: 15,
-                  height: 15,
+                  backgroundColor:
+                    themeContext.theme == "light"
+                      ? theme["color-info-default"]
+                      : theme["color-info-400"],
+                  padding: 5,
+                  borderRadius: 25,
+                  elevation: 2,
+                  position: "absolute",
+                  right: -3,
+                  top: -3,
                 }}
-                fill={theme["color-info-100"]}
-                name="edit-2"
+              >
+                <Icon
+                  style={{
+                    width: 15,
+                    height: 15,
+                  }}
+                  fill={theme["color-info-100"]}
+                  name="edit-2"
+                />
+              </Layout>
+            </Pressable>
+          ) : (
+            <Layout
+              style={{
+                flexDirection: "row",
+                justifyContent: "space-evenly",
+                backgroundColor: theme["color-info-100"],
+                padding: 10,
+                borderRadius: 25,
+                elevation: 2,
+                marginRight: 15,
+              }}
+            >
+              <Icon
+                style={{ width: 40, height: 40 }}
+                fill={theme["color-info-default"]}
+                name="person"
               />
             </Layout>
-          </Pressable>
+          )}
           <Layout style={{ justifyContent: "center" }}>
             {addName == true ? (
               <Button
@@ -86,7 +107,7 @@ export const ProfileCard = ({
                 size="tiny"
                 onPress={onEditPress}
               >
-                Update Profile
+                Complete Profile
               </Button>
             ) : (
               <Text style={{ margin: "1%", fontWeight: "bold" }} category="h6">

diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js
@@ -13,6 +13,7 @@ import { AuthContext } from "../provider/AuthProvider";
 //Screens
 import Home from "../screens/Home";
 import NewRequest from "../screens/NewRequest";
+import NewRider from "../screens/NewRider";
 import Confirmation from "../screens/Confirmation";
 import Ongoing from "../screens/Ongoing";
 import PaymentMethods from "../screens/PaymentMethods";
@@ -71,6 +72,7 @@ const Main = () => {
     >
       <MainStack.Screen name="MainTabs" component={MainTabs} />
       <MainStack.Screen name="NewRequest" component={NewRequest} />
+      <MainStack.Screen name="NewRider" component={NewRider} />
       <MainStack.Screen name="Confirmation" component={Confirmation} />
       <MainStack.Screen name="Ongoing" component={Ongoing} />
       <MainStack.Screen name="OngoingRequests" component={OngoingRequests} />

diff --git a/src/screens/Confirmation.js b/src/screens/Confirmation.js
@@ -14,6 +14,8 @@ export default function ({ navigation, route }) {
       date: request.date,
       time: request.time,
       user: request.user,
+      name: request.name,
+      phone: request.phone,
       id,
       pickAd: request.pickAd,
       pickLat: request.pickLat,
@@ -24,6 +26,7 @@ export default function ({ navigation, route }) {
       lat: request.lat,
       long: request.long,
       delivered: false,
+      rider: null,
     });
     navigation.navigate("MainTabs");
   };

diff --git a/src/screens/Help.js b/src/screens/Help.js
@@ -28,10 +28,10 @@ export default function ({ navigation }) {
   const handleGHPress = useCallback(async () => {
     await Linking.openURL("https://github.com/kushenthimira/posify/releases");
   }, []);
-  const FacebookIcon = (props) => <Icon {...props} name="facebook-outline" />;
-  const GoogleIcon = (props) => <Icon {...props} name="google-outline" />;
-  const TwitterIcon = (props) => <Icon {...props} name="twitter-outline" />;
-  const GithubIcon = (props) => <Icon {...props} name="github-outline" />;
+  const FacebookIcon = (props) => <Icon {...props} name="facebook" />;
+  const GoogleIcon = (props) => <Icon {...props} name="google" />;
+  const TwitterIcon = (props) => <Icon {...props} name="twitter" />;
+  const GithubIcon = (props) => <Icon {...props} name="github" />;
 
   return (
     <Screen