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

Added ScrollViews to all settings pages (1.5) (#1270)

Browse source 
* Added ScrollViews to all settings pages

* Added alwaysBounceVertical to settings pages
This commit is contained in:
Harrison Healey 2017-12-06 11:38:57 -05:00 committed by enahum
parent e590bbd0c4
commit a5ed41a696
8 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/screens/settings/advanced_settings/advanced_settings.js
View file

@ -8,6 +8,7 @@ import {
ActivityIndicator,
Alert,
Platform,
ScrollView,
Text,
View
} from 'react-native';
@ -120,7 +121,10 @@ class AdvancedSettings extends PureComponent {
return (
<View style={style.container}>
<StatusBar/>
<View style={style.wrapper}>
<ScrollView
contentContainerStyle={style.wrapper}
alwaysBounceVertical={false}
>
<View style={style.divider}/>
<SettingsItem
defaultMessage='Reset Cache'
@ -145,7 +149,7 @@ class AdvancedSettings extends PureComponent {
theme={theme}
/>
<View style={style.divider}/>
</View>
</ScrollView>
</View>
);
}
@ -159,7 +163,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
wrapper: {
backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
flex: 1,
...Platform.select({
ios: {
paddingTop: 35

9
app/screens/settings/general/settings.js
View file

@ -8,6 +8,7 @@ import {
InteractionManager,
Linking,
Platform,
ScrollView,
View
} from 'react-native';
import DeviceInfo from 'react-native-device-info';
@ -214,7 +215,10 @@ class Settings extends PureComponent {
return (
<View style={style.container}>
<StatusBar/>
<View style={style.wrapper}>
<ScrollView
alwaysBounceVertical={false}
contentContainerStyle={style.wrapper}
>
<View style={style.divider}/>
<SettingsItem
defaultMessage='Notifications'
@ -301,7 +305,7 @@ class Settings extends PureComponent {
/>
<View style={style.divider}/>
</View>
</View>
</ScrollView>
</View>
);
}
@ -315,7 +319,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
wrapper: {
backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
flex: 1,
...Platform.select({
ios: {
paddingTop: 35

9
app/screens/settings/notification_settings/notification_settings.js
View file

@ -8,6 +8,7 @@ import {
Alert,
Modal,
Platform,
ScrollView,
TouchableOpacity,
View
} from 'react-native';
@ -341,7 +342,10 @@ class NotificationSettings extends PureComponent {
return (
<View style={style.container}>
<StatusBar/>
<View style={style.wrapper}>
<ScrollView
contentContainerStyle={style.wrapper}
alwaysBounceVertical={false}
>
<View style={style.divider}/>
<SettingsItem
defaultMessage='Mentions and Replies'
@ -374,7 +378,7 @@ class NotificationSettings extends PureComponent {
theme={theme}
/>
<View style={style.divider}/>
</View>
</ScrollView>
{this.renderEmailNotificationSettings(style)}
</View>
);
@ -389,7 +393,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
wrapper: {
backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
flex: 1,
...Platform.select({
ios: {
paddingTop: 35

1
app/screens/settings/notification_settings_email/notification_settings_email.js
View file

@ -212,6 +212,7 @@ export default class NotificationSettingsEmail extends PureComponent {
<ScrollView
style={style.scrollView}
contentContainerStyle={style.scrollViewContent}
alwaysBounceVertical={false}
>
{this.renderEmailSection()}
</ScrollView>

1
app/screens/settings/notification_settings_mentions/notification_settings_mentions.ios.js
View file

@ -199,6 +199,7 @@ class NotificationSettingsMentionsIos extends NotificationSettingsMentionsBase {
<ScrollView
style={style.scrollView}
contentContainerStyle={style.scrollViewContent}
alwaysBounceVertical={false}
>
{this.renderMentionSection(style)}
{this.renderReplySection(style)}

10
app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
View file

@ -2,7 +2,7 @@
// See License.txt for license information.
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
import {ScrollView, View} from 'react-native';
import FormattedText from 'app/components/formatted_text';
import StatusBar from 'app/components/status_bar';
@ -68,7 +68,10 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
return (
<View style={style.container}>
<StatusBar/>
<View style={style.wrapper}>
<ScrollView
contentContainerStyle={style.wrapper}
alwaysBounceVertical={false}
>
<View style={style.inputContainer}>
<TextInputWithLocalizedPlaceholder
autoFocus={true}
@ -93,7 +96,7 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
style={style.help}
/>
</View>
</View>
</ScrollView>
</View>
);
}
@ -106,7 +109,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
backgroundColor: theme.centerChannelBg
},
wrapper: {
flex: 1,
backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
paddingTop: 35
},

1
app/screens/settings/notification_settings_mobile/notification_settings_mobile.android.js
View file

@ -639,6 +639,7 @@ class NotificationSettingsMobileAndroid extends NotificationSettingsMobileBase {
<ScrollView
style={style.scrollView}
contentContainerStyle={style.scrollViewContent}
alwaysBounceVertical={false}
>
{this.renderMobilePushSection()}
<View style={style.separator}/>

1
app/screens/settings/notification_settings_mobile/notification_settings_mobile.ios.js
View file

@ -153,6 +153,7 @@ class NotificationSettingsMobileIos extends NotificationSettingsMobileBase {
<ScrollView
style={style.scrollView}
contentContainerStyle={style.scrollViewContent}
alwaysBounceVertical={false}
>
{this.renderMobilePushSection(style)}
{this.renderMobilePushStatusSection(style)}