diff --git a/src/components/Home/ActionsDashboardItem.js b/src/components/Home/ActionsDashboardItem.js index e4eb1ef..2e6049a 100644 --- a/src/components/Home/ActionsDashboardItem.js +++ b/src/components/Home/ActionsDashboardItem.js @@ -2,7 +2,7 @@ import * as React from 'react'; import {Avatar, Card, List, withTheme} from 'react-native-paper'; -import {StyleSheet} from "react-native"; +import {StyleSheet, View} from "react-native"; import {DrawerNavigationProp} from "@react-navigation/drawer"; import type {CustomTheme} from "../../managers/ThemeManager"; import i18n from 'i18n-js'; @@ -25,31 +25,42 @@ class ActionsDashBoardItem extends React.Component { render() { const isLoggedIn = this.props.isLoggedIn; return ( - + + + } + right={props => } + onPress={isLoggedIn + ? () => this.props.navigation.navigate("services", { + screen: 'index' + }) + : () => this.props.navigation.navigate("login")} + style={styles.list} + /> + } - right={props => } - onPress={isLoggedIn - ? () => this.props.navigation.navigate("services", { - screen: 'index' - }) - : () => this.props.navigation.navigate("login")} - style={styles.list} + title={i18n.t("feedbackScreen.homeButtonTitle")} + description={i18n.t("feedbackScreen.homeButtonSubtitle")} + left={props => } + right={props => } + onPress={() => this.props.navigation.navigate("feedback")} + style={{...styles.list, marginLeft: 10, marginRight: 10}} /> - + + ); } } @@ -57,9 +68,7 @@ class ActionsDashBoardItem extends React.Component { const styles = StyleSheet.create({ card: { width: 'auto', - marginLeft: 10, - marginRight: 10, - marginTop: 10, + margin: 10, borderWidth: 1, }, avatar: { diff --git a/src/screens/About/AboutScreen.js b/src/screens/About/AboutScreen.js index ada3967..c0b2cd6 100644 --- a/src/screens/About/AboutScreen.js +++ b/src/screens/About/AboutScreen.js @@ -69,7 +69,7 @@ class AboutScreen extends React.Component { { onPressCallback: () => this.props.navigation.navigate("feedback"), icon: 'bug', - text: i18n.t('screens.feedback'), + text: i18n.t("feedbackScreen.homeButtonTitle"), showChevron: true }, { diff --git a/src/screens/Other/FeedbackScreen.js b/src/screens/Other/FeedbackScreen.js index ab82571..3acb8e0 100644 --- a/src/screens/Other/FeedbackScreen.js +++ b/src/screens/Other/FeedbackScreen.js @@ -31,12 +31,16 @@ class FeedbackScreen extends React.Component { getButtons(isBug: boolean) { return ( - +