diff --git a/src/lib/constants.ts b/src/lib/constants.ts new file mode 100644 index 0000000000..f8bf5e14f5 --- /dev/null +++ b/src/lib/constants.ts @@ -0,0 +1,2 @@ +export const FEEDBACK_FORM_URL = + 'https://docs.google.com/forms/d/e/1FAIpQLSdavFRXTdB6tRobaFrRR2A1gv3b-IBHwQkBmNZTRpoqmcrPrQ/viewform?usp=sf_link' diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx index 7c8488f901..69ec5a28d3 100644 --- a/src/view/screens/Settings.tsx +++ b/src/view/screens/Settings.tsx @@ -8,6 +8,7 @@ import { } from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {observer} from 'mobx-react-lite' +import VersionNumber from 'react-native-version-number' import {useStores} from '../../state' import {ScreenParams} from '../routes' import {s} from '../lib/styles' @@ -181,6 +182,10 @@ export const Settings = observer(function Settings({ title="Debug tools"> Storybook + + Build version {VersionNumber.appVersion} ({VersionNumber.buildVersion} + ) + diff --git a/src/view/shell/mobile/Menu.tsx b/src/view/shell/mobile/Menu.tsx index 9a9ad6d762..066c6af363 100644 --- a/src/view/shell/mobile/Menu.tsx +++ b/src/view/shell/mobile/Menu.tsx @@ -1,6 +1,6 @@ import React from 'react' import { - ScrollView, + Linking, StyleProp, StyleSheet, TouchableOpacity, @@ -8,8 +8,12 @@ import { ViewStyle, } from 'react-native' import {observer} from 'mobx-react-lite' -import VersionNumber from 'react-native-version-number' +import { + FontAwesomeIcon, + FontAwesomeIconStyle, +} from '@fortawesome/react-native-fontawesome' import {s, colors} from '../../lib/styles' +import {FEEDBACK_FORM_URL} from '../../../lib/constants' import {useStores} from '../../../state' import { HomeIcon, @@ -49,6 +53,11 @@ export const Menu = observer(({onClose}: {onClose: () => void}) => { } } + const onPressFeedback = () => { + track('Menu:FeedbackClicked') + Linking.openURL(FEEDBACK_FORM_URL) + } + // rendering // = @@ -97,7 +106,13 @@ export const Menu = observer(({onClose}: {onClose: () => void}) => { } return ( - + onNavigate(`/profile/${store.me.handle}`)} @@ -176,20 +191,31 @@ export const Menu = observer(({onClose}: {onClose: () => void}) => { onPress={onDarkmodePress} /> + - - Build version {VersionNumber.appVersion} ({VersionNumber.buildVersion} - ) - + + } + label="Feedback" + onPress={onPressFeedback} + /> - - + ) }) const styles = StyleSheet.create({ view: { flex: 1, + paddingBottom: 90, + }, + viewMinimalShell: { + paddingBottom: 50, }, section: { paddingHorizontal: 10, @@ -266,7 +292,6 @@ const styles = StyleSheet.create({ }, footer: { - paddingHorizontal: 14, - paddingVertical: 18, + paddingHorizontal: 10, }, })