Skip to content

Commit 72c4ddc

Browse files
mr3nz1mr3nz1
committed
ch(release): Readying branch for release
 *fix(favoriteDoctors-screen):Enhance UI and add dark theme *fix(favoriteDoctors-screen):Enhance UI and add dark theme *fix-doctor-details-screen-added *fix-SignupAndLogin-screen-added *fix-SignupAndLogin-screen-added *fix-AddNewCard-Screen-added *bg: fix appointment *feat:setting up the dark theme for some screens. *fix-doctor-details-screen-added bg: fix merge conflicts *fix-AddNewCard-Screen-added *bg: reset release commits *ch(githubAction-build):Change eas.json,app.json,app.json format ,to allow dynmic build for ios and android *bg: Adjust scollable onboarding screens *ch(githubAction-build):Change eas.json,app.json,app.json format ,to allow dynmic build for ios and android *bg: Adjust scollable onboarding screens *bg: onboarding alignment fix
1 parent f70c5a7 commit 72c4ddc

File tree

18 files changed

+649
-330
lines changed

18 files changed

+649
-330
lines changed

‎app/(app)/ActionMenu/Booking/DoctorRatingAndReview.tsx‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import React from "react";
1+
import React, { useContext } from "react";
22
import {
3-
StatusBar,
43
StyleSheet,
54
Text,
65
ScrollView,
@@ -13,27 +12,35 @@ import { Colors } from "@/constants/Colors";
1312
import { router } from "expo-router";
1413
import { SvgXml } from "react-native-svg";
1514
import ReviewerCardComponent from "@/components/ReviewerCardComponent";
16-
import { LeftArrow } from "@/components/UI/Icons";
1715
import { fullSmallBlueStar, fullSmallWhiteStar } from "@/components/UI/icons/star";
18-
import { moreBlackIcon } from "@/constants/icon";
16+
import { backArrowWhite, moreBlackIcon, moreWhiteIcon } from "@/constants/icon";
17+
import { ThemeContext } from "@/ctx/ThemeContext";
18+
import { StatusBar } from "expo-status-bar";
1919

2020

2121

2222
const DoctorRatingAndReview = () => {
23+
const { theme, changeTheme } = useContext(ThemeContext);
24+
2325
return (
24-
<View style={styles.container}>
26+
<View style={{
27+
flex: 1,
28+
padding: 24,
29+
gap: 20,
30+
backgroundColor: theme === "dark"? Colors.dark._1: Colors.others.white
31+
}}>
2532
<SafeAreaView>
2633
<View style={styles.navBar}>
2734
<View style={styles.leftSide}>
2835
<Pressable onPress={() => router.back()}>
29-
<LeftArrow fillColor="black" />
36+
<SvgXml xml={theme === "dark"? backArrowWhite:backArrowWhite } />
3037
</Pressable>
3138
<View>
32-
<Text style={Typography.heading._4}>4.8 (4,942 reviews)</Text>
39+
<Text style={[Typography.heading._4, {color: theme==="dark"? "white":"black" }]}>4.8 (4,942 reviews)</Text>
3340
</View>
3441
</View>
3542
<View style={styles.rightSide}>
36-
<SvgXml xml={moreBlackIcon} />
43+
<SvgXml xml={theme === "dark" ? moreWhiteIcon: moreBlackIcon} />
3744
</View>
3845
</View>
3946
</SafeAreaView>
@@ -46,7 +53,7 @@ const DoctorRatingAndReview = () => {
4653
<Text
4754
style={[
4855
Typography.semiBold.medium,
49-
{ color: Colors.others.white },
56+
{ color: theme === "dark"?Colors.others.white: Colors.others.black },
5057
]}
5158
>
5259
All
@@ -164,7 +171,7 @@ const DoctorRatingAndReview = () => {
164171
<ReviewerCardComponent />
165172
</ScrollView>
166173
</View>
167-
<StatusBar backgroundColor={"black"} />
174+
<StatusBar style={theme==="dark"? "light":"dark"} />
168175
</View>
169176
);
170177
};

‎app/(app)/Appointments/MessagingAppointment/AttachComponent.tsx‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
1-
import Typography from '@/constants/Typography'
2-
import React from 'react'
3-
import { Image, StyleSheet, Text } from 'react-native'
4-
import { View } from 'react-native'
1+
import { Colors } from "@/constants/Colors";
2+
import Typography from "@/constants/Typography";
3+
import { ThemeContext } from "@/ctx/ThemeContext";
4+
import React, { useContext } from "react";
5+
import { Image, StyleSheet, Text } from "react-native";
6+
import { View } from "react-native";
57

68
const AttachComponent = () => {
9+
const { theme, changeTheme } = useContext(ThemeContext);
10+
711
return (
8-
<View style={{flexDirection: "row", gap: 20, alignItems: 'center', justifyContent: "center"}}>
12+
<View
13+
style={{
14+
flexDirection: "row",
15+
gap: 20,
16+
alignItems: "center",
17+
justifyContent: "center",
18+
backgroundColor: theme === "dark" ? Colors.dark._3 : "white",
19+
padding: 40,
20+
borderRadius: 20,
21+
}}
22+
>
923
<View style={styles.card}>
10-
<Image source={require("@/assets/images/documentImg.png")}/>
11-
<Text style={[Typography.semiBold.large,styles.text]} >Document</Text>
24+
<Image source={require("@/assets/images/documentImg.png")} />
25+
<Text style={[Typography.semiBold.large, styles.text, {color: theme==="dark"? "white": "black"}]}>Document</Text>
1226
</View>
1327
<View style={styles.card}>
14-
<Image source={require("@/assets/images/garellyImg.png")}/>
15-
<Text style={[Typography.semiBold.large,styles.text]} >Gallery</Text>
28+
<Image source={require("@/assets/images/garellyImg.png")} />
29+
<Text style={[Typography.semiBold.large, styles.text,{color: theme==="dark"? "white": "black"}]}>Gallery</Text>
1630
</View>
1731
<View style={styles.card}>
18-
<Image source={require("@/assets/images/audioImg.png")}/>
19-
<Text style={[Typography.semiBold.large,styles.text]} >Audio</Text>
32+
<Image source={require("@/assets/images/audioImg.png")} />
33+
<Text style={[Typography.semiBold.large, styles.text, {color: theme==="dark"? "white": "black"}]}>Audio</Text>
2034
</View>
2135
</View>
22-
)
23-
}
36+
);
37+
};
2438

2539
const styles = StyleSheet.create({
2640
card: {
@@ -30,7 +44,7 @@ const styles = StyleSheet.create({
3044
},
3145
text: {
3246
textAlign: "center",
33-
}
34-
})
47+
},
48+
});
3549

