diff --git a/App.js b/App.js
index dd0b6854..e9da8c93 100644
--- a/App.js
+++ b/App.js
@@ -64,12 +64,14 @@ import MyBookingDetails from "./src/views/MyBookingDetails";
import Chat from "./src/views/Chat";
import DoctorMap from "./src/views/DoctorMap";
import home from "./src/assets/icons/home.png";
+import more from "./src/assets/icons/more.png";
import file from "./src/assets/icons/file.png";
import list from "./src/assets/icons/list.png";
import bag from "./src/assets/icons/bag.png";
import DoctorSymptoms from "./src/views/DoctorSymptoms";
import PharmacyDetail from "./src/views/PharmacyDetail";
import PrescriptionUpload from "./src/views/PrescriptionUpload";
+
const Stack = createStackNavigator();
const Tab = createBottomTabNavigator();
@@ -93,15 +95,15 @@ function MyTabs() {
options={{
tabBarLabel: "Home",
tabBarIcon: ({ color, size }) => (
- <Icon name="ios-home"
- color={color} size={size} />
- // <Image
- // style={{ width: 20
- // ,
- // height: 20,backgroundColor:'white'}}
- // source={home}
+ // <Icon name="ios-home"
+ // color={color} size={size} />
+ <Image
+ style={{ width: 20
+ ,
+ height: 20,backgroundColor:'white'}}
+ source={home}
- // />
+ />
),
}}
/>
@@ -111,14 +113,14 @@ function MyTabs() {
options={{
tabBarLabel: "Pharmacy",
tabBarIcon: ({ color, size }) => (
- <Icon name="ios-medkit" color={color} size={size} />
- // <Image
- // style={{ width: 20
- // ,
- // height: 20,backgroundColor:'white'}}
- // source={bag}
+ // <Icon name="ios-medkit" color={color} size={size} />
+ <Image
+ style={{ width: 20
+ ,
+ height: 20,backgroundColor:'white'}}
+ source={bag}
- // />
+ />
),
}}
/>
@@ -128,14 +130,14 @@ function MyTabs() {
options={{
tabBarLabel: "MyOrders",
tabBarIcon: ({ color, size }) => (
- <Icon name="ios-list" color={color} size={size} />
- // <Image
- // style={{ width: 20
- // ,
- // height: 20,backgroundColor:''}}
- // source={list}
+ // <Icon name="ios-list" color={color} size={size} />
+ <Image
+ style={{ width: 20
+ ,
+ height: 20,backgroundColor:'white'}}
+ source={list}
- // />
+ />
),
}}
@@ -146,14 +148,14 @@ function MyTabs() {
options={{
tabBarLabel: "Prescription",
tabBarIcon: ({ color, size }) => (
- <Icon name="ios-document" color={color} size={size} />
- // <Image
- // style={{ width: 20
- // ,
- // height: 20,backgroundColor:''}}
- // source={file}
+ // <Icon name="ios-document" color={color} size={size} />
+ <Image
+ style={{ width: 20
+ ,
+ height: 20,backgroundColor:'white'}}
+ source={file}
- // />
+ />
),
}}
@@ -164,7 +166,14 @@ function MyTabs() {
options={{
tabBarLabel: "More",
tabBarIcon: ({ color, size }) => (
- <Icon name="ios-more" color={color} size={size} />
+ // <Icon name="ios-more" color={color} size={size} />
+ <Image
+ style={{ width: 20
+ ,
+ height: 20,backgroundColor:'white'}}
+ source={more}
+
+ />
),
}}
/>
diff --git a/android/.gradle/6.5/executionHistory/executionHistory.bin b/android/.gradle/6.5/executionHistory/executionHistory.bin
index 5efda201..1c41556a 100644
Binary files a/android/.gradle/6.5/executionHistory/executionHistory.bin and b/android/.gradle/6.5/executionHistory/executionHistory.bin differ
diff --git a/android/.gradle/6.5/executionHistory/executionHistory.lock b/android/.gradle/6.5/executionHistory/executionHistory.lock
index ca4e673e..fbf88b24 100644
Binary files a/android/.gradle/6.5/executionHistory/executionHistory.lock and b/android/.gradle/6.5/executionHistory/executionHistory.lock differ
diff --git a/android/.gradle/6.5/fileHashes/fileHashes.bin b/android/.gradle/6.5/fileHashes/fileHashes.bin
index 118047ad..021f7f02 100644
Binary files a/android/.gradle/6.5/fileHashes/fileHashes.bin and b/android/.gradle/6.5/fileHashes/fileHashes.bin differ
diff --git a/android/.gradle/6.5/fileHashes/fileHashes.lock b/android/.gradle/6.5/fileHashes/fileHashes.lock
index e10a5c2a..9d3d1a79 100644
Binary files a/android/.gradle/6.5/fileHashes/fileHashes.lock and b/android/.gradle/6.5/fileHashes/fileHashes.lock differ
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 1c049766..47adbbbf 100644
Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/android/.gradle/checksums/checksums.lock b/android/.gradle/checksums/checksums.lock
index 443deb5c..80cb8519 100644
Binary files a/android/.gradle/checksums/checksums.lock and b/android/.gradle/checksums/checksums.lock differ
diff --git a/src/assets/icons/back.png b/src/assets/icons/back.png
new file mode 100644
index 00000000..3937291c
Binary files /dev/null and b/src/assets/icons/back.png differ
diff --git a/src/assets/icons/back1.png b/src/assets/icons/back1.png
new file mode 100644
index 00000000..eb5a0549
Binary files /dev/null and b/src/assets/icons/back1.png differ
diff --git a/src/assets/icons/time.png b/src/assets/icons/time.png
new file mode 100644
index 00000000..02e49286
Binary files /dev/null and b/src/assets/icons/time.png differ
diff --git a/src/views/CreateAppointment.js b/src/views/CreateAppointment.js
index d68c9a09..287b8957 100644
--- a/src/views/CreateAppointment.js
+++ b/src/views/CreateAppointment.js
@@ -47,7 +47,8 @@ import axios from "axios";
import { connect } from "react-redux";
import RazorpayCheckout from "react-native-razorpay";
import { Input } from "react-native-elements";
-
+import back from "../assets/icons/back1.png";
+import time from "../assets/icons/time.png";
export default class CreateAppointment extends Component {
constructor(props) {
super(props);
@@ -84,8 +85,7 @@ export default class CreateAppointment extends Component {
description: this.state.description,
// total_amount: this.state.price_per_conversation,
// booking_type: this.state.type },
- appointmentMode:
- 'online'
+ appointmentMode: "online",
},
})
.then(async (response) => {
@@ -146,28 +146,26 @@ export default class CreateAppointment extends Component {
// }else{
// this.check_timing();
// }
- await axios
- .post(
- `${api_url1}/doctor_booking/`,
+ await axios.post(
+ `${api_url1}/doctor_booking/`,
- {
- doctor: this.state.doctor_id,
- // this.state.doctor_id,
- // doctor: this.state.phone_number,
- description: this.state.description,
- // this.state.description,
- title: this.state.title,
- // this.state.password,
- appointmentTime:this.state.start_time,
- appointmentMode:
- 'online'
- //"2021-12-10T08:40:08.675+00:00",
- // this.state.start_time,
- // Authorization: `Bearer ${global.fcm_token}`,
- },
- { headers: { Authorization: `Bearer ${global.fcm_token}` } }
- )
- // .then((res) => console.log(res.data));
+ {
+ doctor: this.state.doctor_id,
+ // this.state.doctor_id,
+ // doctor: this.state.phone_number,
+ description: this.state.description,
+ // this.state.description,
+ title: this.state.title,
+ // this.state.password,
+ appointmentTime: this.state.start_time,
+ appointmentMode: "online",
+ //"2021-12-10T08:40:08.675+00:00",
+ // this.state.start_time,
+ // Authorization: `Bearer ${global.fcm_token}`,
+ },
+ { headers: { Authorization: `Bearer ${global.fcm_token}` } }
+ );
+ // .then((res) => console.log(res.data));
alert("Appointment fixed");
this.props.navigation.navigate("Home");
};
@@ -250,11 +248,20 @@ export default class CreateAppointment extends Component {
onPress={this.handleBackButtonClick}
activeOpacity={1}
>
- <Icon
+ <Image
+ style={{
+ width: 20,
+ height: 20,
+ backgroundColor: "white",
+ marginVertical: 12,
+ }}
+ source={back}
+ />
+ {/* <Icon
onPress={this.handleBackButtonClick}
style={styles.create_style3}
name="arrow-back"
- />
+ /> */}
</TouchableOpacity>
<View style={styles.create_style4} />
<Text style={styles.create_style5}>New Appointment</Text>
@@ -293,7 +300,17 @@ export default class CreateAppointment extends Component {
style={{ width: 100 }}
transparent
>
- <Icon style={styles.create_style13} name="time" />
+ {/* <Icon style={styles.create_style13} name="time" /> */}
+ <Image
+ style={{
+ width: 40,
+ height: 40,
+ backgroundColor: "white",
+ marginVertical: 12,
+ marginLeft:19
+ }}
+ source={time}
+ />
</Button>
<Text style={styles.create_style14}>
(Select your date & time)