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

Android Version Bump to 21 (#416)

Browse source 
* Move to KeyboardAvoidingView in server login and mfa

* Version Bump to 21
This commit is contained in:
enahum 2017-03-29 15:31:37 -03:00 committed by GitHub
parent 442d6b0bc5
commit fae6cafc9b
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -91,7 +91,7 @@ android {
applicationId "com.mattermost.react.native"
minSdkVersion 16
targetSdkVersion 23
versionCode 20
versionCode 21
versionName "1.0"
multiDexEnabled true
ndk {

6
app/scenes/login/login.js
View file

@ -6,6 +6,7 @@ import {injectIntl, intlShape} from 'react-intl';
import {
Image,
Keyboard,
KeyboardAvoidingView,
Platform,
Text,
TextInput,
@ -16,7 +17,6 @@ import Button from 'react-native-button';
import ErrorText from 'app/components/error_text';
import FormattedText from 'app/components/formatted_text';
import KeyboardLayout from 'app/components/layout/keyboard_layout';
import {GlobalStyles} from 'app/styles';
import logo from 'assets/images/logo.png';
@ -227,7 +227,7 @@ class Login extends Component {
render() {
return (
<KeyboardLayout
<KeyboardAvoidingView
behavior='padding'
style={{flex: 1}}
keyboardVerticalOffset={65}
@ -286,7 +286,7 @@ class Login extends Component {
</Button>
</View>
</TouchableWithoutFeedback>
</KeyboardLayout>
</KeyboardAvoidingView>
);
}
}

6
app/scenes/mfa/mfa.js
View file

@ -5,6 +5,7 @@ import React, {Component} from 'react';
import {
Image,
Keyboard,
KeyboardAvoidingView,
Platform,
TouchableWithoutFeedback,
View
@ -13,7 +14,6 @@ import Button from 'react-native-button';
import ErrorText from 'app/components/error_text';
import FormattedText from 'app/components/formatted_text';
import KeyboardLayout from 'app/components/layout/keyboard_layout';
import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
import {GlobalStyles} from 'app/styles';
@ -97,7 +97,7 @@ export default class Mfa extends Component {
render() {
return (
<KeyboardLayout
<KeyboardAvoidingView
behavior='padding'
style={{flex: 1}}
keyboardVerticalOffset={0}
@ -141,7 +141,7 @@ export default class Mfa extends Component {
</Button>
</View>
</TouchableWithoutFeedback>
</KeyboardLayout>
</KeyboardAvoidingView>
);
}
}

7
app/scenes/select_server/select_server.js
View file

@ -5,6 +5,7 @@ import React, {PropTypes, PureComponent} from 'react';
import {
Image,
Keyboard,
KeyboardAvoidingView,
Platform,
StatusBar,
TouchableWithoutFeedback,
@ -20,7 +21,7 @@ import EventEmitter from 'mattermost-redux/utils/event_emitter';
import {SplashScreenTypes} from 'app/constants';
import ErrorText from 'app/components/error_text';
import FormattedText from 'app/components/formatted_text';
import KeyboardLayout from 'app/components/layout/keyboard_layout';
import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
import {GlobalStyles} from 'app/styles';
import {isValidUrl, stripTrailingSlashes} from 'app/utils/url';
@ -121,7 +122,7 @@ export default class SelectServer extends PureComponent {
const error = pingRequest.error || configRequest.error || licenseRequest.error;
return (
<KeyboardLayout
<KeyboardAvoidingView
behavior='padding'
style={{flex: 1}}
keyboardVerticalOffset={0}
@ -165,7 +166,7 @@ export default class SelectServer extends PureComponent {
<ErrorText error={this.state.error || error}/>
</View>
</TouchableWithoutFeedback>
</KeyboardLayout>
</KeyboardAvoidingView>
);
}
}