From 8196fb7123126b8b4111f77a70f1109fbaad65a4 Mon Sep 17 00:00:00 2001 From: "Thomas F. K. Jorna" Date: Mon, 19 Jul 2021 01:46:36 +0200 Subject: added graph button --- app/components/graph/graph.tsx | 2 +- app/components/index.ts | 3 ++- app/components/local/local.tsx | 11 ++++++----- app/components/tweaks/tweaks.tsx | 25 +++++++++++++++---------- app/screens/graph/graph-screen.tsx | 13 ++++++++++--- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/app/components/graph/graph.tsx b/app/components/graph/graph.tsx index 8b041b5..83cc40a 100644 --- a/app/components/graph/graph.tsx +++ b/app/components/graph/graph.tsx @@ -271,7 +271,7 @@ onLinkHover={handleLinkHover} } return ( - + {!physics.threedim ? ( - Hello - + ) }) diff --git a/app/components/tweaks/tweaks.tsx b/app/components/tweaks/tweaks.tsx index 3bfeb6e..08a5e2a 100644 --- a/app/components/tweaks/tweaks.tsx +++ b/app/components/tweaks/tweaks.tsx @@ -133,10 +133,12 @@ export const Tweaks = observer(function Tweaks(props: TweaksProps): JSX.Element setPhysics({ ...physics, collision: !physics.collision }) }} /> - + { @@ -585,16 +587,19 @@ export const Tweaks = observer(function Tweaks(props: TweaksProps): JSX.Element const styles = StyleSheet.create({ container: { - flex: 1, + //flex: 1, backgroundColor: "#2a2e38", - position: "absolute", - zIndex: 100, - left: 50, - top: 50, - width: 250, - borderRadius: 5, + position: "relative", + zIndex: 5, + marginLeft: "3%", + marginTop: "3%", + maxWidth: 275, + borderRadius: 10, borderStyle: "solid", - maxHeight: "70%", + borderWidth: 10, + borderColor: "#2a2e38", + height: "25%", + maxHeight: "80%", paddingBottom: 20, }, title: { @@ -602,7 +607,7 @@ const styles = StyleSheet.create({ fontSize: 22, fontWeight: "300", marginBottom: 20, - paddingLeft: 20, + paddingLeft: 10, }, header: { backgroundColor: "#2a2e38", diff --git a/app/screens/graph/graph-screen.tsx b/app/screens/graph/graph-screen.tsx index f537128..c578fd4 100644 --- a/app/screens/graph/graph-screen.tsx +++ b/app/screens/graph/graph-screen.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react" import { observer } from "mobx-react-lite" -import { TouchableOpacity, ViewStyle } from "react-native" +import { TouchableOpacity, View, ViewStyle } from "react-native" import { Screen, Text } from "../../components" // import { useNavigation } from "@react-navigation/native" // import { useStores } from "../../models" @@ -22,6 +22,8 @@ const ROOT: ViewStyle = { flex: 1, } +import { LocalButton } from "../../components/" +import { GraphUi } from "../../components/graph-ui/graph-ui" export const GraphScreen = observer(function GraphScreen() { // Pull in one of our MST stores // const { someStore, anotherStore } = useStores() @@ -169,9 +171,14 @@ export const GraphScreen = observer(function GraphScreen() { return null } else { return ( - + + - + + + ) } -- cgit v1.2.3