Fixed merge conflicts

HiThereCommunity · May 20, 2017 · e59c0a0 · e59c0a0
1 parent 22cbab1
commit e59c0a0
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 7 deletions.
diff --git a/components/detail.js b/components/detail.js
@@ -15,19 +15,23 @@ import {
 } from "react-vr";
 import text from "../text";
 import { splitText } from "../utils";
-
-
+import { type Speaker } from "../query";
+import Profile from "./profile";
 
 type State = {
     currentCount: number,
     intervalId: number,
     textArray: Array<string>,
-    start: boolean
+    start: boolean,
+    leftPartOfWord: string,
+    rightPartOfWord: string,
+    highlightedLetter: string
 };
 
 type Props = {
-    backPressed: () => void,
-    description: string
+  backPressed: () => void,
+  description: string,
+  speaker: Speaker
 };
 
 export default class VRTextReader extends React.Component {
@@ -42,7 +46,7 @@ export default class VRTextReader extends React.Component {
         this._timer = this._timer.bind(this);
         //$FlowFixMe
         this._start = this._start.bind(this);
-
+        //$FlowFixMe
         this._pauze - this._pauze.bind(this);
 
         this.state = {
@@ -118,6 +122,7 @@ export default class VRTextReader extends React.Component {
     render() {
         return (
             <View>
+              <Profile speaker={this.props.speaker}/>
                 <View
                     style={{
                         flex: 1,
@@ -174,6 +179,7 @@ export default class VRTextReader extends React.Component {
             </View>
         );
     }
+
 }
 
-AppRegistry.registerComponent("VRTextReader", () => VRTextReader);
+AppRegistry.registerComponent("VRTextReader", () => VRTextReader);
diff --git a/components/profile.js b/components/profile.js
@@ -0,0 +1,53 @@
+//@flow
+
+import React, { Component } from "react";
+import {
+  AppRegistry,
+  asset,
+  Pano,
+  Text,
+  View,
+  VrButton,
+  Image
+  //$FlowFixMe
+} from "react-vr";
+
+import { type Speaker } from "../query";
+const defaultURL = "https://facebook.github.io/react/img/logo_og.png";
+
+
+type Props = {
+  speaker: Speaker
+}
+
+
+export default class ViewColoredBoxesWithText extends Component {
+  props: Props;
+
+  render() {
+    const { avatarUrl, name } = this.props.speaker;
+
+    return (
+      <View>
+        <View
+          style={{
+            flex: 1,
+            flexDirection: "row",
+            width: 5,
+            alignItems: "stretch",
+            transform: [{ translate: [-1, 1, -5] }]
+          }}
+        >
+          <View style={{ marginRight: 1, height: 2, width: 2, backgroundColor: "white" }}>
+            <Image source={{ uri: avatarUrl }} style={{ width: 2, height: 2 }}/>
+          </View>
+          <View
+            style={{ width: 2, height: 2, backgroundColor: "grey" }}
+          >
+            <Text style={{ fontSize: 0.2, textAlign: "center" }}>{name}</Text>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
diff --git a/components/router.js b/components/router.js
@@ -67,6 +67,7 @@ export default class Router extends React.Component {
         content = (
           <Detail
             description={state.speaker.talks[0].description}
+            speaker={state.speaker}
             backPressed={() => {
               this.setState({
                 state: {