Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Responsive EnergyTooltip #378

Merged
merged 3 commits into from
Dec 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"versionFlag": "private-beta-rc",
"requiredServerVersion": "0.0.12",

"productionMode": true
"productionMode": false
}
26 changes: 13 additions & 13 deletions src/components/map/DropyMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,19 @@ const DropyMap = ({
{developerMode && <MapDebugger userCoordinates={userCoordinates} />}
</OSMapView>

<EnergyPopup />
<Sonar zoom={currentZoom} heading={currentHeading} visible={!museumVisible} compassHeading={compassHeading} />
<MapLoadingOverlay visible={geolocationInitialized === false} isGeolocationPermissionGranted={locationGranted}/>
<LinearGradient
pointerEvents='none'
colors={['rgba(0,0,0,0)', 'rgba(0,0,0,0.1)']}
start={{ x: 0.5, y: 0.8 }}
end={{ x: 0.5, y: 1 }}
style={StyleSheet.absoluteFillObject}
/>
<DebugText marginBottom={100}>{JSON.stringify(userCoordinates, null, 2)}</DebugText>
<DebugText marginBottom={300}>{JSON.stringify(dropiesAround, null, 2)}</DebugText>

<SafeAreaView style={styles.controlsView}>
<FadeInWrapper visible={!museumVisible}>
<EnergyTooltip>
Expand All @@ -245,19 +258,6 @@ const DropyMap = ({
</TouchableOpacity>
</FadeInWrapper>
</SafeAreaView>

<EnergyPopup />
<Sonar zoom={currentZoom} heading={currentHeading} visible={!museumVisible} compassHeading={compassHeading} />
<MapLoadingOverlay visible={geolocationInitialized === false} isGeolocationPermissionGranted={locationGranted}/>
<LinearGradient
pointerEvents='none'
colors={['rgba(0,0,0,0)', 'rgba(0,0,0,0.1)']}
start={{ x: 0.5, y: 0.8 }}
end={{ x: 0.5, y: 1 }}
style={StyleSheet.absoluteFillObject}
/>
<DebugText marginBottom={100}>{JSON.stringify(userCoordinates, null, 2)}</DebugText>
<DebugText marginBottom={300}>{JSON.stringify(dropiesAround, null, 2)}</DebugText>
</>
);
};
Expand Down
9 changes: 3 additions & 6 deletions src/components/map/EnergyTooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,29 +100,26 @@ export default EnergyTooltip;
const styles = StyleSheet.create({
tooltipContainer: {
...Styles.center,
...Styles.hardShadows,
position: 'absolute',
bottom: 15,
left: -210,
right: 0,
height: 110,
width: 210,
borderRadius: 10,
backgroundColor: Colors.purple2,
...Styles.hardShadows,
padding: 10,
},
titleView: {
alignItems: 'center',
flexDirection: 'row',
width: '90%',
marginTop: 7,
marginLeft: 5,
},
energyValue: {
...Fonts.bold(12, Colors.white),
marginLeft: 5,
},
description: {
...Fonts.bold(11, Colors.white),
margin: 8,
marginTop: 5,
},
});