Skip to content

Commit

Permalink
updated way to much but it works
Browse files Browse the repository at this point in the history
  • Loading branch information
marukami committed May 17, 2017
1 parent c75e54c commit ed557a6
Show file tree
Hide file tree
Showing 8 changed files with 625 additions and 121 deletions.
6 changes: 6 additions & 0 deletions .buckconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[android]
target = Google Inc.:Google APIs:23

[maven_repositories]
central = https://repo1.maven.org/maven2
Empty file added .gitattributes
Empty file.
Empty file added .watchmanconfig
Empty file.
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 25
buildToolsVersion "25.0.3"

defaultConfig {
applicationId "com.reactconf2017"
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 25
versionCode 8
versionName "1.0.16"
ndk {
Expand Down
18 changes: 11 additions & 7 deletions app/ReactConf2017.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow
import React, { Component } from 'react';
import { AppState, Navigator, StatusBar, StyleSheet } from 'react-native';
import { Navigator } from 'react-native-deprecated-custom-components';
import { AppState, StatusBar, StyleSheet } from 'react-native';
import codePush from 'react-native-code-push';

import theme from './theme';
Expand Down Expand Up @@ -69,18 +70,14 @@ class ReactConf2017 extends Component {
configureScene={configureScene}
initialRoute={{ scene: DEFAULT_VIEW, index: 0 }}
renderScene={renderScene}
sceneStyle={styles.scenes}
sceneStyle={rawStyles.scenes}
style={styles.navigator}
/>
);
}
}

const styles = StyleSheet.create({
navigator: {
backgroundColor: 'black',
flex: 1,
},
const rawStyles = {
scenes: {
backgroundColor: theme.color.sceneBg,
overflow: 'visible',
Expand All @@ -89,6 +86,13 @@ const styles = StyleSheet.create({
shadowOpacity: 0.33,
shadowRadius: 5,
},
};

const styles = StyleSheet.create({
navigator: {
backgroundColor: 'black',
flex: 1,
},
});

module.exports = ReactConf2017;
4 changes: 4 additions & 0 deletions app/scenes/Talk/components/Pane/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ class TalkPreviewNext extends React.Component {
onPress: Function,
};

state = {
animValue: 0,
};

render() {
let { talk, isEngaged, onPress } = this.props;
let preview = <TalkPreview talk={talk} isEngaged={isEngaged} />;
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
"dependencies": {
"moment": "^2.17.1",
"moment-timezone": "^0.5.11",
"react": "15.4.2",
"react-native": "^0.42.0",
"react": "16.0.0-alpha.6",
"react-native": "^0.44.0",
"react-native-blur": "^2.0.0",
"react-native-code-push": "^1.17.0-beta",
"react-native-code-push": "^2.0.3-beta",
"react-native-deprecated-custom-components": "^0.1.0",
"react-native-linear-gradient": "^2.0.0",
"react-native-maps": "airbnb/react-native-maps",
"react-native-smart-splash-screen": "^2.3.3",
Expand Down
Loading

0 comments on commit ed557a6

Please sign in to comment.