|
9 | 9 | import { withNavigation } from "@expo/ex-navigation"; |
10 | 10 | import colors from "kolors"; |
11 | 11 | import Collapsible from "react-native-collapsible"; |
12 | | -import ElevatedView from "react-native-elevated-view"; |
| 12 | +import ElevatedView from "fiber-react-native-elevated-view"; |
13 | 13 | import Router from "Router"; |
14 | 14 | import connectDropdownAlert from "../utils/connectDropdownAlert"; |
15 | 15 | import createWazeDeepLink from "../utils/createWazeDeepLink"; |
@@ -209,39 +209,38 @@ export default class Carpooler extends Component { |
209 | 209 | render() { |
210 | 210 | return ( |
211 | 211 | this.props.user.userUID !== this.props.authStore.userId && |
212 | | - <TouchableOpacity |
213 | | - activeOpacity={1} |
| 212 | + <ElevatedView |
214 | 213 | onPress={() => { |
215 | 214 | this.isCollapsed = !this.isCollapsed; |
216 | 215 | }} |
| 216 | + style={styles.cardContainer} |
| 217 | + elevation={2} |
217 | 218 | > |
218 | | - <ElevatedView style={styles.cardContainer} elevation={2}> |
219 | | - <CardHeader> |
220 | | - <CardLabel> |
221 | | - {this.props.user.displayName.toUpperCase()} |
222 | | - </CardLabel> |
223 | | - <CardSublabel> |
224 | | - {this.props.user.type.toUpperCase()} |
225 | | - </CardSublabel> |
226 | | - </CardHeader> |
227 | | - <CardIndicator |
228 | | - active={ |
229 | | - this.props.pickedUpUsers === this.props.passengers.length || |
230 | | - (this.props.event.yourRide.rideStarted || |
231 | | - this.props.user.isPickedUp) |
232 | | - } |
233 | | - /> |
234 | | - <Collapsible duration={200} collapsed={this.isCollapsed}> |
235 | | - {this.props.selfIsDriver && |
236 | | - this.props.user.type === "rider" && |
237 | | - this.renderDriverPassengerContent()} |
238 | | - {this.props.user.type === "rider" && |
239 | | - !this.props.selfIsDriver && |
240 | | - this.renderPeerPassengerContent()} |
241 | | - {this.props.user.type === "driver" && this.renderDriverContent()} |
242 | | - </Collapsible> |
243 | | - </ElevatedView> |
244 | | - </TouchableOpacity> |
| 219 | + <CardHeader> |
| 220 | + <CardLabel> |
| 221 | + {this.props.user.displayName.toUpperCase()} |
| 222 | + </CardLabel> |
| 223 | + <CardSublabel> |
| 224 | + {this.props.user.type.toUpperCase()} |
| 225 | + </CardSublabel> |
| 226 | + </CardHeader> |
| 227 | + <CardIndicator |
| 228 | + active={ |
| 229 | + this.props.pickedUpUsers === this.props.passengers.length || |
| 230 | + (this.props.event.yourRide.rideStarted || |
| 231 | + this.props.user.isPickedUp) |
| 232 | + } |
| 233 | + /> |
| 234 | + <Collapsible duration={200} collapsed={this.isCollapsed}> |
| 235 | + {this.props.selfIsDriver && |
| 236 | + this.props.user.type === "rider" && |
| 237 | + this.renderDriverPassengerContent()} |
| 238 | + {this.props.user.type === "rider" && |
| 239 | + !this.props.selfIsDriver && |
| 240 | + this.renderPeerPassengerContent()} |
| 241 | + {this.props.user.type === "driver" && this.renderDriverContent()} |
| 242 | + </Collapsible> |
| 243 | + </ElevatedView> |
245 | 244 | ); |
246 | 245 | } |
247 | 246 | } |
|
0 commit comments