diff --git a/App.js b/App.js index 7be2359..b300b58 100644 --- a/App.js +++ b/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() { - - + ); @@ -330,27 +330,14 @@ const DeviceScreenStack = (props) => { ); }; -const FaqScreenStack = (props) => { +const HelpScreenStack = (props) => { const { t } = useTranslation(); return ( - ); -}; - -const FeedbackScreenStack = (props) => { - const { t } = useTranslation(); - - return ( - ); diff --git a/locales/de.json b/locales/de.json index 79af7cb..303f963 100644 --- a/locales/de.json +++ b/locales/de.json @@ -7,8 +7,7 @@ "sideBar": { "devicesTitle": "Geräte", "settings": "Einstellungen", - "faq": "FAQ", - "feedback": "Feedback geben" + "help": "Hilfe" }, "screens": { "device": { @@ -101,11 +100,8 @@ } } }, - "faq": { - "pageTitle": "FAQ" - }, - "feedback": { - "pageTitle": "Feedback geben" + "help": { + "pageTitle": "Hilfe" }, "settings": { "pageTitle": "Einstellungen", diff --git a/locales/en.json b/locales/en.json index 9f9a3f6..fb94dcd 100644 --- a/locales/en.json +++ b/locales/en.json @@ -7,8 +7,7 @@ "sideBar": { "devicesTitle": "Devices", "settings": "Settings", - "faq": "FAQ", - "feedback": "Give feedback" + "help": "Help" }, "screens": { "device": { @@ -101,11 +100,8 @@ } } }, - "faq": { - "pageTitle": "FAQ" - }, - "feedback": { - "pageTitle": "Give Feedback" + "help": { + "pageTitle": "Help" }, "settings": { "pageTitle": "Settings", diff --git a/src/Components/SideBar/index.js b/src/Components/SideBar/index.js index c66a2a6..febe962 100644 --- a/src/Components/SideBar/index.js +++ b/src/Components/SideBar/index.js @@ -154,16 +154,10 @@ export default function Sidebar(props) { props.navigation.navigate("FAQ")} - iconName="frequently-asked-questions" - routeName="FAQ" - /> - props.navigation.navigate("Feedback")} - iconName="comment-quote" - routeName="Feedback" + label={t("sideBar.help")} + onPress={() => props.navigation.navigate("Help")} + iconName="help-circle" + routeName="Help" /> + FAQ + Give Feedback + + ); +}