From 9e95d5acf767040914d996a43305d7fce35d2e8b Mon Sep 17 00:00:00 2001
From: Sebastian-Webster <84299475+Sebastian-Webster@users.noreply.github.com>
Date: Fri, 16 Feb 2024 23:56:29 +1300
Subject: [PATCH] fix: CategoryViewPage back button is no longer misplaced when
 uploading posts

---
 components/TopNavBar.js     |  5 +++--
 screens/CategoryViewPage.js | 35 ++++++++++++++---------------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/components/TopNavBar.js b/components/TopNavBar.js
index 1a55749..9d2a329 100644
--- a/components/TopNavBar.js
+++ b/components/TopNavBar.js
@@ -13,11 +13,12 @@ const TopNavBar = ({extraStyles = {}, rightIcon, screenName, hideBackButton, hid
     const {colors} = useTheme();
     const navigation = useNavigation();
 
+
     return (
-        <ChatScreen_Title style={[{backgroundColor: colors.primary, borderWidth: 0, paddingTop: StatusBarHeight + 10}, extraStyles]}>
+        <ChatScreen_Title style={[{backgroundColor: colors.primary, borderWidth: 0, paddingTop: StatusBarHeight, height: 'auto', paddingBottom: 5}, extraStyles]}>
             {hideBackButton ? null :
                 leftIcon || (
-                    <Navigator_BackButton style={{paddingTop: StatusBarHeight + 2}} onPress={() => {navigation.goBack()}}>
+                    <Navigator_BackButton style={{paddingTop: StatusBarHeight - 8}} onPress={() => {navigation.goBack()}}>
                         {leftIconChild || (
                             <Image
                                 source={require('../assets/app_icons/back_arrow.png')}
diff --git a/screens/CategoryViewPage.js b/screens/CategoryViewPage.js
index 8f9d1ec..61630bb 100644
--- a/screens/CategoryViewPage.js
+++ b/screens/CategoryViewPage.js
@@ -61,12 +61,10 @@ import {
     MsgBox,
     ImagePostTextFrame,
     CategoriesTopBtns,
-    Navigator_BackButton
+    Navigator_BackButton,
+    TestText
 } from '../screens/screenStylings/styling';
 
-// Colors
-const {brand, primary, tertiary, greyish, darkLight, slightlyLighterPrimary, descTextColor, darkest, red} = Colors;
-
 // async-storage
 import AsyncStorage from '@react-native-async-storage/async-storage';
 
@@ -90,6 +88,7 @@ import usePostReducer from '../hooks/usePostReducer';
 import ParseErrorMessage from '../components/ParseErrorMessage';
 
 import Ionicons from 'react-native-vector-icons/Ionicons.js';
+import TopNavBar from '../components/TopNavBar.js';
 
 const CategoryViewPage = ({route, navigation}) => {
     const {colors, dark, indexNum} = useTheme()
@@ -492,23 +491,17 @@ const CategoryViewPage = ({route, navigation}) => {
                 <>
                     {displayAgeRequirementWarning == false ?
                         <>
-                            <View style={{paddingTop: StatusBarHeight - 15, color: colors.primary, flexDirection: 'row', justifyContent: 'center'}}>
-                                <Navigator_BackButton onPress={() => {navigation.goBack()}}>
-                                    <Image
-                                        source={require('../assets/app_icons/back_arrow.png')}
-                                        style={{minHeight: 40, minWidth: 40, width: 40, height: 40, maxWidth: 40, maxHeight: 40, borderRadius: 40/2, tintColor: colors.tertiary, top: -11}}
-                                        resizeMode="contain"
-                                        resizeMethod="resize"
-                                    />
-                                </Navigator_BackButton>
-                                {categoryData.NSFW == true && (
-                                    <SubTitle style={{color: red, marginBottom: 0, marginTop: 15}}>(NSFW)</SubTitle>
-                                )}
-                                {categoryData.NSFL == true && (
-                                    <SubTitle style={{color: red, marginBottom: 0, marginTop: 15}}>(NSFL)</SubTitle>
-                                )}
-                                <PageTitle style={{fontSize: 26}} welcome={true}>{categoryData.categoryTitle || "Couldn't get name"}</PageTitle>
-                            </View>
+                            <TopNavBar screenName={
+                                <>
+                                    {categoryData.NSFW == true && (
+                                        <SubTitle style={{color: colors.red, marginBottom: 0}}>(NSFW)</SubTitle>
+                                    )}
+                                    {categoryData.NSFL == true && (
+                                        <SubTitle style={{color: colors.red, marginBottom: 0}}>(NSFL)</SubTitle>
+                                    )}
+                                    <TestText style={{color: colors.tertiary}}>{categoryData.categoryTitle || "Couldn't get name"}</TestText>
+                                </>
+                            }/>
                             {selectedPostFormat == "One" && (<FlatList
                                 data={threads.posts}
                                 keyExtractor={(item) => item._id}