Merge branch 'master' of https://github.com/HiThereCommunity/VRTextRe…

…ader
HiThereCommunity · May 20, 2017 · bda0a52 · bda0a52
2 parents 388c34f + 8ef6736
commit bda0a52
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/components/detail.js b/components/detail.js
@@ -47,7 +47,7 @@ export default class VRTextReader extends React.Component {
         //$FlowFixMe
         this._start = this._start.bind(this);
         //$FlowFixMe
-        //this._pauze - this._pauze.bind(this);
+        this._pauze - this._pauze.bind(this);
 
         this.state = {
             intervalId: 0,
@@ -127,6 +127,20 @@ export default class VRTextReader extends React.Component {
     render() {
         return (
             <View>
+                <View style={{
+                    flex: 1,
+                    flexDirection: "row",
+                    width: 5,
+                    alignItems: "left",
+                    transform: [{ translate: [-4, 1, -5] }],
+                    marginBottom: 0.1
+                }}>
+                    <VrButton
+                        style={{ width: 1.7, height: 0.3 }}
+                        onClick={this.props.backPressed}>
+                        <Text style={{ fontSize: 0.2, textAlign: "left" }}>Back</Text>
+                    </VrButton>
+                </View>
                 <Profile speaker={this.props.speaker} />
                 <View
                     style={{
@@ -164,7 +178,7 @@ export default class VRTextReader extends React.Component {
                     backgroundColour: 'white',
                     transform: [{ translate: [-4, 1, -5] }]
                 }}>
-                    <View style={{ margin: 0, height: 1, width: 2 }}>
+                    <View style={{ marginLeft: 0.3, height: 1, width: 2 }}>
                         <Text style={{ fontSize: 0.6, textAlign: 'right', color: 'white' }}>{this.state.leftPartOfWord}</Text>
                     </View>
                     <View style={{ margin: 0, height: 1 }}>
@@ -174,20 +188,6 @@ export default class VRTextReader extends React.Component {
                         <Text style={{ fontSize: 0.6, textAlign: 'left', color: 'white' }}>{this.state.rightPartOfWord}</Text>
                     </View>
                 </View>
-                <View style={{
-                    flex: 1,
-                    flexDirection: "row",
-                    width: 5,
-                    alignItems: "stretch",
-                    transform: [{ translate: [-4, 1, -5] }],
-                    marginBottom: 0.1
-                }}>
-                    <VrButton
-                        style={{ width: 1.7, height: 0.3, backgroundColor: "grey" }}
-                        onClick={this.props.backPressed}>
-                        <Text style={{ fontSize: 0.2, textAlign: "center" }}>Back</Text>
-                    </VrButton>
-                </View>
             </View>
         );
     }

diff --git a/components/profile.js b/components/profile.js
@@ -25,8 +25,7 @@ export default class ViewColoredBoxesWithText extends Component {
   props: Props;
 
   render() {
-    const { avatarUrl, name } = this.props.speaker;
-
+    const { avatarUrl, name, talks } = this.props.speaker;
     return (
         <View
           style={{
@@ -38,13 +37,16 @@ export default class ViewColoredBoxesWithText extends Component {
             marginBottom: 0.1
           }}
         >
-          <View style={{ marginRight: 1, height: 2, width: 2, backgroundColor: "white" }}>
+          <View style={{ marginRight: 0.2, height: 2, width: 2 }}>
             <Image source={{ uri: avatarUrl }} style={{ width: 2, height: 2 }}/>
           </View>
           <View
-            style={{ width: 2, height: 2, backgroundColor: "grey" }}
+            style={{ width: 3, height: 2}}
           >
-            <Text style={{ fontSize: 0.2, textAlign: "center" }}>{name}</Text>
+            <Text style={{ fontSize: 0.2, textAlign: "left" }}>Name:</Text>
+            <Text style={{ fontSize: 0.2, textAlign: "left", marginBottom: 0.1 }}>{name}</Text>
+            <Text style={{ fontSize: 0.2, textAlign: "left" }}>Talk:</Text>
+            <Text style={{ fontSize: 0.2, textAlign: "left" }}>{talks[0].title}</Text>
           </View>
         </View>
     );

diff --git a/components/speaker.js b/components/speaker.js
@@ -31,7 +31,6 @@ export default class Speaker extends Component {
   render() {
     const { props } = this;
     const { selected } = this.state;
-    console.log("render");
     const url = props.profileUrl ? props.profileUrl : defaultURL;
     return (
       <View
@@ -49,12 +48,12 @@ export default class Speaker extends Component {
       >
         <VrButton onClick={props.onClick}>
           <View>
+            <View style={{backgroundColor:'black'}}>
             <Image
               source={{ uri: url }}
               style={{
                 width: 1,
                 height: 1,
-                backgroundColor: "black",
                 opacity: selected ? 1 : 0.5
               }}
             />
@@ -89,6 +88,7 @@ export default class Speaker extends Component {
               >
                 {props.title}
               </Text>
+              </View>
             </View>
           </View>
         </VrButton>

diff --git a/components/speakerList.js b/components/speakerList.js
@@ -48,16 +48,14 @@ export default class VRTextReader extends React.Component {
         delta = -1;
       } else if (index > selectedSpeakerIndex + 2) {
         delta = 1;
-      } else {
-        delta = 0;
       }
 
       return {
         profileUrl,
         title,
         name,
         onLook: () => {
-          if (delta !== 0) {
+          if (delta) {
             this.setState({
               offset: this.state.offset - delta
             });