Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.0.2 #30

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
buildscript {
def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}

allprojects {
repositories {
mavenLocal()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
maven {
// For developing the library outside the context of the example app, expect `react-native`
// to be installed at `./node_modules`.
url "$projectDir/../../react-native-bottom-sheet-behavior/example/node_modules/react-native/android"
}
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion "23.0.1"
compileSdkVersion safeExtGet('compileSdkVersion', 25)
buildToolsVersion safeExtGet('buildToolsVersion', '23.0.1')

defaultConfig {
minSdkVersion 16
targetSdkVersion 25
minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 25)
versionCode 1
versionName "1.0"
versionName '1.0'
}
lintOptions {
abortOnError false
Expand All @@ -29,8 +35,11 @@ repositories {
mavenCentral()
}

def supportLibraryVersion = safeExtGet('supportLibraryVersion', '25.3.1')

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion"
//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+'
}
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ public void fling(int velocityY) {
postInvalidateOnAnimation();

// END FB SCROLLVIEW CHANGE
} else {
super.fling(velocityY);
}
//Fixed fling issue on support library 26 (see issue https://github.com/cesardeazevedo/react-native-nested-scroll-view/issues/16)
super.fling(velocityY);

if (mSendMomentumEvents || isScrollPerfLoggingEnabled()) {
mFlinging = true;
Expand Down
6 changes: 3 additions & 3 deletions lib/NestedScrollView.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ const {

const createReactClass = require('create-react-class');
const PropTypes = require('prop-types');
const ColorPropType = require('react-native/Libraries/StyleSheet/ColorPropType');
const ColorPropType = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedColorPropType');
const ScrollResponder = require('react-native/Libraries/Components/ScrollResponder');
const ScrollViewStickyHeader = require('react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader');
const StyleSheetPropType = require('react-native/Libraries/StyleSheet/StyleSheetPropType');
const StyleSheetPropType = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedStyleSheetPropType');
const flattenStyle = require('react-native/Libraries/StyleSheet/flattenStyle');
const ViewStylePropTypes = require('react-native/Libraries/Components/View/ViewStylePropTypes');
const ViewStylePropTypes = require('react-native/Libraries/DeprecatedPropTypes/DeprecatedViewStylePropTypes');

const dismissKeyboard = require('react-native/Libraries/Utilities/dismissKeyboard');
const invariant = require('fbjs/lib/invariant');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-nested-scroll-view",
"version": "6.0.1",
"version": "6.0.2",
"description": "React Native ScrollView replacement with NestedScrollView",
"main": "index.js",
"keywords": [
Expand Down