summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander NeonXP Kiryukhin <a.kiryukhin@mail.ru>2019-06-11 03:05:47 +0300
committerAlexander NeonXP Kiryukhin <a.kiryukhin@mail.ru>2019-06-11 03:05:47 +0300
commit66fe14e5a54995951364c8629bf6c6a02a4b0da0 (patch)
tree345e96b8a89e13ceba91a15aec9447b82f8231ea
parentf12a3bccd8c726e59e92123a3d8ef1f5a73d7253 (diff)
Fix for androidHEADmaster
-rw-r--r--src/Components/MapObjects.tsx1
-rw-r--r--src/Components/PortalPanel.tsx6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Components/MapObjects.tsx b/src/Components/MapObjects.tsx
index 6e9b053..01b23ab 100644
--- a/src/Components/MapObjects.tsx
+++ b/src/Components/MapObjects.tsx
@@ -59,6 +59,7 @@ class MapObjects extends PureComponent<Props> {
onPress={() => onPortalClick(guid, entity.coords)}
style={[selected ? { borderColor: 'red', borderWidth: 4, borderRadius: 13 } : null, { height: 26, width: 26, flex: 1, justifyContent: "center", alignItems: 'center' }]}
zIndex={selected ? 10 : entity.level}
+ anchor={{ x: 0.5, y: 0.5 }}
>
<Image
source={PORTALS[entity.fraction + entity.level]}
diff --git a/src/Components/PortalPanel.tsx b/src/Components/PortalPanel.tsx
index 30564ca..89f0fee 100644
--- a/src/Components/PortalPanel.tsx
+++ b/src/Components/PortalPanel.tsx
@@ -1,5 +1,5 @@
import React, { Component, PureComponent } from 'react';
-import { StyleSheet, View, Text, GestureResponderEvent, ActivityIndicator, Image, Dimensions, Button, Linking } from 'react-native';
+import { StyleSheet, View, Text, GestureResponderEvent, ActivityIndicator, Image, Dimensions, Button, Linking, ScrollView } from 'react-native';
// import { Button } from 'react-native-vector-icons/FontAwesome';
import { getStatusBarHeight } from '../helper';
import { connect } from 'react-redux';
@@ -35,7 +35,7 @@ class PortalPanel extends PureComponent<Props> {
return <ActivityIndicator />
}
return (
- <View style={styles.overlay}>
+ <ScrollView style={styles.overlay}>
<View style={styles.panelRow}>
<Image style={styles.photo} source={{ uri: portal.photo }} />
<View style={styles.panelRight}>
@@ -69,7 +69,7 @@ class PortalPanel extends PureComponent<Props> {
<Button onPress={() => Linking.openURL(NavTo(portal.coords.latitude, portal.coords.longitude, portal.name, '2gis'))} title={'2ГИС'} />
<Button onPress={() => Linking.openURL(NavTo(portal.coords.latitude, portal.coords.longitude, portal.name, 'default'))} title={'Другие карты/навигаторы'} />
</View>
- </View>
+ </ScrollView>
);
}
}