Skip to content

Commit 8cfe26e

Browse files
committed
carpooler uses fiber-ev
1 parent 9a4bd91 commit 8cfe26e

File tree

1 file changed

+29
-30
lines changed

1 file changed

+29
-30
lines changed

components/Carpooler.js

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { withNavigation } from "@expo/ex-navigation";
1010
import colors from "kolors";
1111
import Collapsible from "react-native-collapsible";
12-
import ElevatedView from "react-native-elevated-view";
12+
import ElevatedView from "fiber-react-native-elevated-view";
1313
import Router from "Router";
1414
import connectDropdownAlert from "../utils/connectDropdownAlert";
1515
import createWazeDeepLink from "../utils/createWazeDeepLink";
@@ -209,39 +209,38 @@ export default class Carpooler extends Component {
209209
render() {
210210
return (
211211
this.props.user.userUID !== this.props.authStore.userId &&
212-
<TouchableOpacity
213-
activeOpacity={1}
212+
<ElevatedView
214213
onPress={() => {
215214
this.isCollapsed = !this.isCollapsed;
216215
}}
216+
style={styles.cardContainer}
217+
elevation={2}
217218
>
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>
245244
);
246245
}
247246
}

0 commit comments

Comments
 (0)