diff --git a/KeyboardView.js b/KeyboardView.js index d82d529..312324a 100644 --- a/KeyboardView.js +++ b/KeyboardView.js @@ -38,12 +38,14 @@ export default class extends Component { onHide: PropTypes.func, hideWhenKeyboardIsDismissed: PropTypes.bool, contentVisible: PropTypes.bool, - keyboardPlaceholderHeight: PropTypes.number + keyboardPlaceholderHeight: PropTypes.number, + stickyViewStyle: PropTypes.object, }; static defaultProps = { hideWhenKeyboardIsDismissed: true, - contentVisible: true + contentVisible: true, + stickyViewStyle: {} }; static dismiss = isIOS ? @@ -96,8 +98,12 @@ export default class extends Component { {cover} </View> {stickyView && ( - <View style={styles.androidInputAvoid}> - {stickyView} + <View style={[{ + marginBottom: 70 + }, this.props.stickyViewStyle]}> + <View style={styles.androidInputAvoid}> + {stickyView} + </View> </View> )} </KeyboardCoverView> diff --git a/android/build.gradle b/android/build.gradle index bfe498b..3a52c8d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,18 +11,18 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "25.0.0" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } - lintOptions { - abortOnError false - } + // lintOptions { + // abortOnError false + // } } repositories { @@ -30,7 +30,10 @@ repositories { jcenter() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$projectDir/../../../node_modules/react-native/android" + // url "$projectDir/../../../node_modules/react-native/android" + // url "$rootDir/../node_modules/react-native/android" + url "$projectDir/../node_modules/react-native/android" + // maven { url "$projectDir/../node_modules/react-native/android" } } }