Skip to content

Commit

Permalink
Merge branch 'master' into issue/3258
Browse files Browse the repository at this point in the history
* master:
  Remove Gradle warning (#3284)
  Typings: RouterProps createReducer, onStateChange, getSceneStyle, uriPrefix; Reducer. (#3281)
  fix: add right title to ts definition (#3279)
  • Loading branch information
daviscabral committed Sep 21, 2018
2 parents 3756349 + 7acfcc5 commit cd27625
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
6 changes: 3 additions & 3 deletions examples/react-native/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ android {
}

dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
compile "com.facebook.react:react-native:+" // From node_modules
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
implementation "com.facebook.react:react-native:+" // From node_modules
}

// Run this once to be able to run the application with BUCK
Expand Down
19 changes: 14 additions & 5 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,22 @@ import { StyleProp, Image, ViewStyle, TextStyle, ImageStyle } from 'react-native
export var Router: RouterStatic;
export type Router = RouterStatic;

// Reducer
export var Reducer: any;
export type Reducer = any;

// Router
interface RouterProps extends React.Props<Router> {
sceneStyle?: StyleProp<ViewStyle>;
backAndroidHandler?: Function;
wrapBy?: Function;
scenes?: any;
sceneStyle?: StyleProp<ViewStyle>;
backAndroidHandler?: Function;
wrapBy?: Function;
scenes?: any;
createReducer?: Function;
onStateChange?: Function;
getSceneStyle?: Function;
uriPrefix?: string;
}
interface RouterStatic extends React.ComponentClass<RouterProps> {}
interface RouterStatic extends React.ComponentClass<RouterProps> { }

// Scene
export var Scene: SceneStatic;
Expand Down Expand Up @@ -50,6 +58,7 @@ interface SceneProps extends React.Props<Scene> {
renderLeftButton?: React.ComponentType<any>;
renderRightButton?: React.ComponentType<any>;
renderBackButton?: React.ComponentType<any>;
rightTitle?: string;
rightButtonImage?: Image;
rightButtonTextStyle?: StyleProp<TextStyle>;
success?: (() => void) | string;
Expand Down

0 comments on commit cd27625

Please sign in to comment.