merged faq and feedback into help

App.js

@@ -35,6 +35,7 @@ import {
 import { EditActionAnimationSelectionModalContent } from "./src/Screens/Device/modals/EditActions";
 import UpdateSceneNameModalContent from "./src/Screens/Device/modals/UpdateSceneName";
 import SettingsChangeDeviceDisplayNameModalContent from "./src/Screens/Device/modals/SettingsChangeDeviceDisplayName";
+import HelpScreen from "./src/Screens/Device/Help";
 
 const Drawer = createDrawerNavigator();
 const Stack = createStackNavigator();
@@ -311,8 +312,7 @@ function MyDrawer() {
 
       <Drawer.Screen name="Old Turtle" component={DeviceOldScreen} />
 
-      <Drawer.Screen name="FAQ" component={FaqScreenStack} />
+      <Drawer.Screen name="Help" component={HelpScreenStack} />
-      <Drawer.Screen name="Feedback" component={FeedbackScreenStack} />
       <Drawer.Screen name="Settings" component={SettingsScreenStack} />
     </Drawer.Navigator>
   );
@@ -330,27 +330,14 @@ const DeviceScreenStack = (props) => {
   );
 };
 
-const FaqScreenStack = (props) => {
+const HelpScreenStack = (props) => {
   const { t } = useTranslation();
 
   return (
     <MyScreenStack
-      name="faq"
+      name="help"
-      pageTitle={t("screens.faq.pageTitle")}
+      pageTitle={t("screens.help.pageTitle")}
-      component={FaqScreen}
+      component={HelpScreen}
-      navigation={props.navigation}
-    />
-  );
-};
-
-const FeedbackScreenStack = (props) => {
-  const { t } = useTranslation();
-
-  return (
-    <MyScreenStack
-      name="feedback"
-      pageTitle={t("screens.feedback.pageTitle")}
-      component={FeedbackScreen}
       navigation={props.navigation}
     />
   );

locales/de.json

@@ -7,8 +7,7 @@
   "sideBar": {
     "devicesTitle": "Geräte",
     "settings": "Einstellungen",
-    "faq": "FAQ",
+    "help": "Hilfe"
-    "feedback": "Feedback geben"
   },
   "screens": {
     "device": {
@@ -101,11 +100,8 @@
         }
       }
     },
-    "faq": {
+    "help": {
-      "pageTitle": "FAQ"
+      "pageTitle": "Hilfe"
-    },
-    "feedback": {
-      "pageTitle": "Feedback geben"
     },
     "settings": {
       "pageTitle": "Einstellungen",

locales/en.json

@@ -7,8 +7,7 @@
   "sideBar": {
     "devicesTitle": "Devices",
     "settings": "Settings",
-    "faq": "FAQ",
+    "help": "Help"
-    "feedback": "Give feedback"
   },
   "screens": {
     "device": {
@@ -101,11 +100,8 @@
         }
       }
     },
-    "faq": {
+    "help": {
-      "pageTitle": "FAQ"
+      "pageTitle": "Help"
-    },
-    "feedback": {
-      "pageTitle": "Give Feedback"
     },
     "settings": {
       "pageTitle": "Settings",

src/Components/SideBar/index.js

@@ -154,16 +154,10 @@ export default function Sidebar(props) {
       <View style={{ justifyContent: "flex-end" }}>
         <Divider style={{ marginLeft: 10, marginRight: 10 }} />
         <MyDrawerItem
-          label={t("sideBar.faq")}
+          label={t("sideBar.help")}
-          onPress={() => props.navigation.navigate("FAQ")}
+          onPress={() => props.navigation.navigate("Help")}
-          iconName="frequently-asked-questions"
+          iconName="help-circle"
-          routeName="FAQ"
+          routeName="Help"
-        />
-        <MyDrawerItem
-          label={t("sideBar.feedback")}
-          onPress={() => props.navigation.navigate("Feedback")}
-          iconName="comment-quote"
-          routeName="Feedback"
         />
         <MyDrawerItem
           label={t("sideBar.settings")}

src/Screens/Device/Help/index.js

@@ -0,0 +1,19 @@
+import { useContext } from "react";
+import { AppContext } from "../../../utils";
+import { Text, View } from "react-native";
+
+export default function HelpScreen() {
+  const appContext = useContext(AppContext);
+
+  return (
+    <View
+      style={{
+        backgroundColor: appContext.appTheme.backgroundColor,
+        height: "100%",
+      }}
+    >
+      <Text style={{ color: appContext.appTheme.text }}>FAQ</Text>
+      <Text style={{ color: appContext.appTheme.text }}>Give Feedback</Text>
+    </View>
+  );
+}