toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix About dialog layout (#1985)

Browse source
This commit is contained in:
Elias Nahum 2018-08-09 08:32:47 -04:00 committed by GitHub
parent 70f8fb580d
commit f2d21f585c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/screens/about/about.js
View file

@ -243,7 +243,7 @@ export default class About extends PureComponent {
platform: (
<FormattedText
id='mobile.notice_platform_link'
defaultMessage='platform'
defaultMessage='server'
style={style.noticeLink}
onPress={this.handlePlatformNotice}
/>
@ -265,20 +265,20 @@ export default class About extends PureComponent {
<FormattedText
id='about.hash'
defaultMessage='Build Hash:'
style={style.footerText}
style={style.footerTitleText}
/>
<Text style={style.footerText}>
{'\u00a0' + config.BuildHash}
{config.BuildHash}
</Text>
</View>
<View style={style.footerGroup}>
<FormattedText
id='about.hashee'
defaultMessage='EE Build Hash:'
style={style.footerText}
style={style.footerTitleText}
/>
<Text style={style.footerText}>
{'\u00a0' + config.BuildHashEnterprise}
{config.BuildHashEnterprise}
</Text>
</View>
</View>
@ -286,10 +286,10 @@ export default class About extends PureComponent {
<FormattedText
id='about.date'
defaultMessage='Build Date:'
style={style.footerText}
style={style.footerTitleText}
/>
<Text style={style.footerText}>
{'\u00a0' + config.BuildDate}
{config.BuildDate}
</Text>
</View>
</View>
@ -325,7 +325,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
titleContainer: {
flex: 1,
flexDirection: 'row',
marginBottom: 20,
},
title: {
@ -375,7 +374,12 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
footerGroup: {
flex: 1,
flexDirection: 'row',
},
footerTitleText: {
color: changeOpacity(theme.centerChannelColor, 0.5),
fontSize: 11,
fontWeight: '600',
lineHeight: 13,
},
footerText: {
color: changeOpacity(theme.centerChannelColor, 0.5),

2
assets/base/i18n/en.json
View file

@ -2482,7 +2482,7 @@
"mobile.more_dms.title": "New Conversation",
"mobile.more_dms.you": "(@{username} - you)",
"mobile.notice_mobile_link": "mobile apps",
"mobile.notice_platform_link": "platform",
"mobile.notice_platform_link": "server",
"mobile.notice_text": "Mattermost is made possible by the open source software used in our {platform} and {mobile}.",
"mobile.notification.in": " in ",
"mobile.notification_settings.auto_responder": "Automatic Direct Message Replies",