Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

App bugfixes: map overlay and review thumbs up/down #79

Open
leevi978 wants to merge 2 commits into
base: develop
Choose a base branch
from
+1,861 −1,830
Open

App bugfixes: map overlay and review thumbs up/down #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5749835
Bugfix: Map works after modal is opened and/or closed
haattis Nov 22, 2019
31a4a94
Bugfix: Review now shows correct thumbs up or down, and not just thum…
leevi978 Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/components/VenueMapOverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import VenueContactInfo from "./VenueContactInfo";

export default ({ selectedVenue, showDetails }) => {
return (
<ViewContainer opaque={true}>
<ViewContainer style={{ position: "absolute", bottom: 0, width: "100%" }} opaque={true}>
Copy link
Contributor

@sirhaug sirhaug Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Løste dette et problem, eller ble det lagt til som en "forsikring" mot at kartet flytter på seg?

Copy link
Author

@leevi978 leevi978 Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tru det eller ei, men det løste hele kartproblemet

<View style={{ flexDirection: "row", marginBottom: COMPONENT_SPACING }}>
<VenueContactInfo
name={selectedVenue.name}
Expand Down
15 changes: 10 additions & 5 deletions app/containers/Map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from "react";
import MapView, {Marker} from "react-native-maps";
import {Geolocation} from "react-native";
import React, { Component } from "react";
import MapView, { Marker } from "react-native-maps";
import { Geolocation } from "react-native";
import colors from "../settings/defaultStyles";

export default class Map extends Component {
Expand All @@ -13,7 +13,7 @@ export default class Map extends Component {
}

componentDidMount() {
navigator.geolocation.getCurrentPosition(({coords}) =>
navigator.geolocation.getCurrentPosition(({ coords }) =>
this.map.animateToCoordinate(coords)
);
}
Expand Down Expand Up @@ -47,6 +47,7 @@ export default class Map extends Component {
}}
onPress={e => {
this.props.deselectVenue();
this.removeMarkers();
Copy link
Contributor

@sirhaug sirhaug Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}}
onPoiClick={e => {
this.props.onVenueSelect(e.nativeEvent.placeId);
Expand All @@ -67,6 +68,10 @@ export default class Map extends Component {

animateTo(coordinates) {
this.map.animateToCoordinate(coordinates);
this.setState({markers: [coordinates]});
this.setState({ markers: [coordinates] });
}

removeMarkers() {
this.setState({ markers: [] });
}
}
10 changes: 7 additions & 3 deletions app/containers/Review.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,13 @@ export default class Review extends Component {
}

renderProperty(property, review) {
const {value} = review;
return (
<View key={property.name}>
<View style={[styles.row, styles.property]}>
<PropertyTitle property={property} size={22} style={{flex: 1}}/>
<MaterialIcons
name={value ? "thumb-up" : "thumb-down"}
color={value ? colors.positiveColor : colors.negativeColor}
name={this.reviewIsPositive(review) ? "thumb-up" : "thumb-down"}
color={this.reviewIsPositive(review) ? colors.positiveColor : colors.negativeColor}
Comment on lines +68 to +69
Copy link
Contributor

@sirhaug sirhaug Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

size={23}
/>
</View>
Expand All @@ -86,6 +85,11 @@ export default class Review extends Component {
);
}

reviewIsPositive(review){
const {value} = review;
return (value > 0);
}

toggleComments() {
this.setState({showComments: !this.state.showComments});
}
Expand Down
Loading