diff --git a/src/components/navigation/navigators.js b/src/components/navigation/navigators.js
index 7bb8775..af1c131 100644
--- a/src/components/navigation/navigators.js
+++ b/src/components/navigation/navigators.js
@@ -1,26 +1,34 @@
import React from "react";
-import { View } from "react-native";
+import { SafeAreaView } from "react-native";
import { ScrollView } from "react-native-gesture-handler";
+import { StatusBarSpace } from "src/interface/rendering";
import BackBarJsx from "./back-bar";
import TrayJsx from "src/components/navigation/tray";
export const ScreenWithTrayJsx = (props) => {
return (
-
+
+
{ props.children }
-
-
+
-
+
);
};
export const ScreenWithBackBarJsx = (props) => {
return (
-
+
+
{ props.renderBackBar != undefined
? props.renderBackBar()
@@ -30,13 +38,14 @@ export const ScreenWithBackBarJsx = (props) => {
{ props.children }
-
+
);
};
export const ScreenWithFullNavigationJsx = (props) => {
return (
-
+
+
{ props.renderBackBar != undefined
? props.renderBackBar()
@@ -49,6 +58,6 @@ export const ScreenWithFullNavigationJsx = (props) => {
-
+
);
};
diff --git a/src/components/pages/direct/conversation.js b/src/components/pages/direct/conversation.js
index 0dac471..37bc281 100644
--- a/src/components/pages/direct/conversation.js
+++ b/src/components/pages/direct/conversation.js
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react";
import {
View,
+ SafeAreaView,
Text,
Image,
TextInput,
@@ -24,8 +25,7 @@ import {
const { SlideInMenu } = renderers;
import BackBarJsx from "src/components/navigation/back-bar";
-
-import { timeToAge } from "src/interface/rendering";
+import { timeToAge, StatusBarSpace } from "src/interface/rendering";
const TEST_IMAGE_1 = "https://cache.desktopnexus.com/thumbseg/2255/2255124-bigthumbnail.jpg";
const TEST_IMAGE_2 = "https://natureproducts.net/Forest_Products/Cutflowers/Musella_cut.jpg";
@@ -47,7 +47,8 @@ const TEST_MESSAGES = [
];
const ConversationContainerJsx = (props) => (
-
+
+
{ props.renderBackBar() }
@@ -76,7 +77,7 @@ const ConversationContainerJsx = (props) => (
color = "black" />
-
+
);
const ComposeJsx = ({ navigation }) => {
diff --git a/src/components/pages/discover.js b/src/components/pages/discover.js
index ab2cffe..26b3c1c 100644
--- a/src/components/pages/discover.js
+++ b/src/components/pages/discover.js
@@ -59,7 +59,8 @@ const DiscoverJsx = (props) => {
return (
+ navigation = { props.navigation }
+ statusBarColor = "white">
props.navigation.navigate("Search") }>
diff --git a/src/components/pages/discover/search.js b/src/components/pages/discover/search.js
index c3b5d39..20810f3 100644
--- a/src/components/pages/discover/search.js
+++ b/src/components/pages/discover/search.js
@@ -1,6 +1,9 @@
import React, { useState } from "react";
import { View, TextInput, Text, Dimensions, Image } from "react-native";
+
+import { StatusBarSpace } from "src/interface/rendering";
import { ScreenWithTrayJsx } from "src/components/navigation/navigators";
+
import { TouchableWithoutFeedback } from "react-native-gesture-handler";
const TEST_IMAGE = "https://cache.desktopnexus.com/thumbseg/2255/2255124-bigthumbnail.jpg";
@@ -49,8 +52,9 @@ const SearchJsx = ({navigation}) => {
return (
+ active = "Discover"
+ navigation = { navigation }>
+
{
return (
<>
{ state.loaded ?
-
+
+
{ state.loaded
@@ -280,7 +288,7 @@ const ViewCommentsJsx = (props) => {
-
+
: <>>
}
>
diff --git a/src/interface/rendering.js b/src/interface/rendering.js
index 96c3569..d8f55b2 100644
--- a/src/interface/rendering.js
+++ b/src/interface/rendering.js
@@ -1,3 +1,15 @@
+import React from "react";
+import { View, StatusBar } from "react-native";
+
+export function StatusBarSpace(props) {
+ return ;
+};
+
export function withoutHTML(string) {
return string.replace(/<[^>]*>/ig, "");
}