36-
export default AttachComponent
50+
export default AttachComponent;

‎app/(app)/Appointments/MessagingAppointment/Camera.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import { circleWithDots } from "@/components/UI/icons/circleWithDots";
2-
import { BlackFilterIcon } from "@/components/UI/icons/filterIcon";
31
import { Colors } from "@/constants/Colors";
42
import { ThemeContext } from "@/ctx/ThemeContext";
5-
import { MaterialIcons } from "@expo/vector-icons";
63
import { router } from "expo-router";
7-
import { StatusBar } from "expo-status-bar";
84
import React, { useContext, useRef, useState } from "react";
95
import {
106
Button,

‎app/(app)/Appointments/MessagingAppointment/ChatMessaging.tsx‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { BlueAttachIcon } from "@/components/UI/icons/attachIcon";
2-
import { WhiteMessageIcon } from "@/components/UI/icons/blueMessage";
32
import { BlueCameraIcon } from "@/components/UI/icons/cameraIcon";
4-
import { circleWithDots } from "@/components/UI/icons/circleWithDots";
3+
import { moreWhiteIcon } from "@/components/UI/icons/circleWithDots";
54
import { WhiteDoubleTick, BlueDoubleTick } from "@/components/UI/icons/doubleTickIcon";
6-
import { BlackFilterIcon } from "@/components/UI/icons/filterIcon";
5+
import { BlackFilterIcon, filterWhiteIcon } from "@/components/UI/icons/filterIcon";
76
import { blueImojiIcon } from "@/components/UI/icons/imojiIcon";
87
import { WhiteVoiceIcon } from "@/components/UI/icons/voiceIcon";
98
import { Colors } from "@/constants/Colors";
@@ -28,6 +27,8 @@ import { TouchableOpacity } from "react-native";
2827
import AttachComponent from "./AttachComponent";
2928
import { Image } from "react-native";
3029
import PlaySound from "./Playsound";
30+
import { backArrowBlack, backArrowWhite } from "@/components/UI/icons/backArrow";
31+
import { MoreIcon } from "@/assets/icons/MoreCircleSvg";
3132

3233
function ChatMessaging() {
3334
const date = new Date();
@@ -79,9 +80,9 @@ function ChatMessaging() {
7980

8081
return (
8182
<SafeAreaView
82-
style={{ flex: 1, paddingTop: ios ? 10 : 30, backgroundColor: "white" }}
83+
style={{ flex: 1, paddingTop: ios ? 10 : 30, backgroundColor:theme==="dark"? Colors.dark._1: "white" }}
8384
>
84-
<StatusBar style="dark" />
85+
<StatusBar style={theme ==="dark"? "light": "dark"} />
8586
<View
8687
style={{
8788
flexDirection: "row",
@@ -90,7 +91,7 @@ function ChatMessaging() {
9091
gap: 30,
9192
padding: 20,
9293
backgroundColor:
93-
theme === "light" ? Colors.others.white : Colors.others.black,
94+
theme === "light" ? Colors.others.white : Colors.dark._1,
9495
}}
9596
>
9697
<Pressable
@@ -100,19 +101,17 @@ function ChatMessaging() {
100101
alignItems: "center",
101102
justifyContent: "space-between",
102103
gap: 20,
103-
backgroundColor:
104-
theme === "light" ? Colors.others.white : Colors.others.black,
104+
105105
}}
106106
>
107-
<MaterialIcons
108-
name="arrow-back"
109-
size={25}
110-
style={{ alignSelf: "center" }}
111-
/>
107+
<View>
108+
<SvgXml xml={theme=== "dark"? backArrowWhite : backArrowBlack} />
109+
</View>
112110
<Text
113111
style={{
114112
fontSize: 24,
115113
fontWeight: "600",
114+
color: theme==="dark"? Colors.others.white: Colors.others.black
116115
}}
117116
>
118117
Dr. Drake Boeson
@@ -122,24 +121,19 @@ function ChatMessaging() {
122121
<View
123122
style={[
124123
{
125-
backgroundColor: Colors.others.white,
126-
borderRadius: 10,
127-
padding: 20,
128124
position: "absolute",
129125
right: 20,
130126
top: 50,
131-
zIndex:10
132127
},
133-
styles.shadowProp,
134128
]}
135129
>
136130
<MenuComponent closeMenu={handleChatMenu} />
137131
</View>
138132
)}
139133
<View style={{ flexDirection: "row", gap: 10 }}>
140-
<SvgXml xml={BlackFilterIcon} />
134+
<SvgXml xml={ theme === "dark" ? filterWhiteIcon : BlackFilterIcon} />
141135
<TouchableOpacity onPress={handleChatMenu}>
142-
<SvgXml xml={circleWithDots} />
136+
<SvgXml xml={ theme==="dark"? moreWhiteIcon:MoreIcon} />
143137
</TouchableOpacity>
144138
</View>
145139
</View>
@@ -169,6 +163,7 @@ function ChatMessaging() {
169163
backgroundColor: "rgba(117, 117, 117, 0.2)",
170164
borderRadius: 10,
171165
marginBottom: 10,
166+
color: theme==="dark"? Colors.grayScale._50 : Colors.others.black
172167
}}
173168
>
174169
Session Start
@@ -188,7 +183,7 @@ function ChatMessaging() {
188183
flexDirection: "row",
189184
alignItems: "baseline",
190185
justifyContent:
191-
message.user === "user" ? "flex-start" : "flex-end",
186+
message.user === "user" ? "flex-start" : "flex-end",
192187
borderBottomEndRadius: message.user === "user" ? 10 : 20,
193188
borderBottomStartRadius: message.user === "user1" ? 10 : 20,
194189
borderRadius: 20,
@@ -202,9 +197,11 @@ function ChatMessaging() {
202197
Typography.medium.xLarge,
203198
{
204199
color:
205-
message.user === "user" ? Colors.others.white : "black",
200+
message.user === "user" ? Colors.others.white : "black",
206201
maxWidth: 250,
207-
},
202+
},{
203+
color: theme ==="dark"? Colors.grayScale._50: "black"
204+
}
208205
]}
209206
>
210207
{message.chat}
@@ -305,13 +302,13 @@ function ChatMessaging() {
305302
<Text
306303
style={[
307304
Typography.medium.xLarge,
308-
{ color: Colors.others.black, maxWidth: 250 },
305+
{ color: theme ==="dark"? Colors.grayScale._50: "black", maxWidth: 250 },
309306
]}
310307
>
311308
Hi, good afternoon Dr. Drake... 😁😁
312309
</Text>
313310
<View>
314-
<Text style={{ color: "rgba(117, 117, 117, 0.5)" }}>16:00</Text>
311+
<Text style={{ color: Colors.grayScale._50 }}>16:00</Text>
315312
</View>
316313
</View>
317314
<View
@@ -390,6 +387,7 @@ function ChatMessaging() {
390387
backgroundColor: "rgba(117, 117, 117, 0.2)",
391388
borderRadius: 10,
392389
marginVertical: 10,
390+
color: theme==="dark"? Colors.grayScale._50 : "black"
393391
}}
394392
>
395393
Session End
@@ -401,11 +399,8 @@ function ChatMessaging() {
401399
<View
402400
style={[
403401
{
404-
backgroundColor: Colors.others.white,
405-
padding: 40,
406402
position: "absolute",
407403
top: -190,
408-
borderRadius: 20,
409404
left: 40,
410405
},
411406
styles.shadowProp,
@@ -486,8 +481,6 @@ const styles = StyleSheet.create({
486481
shadowOpacity: 0.2,
487482
shadowRadius: 3,
488483
elevation: 10,
489-
backgroundColor:Colors.others.white
490-
491484
},
492485
});
493486
export default ChatMessaging;

‎app/(app)/Appointments/MessagingAppointment/Menu.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
import React from "react";
2-
import { BlackDeleteIcon } from "@/components/UI/icons/deleteIcon"
3-
import { BlackDownloadIcon } from "@/components/UI/icons/downloadIcon"
1+
import React, { useContext } from "react";
2+
import { BlackDeleteIcon, deleteWhiteIcon } from "@/components/UI/icons/deleteIcon"
3+
import { BlackDownloadIcon, downloadWhiteIcon } from "@/components/UI/icons/downloadIcon"
44
import { Colors } from "@/constants/Colors";
55
import Typography from "@/constants/Typography";
66
import { StyleSheet, Text, TouchableOpacity, View } from "react-native"
77
import { SvgXml } from "react-native-svg"
8+
import { ThemeContext } from "@/ctx/ThemeContext";
89

910
interface MenuComponentProps {
1011
closeMenu: () => void;
1112
}
1213

1314
const MenuComponent: React.FC<MenuComponentProps> = ({closeMenu})=>{
15+
const { theme, changeTheme } = useContext(ThemeContext);
1416

1517
return(
1618
<View style={{
1719
gap: 15,
18-
backgroundColor:Colors.others.white,
20+
backgroundColor: theme ==="dark"? Colors.others.black :Colors.others.white,
21+
padding: 20,
22+
borderRadius: 10
1923
}}>
2024
<TouchableOpacity style={styles.iconText}
2125
onPress={closeMenu}>
22-
<SvgXml xml={BlackDeleteIcon}/>
23-
<Text style={Typography.bold.medium}>Clear Chat</Text>
26+
<SvgXml xml={theme === "dark"? deleteWhiteIcon :BlackDeleteIcon}/>
27+
<Text style={[Typography.bold.medium, {color: theme==="dark"? "white": "black"}]}>Clear Chat</Text>
2428
</TouchableOpacity>
2529
<View style={{borderColor: "rgba(0, 0, 0,0.2 )", borderWidth: 0.3}}></View>
2630
<TouchableOpacity style={styles.iconText}
2731
onPress={closeMenu}>
28-
<SvgXml xml={BlackDownloadIcon} />
29-
<Text style={Typography.bold.medium}>Export Chat</Text>
32+
<SvgXml xml={theme==="dark"? downloadWhiteIcon :BlackDownloadIcon} />
33+
<Text style={[Typography.bold.medium, {color: theme==="dark"? "white": "black"}]}>Export Chat</Text>
3034
</TouchableOpacity>
3135
</View>
3236
)

‎app/(app)/Appointments/MessagingAppointment/_layout.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export default function Layout() {
55
return (
66
<Stack>
77
<Stack.Screen name="index" options={{headerShown:false}}/>
8-
<Stack.Screen name="AppointmentMessaging" options={{headerShown:false}}/>
98
<Stack.Screen name="ChatMessaging" options={{headerShown:false}}/>
109
<Stack.Screen name="Camera" options={{headerShown:false}}/>
1110
</Stack>

0 commit comments

Comments
 (0)