Fix: Remove Unused Icons and Fix app Issues (#155)

This pr fixes issues that were found in the app including icons that were not used especially the search and menu icon. It also fixed the issue of scrolling on upcoming, completed, and canceled appointments.
atlp-rwanda · Jul 26, 2024 · 1feb54d · 1feb54d
2 parents 1b50ac5 + 82bf6bc
commit 1feb54d
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 43 deletions.
diff --git a/app/Appointments/details.tsx b/app/Appointments/details.tsx
@@ -30,7 +30,7 @@ const pkgs = {
     period: "30 mins",
     icon: chatIcon,
     button: {
-      title: "Message (Start at 16:00 PM)",
+      title: "Message ",
       icon: chatIconWhite,
       nextTo: "/messagingAppointment/messaging",
     },
@@ -43,7 +43,7 @@ const pkgs = {
     period: "30 mins",
     icon: callIcon,
     button: {
-      title: "Voice Call (Start at 14:00 PM)",
+      title: "Voice Call ",
       icon: callIconWhite,
       nextTo: "/Appointments/voice-call/call",
     },
@@ -56,7 +56,7 @@ const pkgs = {
     period: "30 mins",
     icon: callIcon,
     button: {
-      title: "Video Call (Start at 10:00 AM)",
+      title: "Video Call",
       icon: videoIconWhite,
       nextTo: "/videoCallAppointment",
     },
@@ -111,14 +111,14 @@ const VideoCallAppointment = ({ route }: any) => {
         <NavigationHeader
           title={"My Appointment"}
           onBack={router.back}
-          children={
-            <Touchable>
-              <Image
-                source={require("../../assets/doctors/menu.png")}
-                className="w-7 h-7"
-              />
-            </Touchable>
-          }
+          // children={
+          //   // <Touchable>
+          //   //   <Image
+          //   //     source={require("../../assets/doctors/menu.png")}
+          //   //     className="w-7 h-7"
+          //   //   />
+          //   // </Touchable>
+          // }
         />
       </View>
       <ScrollView className={`flex-1 pt-2`}>

diff --git a/app/Appointments/index.tsx b/app/Appointments/index.tsx
@@ -90,7 +90,7 @@ function Screen() {
         `
         )
         .eq("patient_id", userId)
-        .eq("status", "Booked").order("appointment_date", { ascending: true }) 
+        .eq("status", "Approved").order("appointment_date", { ascending: true }) 
         .order("appointment_time", { ascending: true })
 
       if (error) {
@@ -225,7 +225,7 @@ function Screen() {
             </View>
             <View>
               <View className="flex flex-row items-center justify-center gap-4">
-                <Image
+                {/* <Image
                   className="w-[25px] h-[25px]"
                   source={require("../../assets/doctors/searchIcon.png")}
                 />
@@ -234,7 +234,7 @@ function Screen() {
                     className="w-[25px] h-[25px]"
                     source={require("../../assets/doctors/menu.png")}
                   />
-                </TouchableOpacity>
+                </TouchableOpacity> */}
               </View>
             </View>
           </View>
@@ -291,6 +291,7 @@ function Screen() {
         >
           {cancels && (
             <View style={styles.content}>
+              <ScrollView  showsVerticalScrollIndicator={false}>
               {canceledData.map((canceled, index) => (
                 <Cardcomponent
                   key={index}
@@ -304,11 +305,13 @@ function Screen() {
                   styles={styles.cancelStyles}
                 />
               ))}
+              </ScrollView>
             </View>
           )}
 
          {complete && (
             <View style={styles.content}>
+              <ScrollView showsVerticalScrollIndicator={false}>
                {completAppointment.map((appointment:any, index:any) => (
               <Cardscomponent
                 key={index}
@@ -335,11 +338,13 @@ function Screen() {
                   params:{doctorId:appointment.doctor.id, }})}
               />
               ))}
+              </ScrollView>
             </View>
           )}
 
           {upcoming && (
             <View style={styles.content}>
+              <ScrollView showsVerticalScrollIndicator={false}>
               {appointments.map((appointment: any, index: any) => (
                 <Cardscomponent
                   key={index}
@@ -368,6 +373,7 @@ function Screen() {
                   cancle={() => openCancelModal(appointment)}
                 />
               ))}
+              </ScrollView>
             </View>
           )}
 

diff --git a/app/Appointments/voice-call/index.tsx b/app/Appointments/voice-call/index.tsx
@@ -97,7 +97,7 @@ export default function VoiceCallScreen() {
               height={20}
             />
             <Text className="text-white font-UrbanistBold">
-              Voice Call (Start at 14:00 PM)
+              Voice Call 
             </Text>
           </TouchableOpacity>
         </View>

diff --git a/app/articles/ArticlesDetails.tsx b/app/articles/ArticlesDetails.tsx
@@ -262,12 +262,12 @@ export default function ArticlesDetails() {
               source={require("../../assets/articlesImages/rwiza.png")}
             />
           </TouchableOpacity>
-          <TouchableOpacity onPress={more}>
+          {/* <TouchableOpacity onPress={more}>
             <Image
               style={{ height: 1.17, width: 1.17, padding: 10 }}
               source={require("../../assets/articlesImages/Group.png")}
             />
-          </TouchableOpacity>
+          </TouchableOpacity> */}
         </View>
       </View>
 

diff --git a/app/articles/ArticlesPage.tsx b/app/articles/ArticlesPage.tsx
@@ -93,10 +93,10 @@ export default function Article() {
           </View>
           <View style={styles.headerRight}>
             <TouchableOpacity>
-              <Image
+              {/* <Image
                 style={styles.headerIcon}
                 source={require("../../assets/articlesImages/Search.png")}
-              />
+              /> */}
             </TouchableOpacity>
             <TouchableOpacity
               onPress={() =>

diff --git a/app/articles/BookMarkedArticle.tsx b/app/articles/BookMarkedArticle.tsx
@@ -122,12 +122,12 @@ export default function BookMarkedArticle() {
             padding: 15,
           }}
         >
-          <TouchableOpacity>
+          {/* <TouchableOpacity>
             <Image source={require("../../assets/articlesImages/Search.png")} />
-          </TouchableOpacity>
-          <TouchableOpacity>
+          </TouchableOpacity> */}
+          {/* <TouchableOpacity>
             <Image source={require("../../assets/articlesImages/Group.png")} />
-          </TouchableOpacity>
+          </TouchableOpacity> */}
         </View>
       </View>
 

diff --git a/app/articles/SeeAllArticles.tsx b/app/articles/SeeAllArticles.tsx
@@ -99,18 +99,18 @@ export default function SeeAllArticles() {
               padding: 15,
             }}
           >
-            <TouchableOpacity>
+            {/* <TouchableOpacity>
               <Image
                 style={{ position: "relative", marginTop: 10 }}
                 source={require("../../assets/articlesImages/Search.png")}
               />
-            </TouchableOpacity>
-            <TouchableOpacity>
+            </TouchableOpacity> */}
+            {/* <TouchableOpacity>
               <Image
                 style={{ position: "relative", marginTop: 12 }}
                 source={require("../../assets/articlesImages/Group.png")}
               />
-            </TouchableOpacity>
+            </TouchableOpacity> */}
           </View>
         </View>
         <View style={{ padding: 5 }}>

diff --git a/app/messagingAppointment/messaging.tsx b/app/messagingAppointment/messaging.tsx
@@ -116,15 +116,15 @@ export default function messagingAppointment() {
   return (
     <View className="flex-1 bg-white py-10 px-6">
       <NavigationHeader title={appointment.doctor.name} onBack={router.back}>
-        <TouchableOpacity>
+        {/* <TouchableOpacity>
           <Image
             source={require("@/assets/icons/search.png")}
             className="w-6 h-6 mr-3"
           />
         </TouchableOpacity>
         <TouchableOpacity onPress={toggleModal}>
           <SvgXml xml={Menu} />
-        </TouchableOpacity>
+        </TouchableOpacity> */}
         <Modal
           visible={visible}
           animationType="fade"
@@ -134,7 +134,7 @@ export default function messagingAppointment() {
           <TouchableWithoutFeedback onPress={() => setVisible(false)}>
             <View className={` absolute w-[100%] right-0 z-[0] top-[5px]`}>
               <View className="w-[100%]">
-                <View className="w-[37%] relative top-[50px] left-[59%] p-4 right-0 bg-white rounded-xl">
+                {/* <View className="w-[37%] relative top-[50px] left-[59%] p-4 right-0 bg-white rounded-xl">
                   <TouchableOpacity className="flex-row gap-2 py-2">
                     <SvgXml xml={deleteBtn} />
                     <Text className="font-UrbanistSemiBold">Clear chat</Text>
@@ -144,7 +144,7 @@ export default function messagingAppointment() {
                     <SvgXml xml={download} />
                     <Text className="font-UrbanistSemiBold">Export chat</Text>
                   </TouchableOpacity>
-                </View>
+                </View> */}
               </View>
             </View>
           </TouchableWithoutFeedback>

diff --git a/assets/icons/radiologist.ts → assets/icons/cardiologist.ts b/assets/icons/radiologist.ts → assets/icons/cardiologist.ts
diff --git a/assets/icons/index.ts b/assets/icons/index.ts
@@ -10,8 +10,8 @@ import { more } from "./more";
 import { neurologist } from "./neurologist";
 import { nutritionist } from "./nutritionist";
 import { opthamologist } from "./opthamologist";
-import { pediatric } from "./pediatric";
-import { radiologist } from "./radiologist";
+import { pediatric } from "./pediatrician";
+import { radiologist } from "./cardiologist";
 
 export enum TabsType {
   HOME = "Home",

diff --git a/assets/icons/pediatric.ts → assets/icons/pediatrician.ts b/assets/icons/pediatric.ts → assets/icons/pediatrician.ts
diff --git a/components/cards/DocButtons.tsx b/components/cards/DocButtons.tsx
@@ -55,10 +55,10 @@ const DocButton: React.FC<DocButtonProps> = ({ selectedCategory, onCategorySelec
             <Text style={getButtonTextStyle("nutritionist")}>Nutritionist</Text>
           </TouchableOpacity>
           <TouchableOpacity
-            style={getButtonStyle("pediatric")}
-            onPress={() => onCategorySelect("pediatric")}
+            style={getButtonStyle("pediatrician")}
+            onPress={() => onCategorySelect("pediatrician")}
           >
-            <Text style={getButtonTextStyle("pediatric")}>Pediatric</Text>
+            <Text style={getButtonTextStyle("pediatrician")}>Pediatrician</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={getButtonStyle("neurologist")}
@@ -67,10 +67,10 @@ const DocButton: React.FC<DocButtonProps> = ({ selectedCategory, onCategorySelec
             <Text style={getButtonTextStyle("neurologist")}>Neurologist</Text>
           </TouchableOpacity>
           <TouchableOpacity
-            style={getButtonStyle("radiologist")}
-            onPress={() => onCategorySelect("radiologist")}
+            style={getButtonStyle("cardiologist")}
+            onPress={() => onCategorySelect("cardiologist")}
           >
-            <Text style={getButtonTextStyle("radiologist")}>Radiologist</Text>
+            <Text style={getButtonTextStyle("cardiologist")}>Cardiologist</Text>
           </TouchableOpacity>
           <TouchableOpacity
             style={getButtonStyle("more")}

diff --git a/components/cards/packages/appointmentPackage.tsx b/components/cards/packages/appointmentPackage.tsx
@@ -45,17 +45,17 @@ const AppointmentPkg: React.FC<Props> = ({
           <Text className="text-[16px] font-UrbanistBold text-greyscale-900">
             {title}
           </Text>
-          <Text className="text-[18px] font-UrbanistBold text-primary-500">
+          {/* <Text className="text-[18px] font-UrbanistBold text-primary-500">
             {price}
-          </Text>
+          </Text> */}
         </View>
         <View className="flex-row w-full justify-between items-center">
           <Text className="text-[12px] font-UrbanistMedium text-greyscale-700">
             {description}
           </Text>
-          <Text className="text-[10px] font-UrbanistMedium text-greyscale-700">
+          {/* <Text className="text-[10px] font-UrbanistMedium text-greyscale-700">
             (paid)
-          </Text>
+          </Text> */}
         </View>
       </View>
     </View>