fix error with 'basis' fonts (fbsamples#205)

* fix error with 'basis' fonts

* add flow typings

js/common/ActionsOverlay.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 
 "use strict";
@@ -39,6 +40,7 @@ const CONTAINER_HEIGHT = 126,
 <ActionsOverlay />
 ============================================================================= */
 class ActionsOverlay extends React.Component {
+  static __cards__;
   static height = CONTAINER_HEIGHT;
   static defaultProps = {
     buttonContainerStyles: {

js/common/Carousel.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 
@@ -29,7 +30,7 @@ type Props = {
   count: number,
   selectedIndex: number,
   onSelectedIndexChange?: (index: number) => void,
-  renderCard: (index: number) => ReactElement,
+  renderCard: (index: number) => ReactElement<any>,
   style?: any
 };
 

js/common/F8BackgroundRepeat.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 
@@ -36,6 +37,8 @@ import resolveAssetSource from "resolveAssetSource";
 * ==============================================================================
 */
 class F8BackgroundRepeat extends React.Component {
+  static __cards__;
+
   render() {
     const { source, width, height } = this.props;
     const img = resolveAssetSource(source);
@@ -60,7 +63,7 @@ class F8BackgroundRepeat extends React.Component {
     );
   }
 
-  renderRow(colsInRow, idx) {
+  renderRow(colsInRow: number, idx: number) {
     const cols = [];
     for (let i = 0; i < colsInRow; i++) {
       cols.push(this.renderImage(i));
@@ -72,7 +75,7 @@ class F8BackgroundRepeat extends React.Component {
     );
   }
 
-  renderImage(idx) {
+  renderImage(idx: number) {
     return <Image key={`bgRptImg${idx}`} source={this.props.source} />;
   }
 }

js/common/F8Fonts.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 
 "use strict";
@@ -27,11 +28,15 @@ import { Platform, Dimensions } from "react-native";
 const DEVICE_SCALE = Dimensions.get("window").width / 375;
 
 const DEFAULT_FONT = "helvetica";
+const SECONDARY_FONT = Platform.OS === "android" ? "basis" : "helvetica";
 
 /* utils ==================================================================== */
 
 // get font name and weight
-function fontWithWeight(family = DEFAULT_FONT, weight = "regular") {
+function fontWithWeight(
+  family: string = DEFAULT_FONT,
+  weight: string = "regular"
+): string {
   return family;
 }
 
@@ -40,7 +45,11 @@ function normalize(size: number): number {
 }
 
 // attempt to normalize x-platform line heights
-function lineHeight(val = 1, scale = 1, normalized = true) {
+function lineHeight(
+  val: number = 1,
+  scale: number = 1,
+  normalized: boolean = true
+): number {
   let adjusted = normalized ? normalize(val) : val;
   return Math.round(Platform.OS === "android" ? adjusted * scale : adjusted);
 }
@@ -50,6 +59,7 @@ function lineHeight(val = 1, scale = 1, normalized = true) {
 export default {
   default: DEFAULT_FONT,
   helvetica: DEFAULT_FONT,
+  basis: SECONDARY_FONT,
   h1: DEFAULT_FONT,
   h2: DEFAULT_FONT,
   h3: DEFAULT_FONT,

js/common/F8Modal.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 

js/common/F8Text.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 
 "use strict";
@@ -34,43 +35,70 @@ import StyleSheet from "./F8StyleSheet";
 // Text Elements
 // =============================================================================
 
-export function Text({ style, ...props }: Object): ReactElement {
+export function Text({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.text, style]} {...props} />;
 }
 
-export function Heading1({ style, ...props }: Object): ReactElement {
+export function Heading1({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.h1, style]} {...props} />;
 }
 
-export function Heading2({ style, ...props }: Object): ReactElement {
+export function Heading2({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.h2, style]} {...props} />;
 }
 
-export function Heading3({ style, ...props }: Object): ReactElement {
+export function Heading3({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.h3, style]} {...props} />;
 }
 
-export function Heading4({ style, ...props }: Object): ReactElement {
+export function Heading4({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.h4, style]} {...props} />;
 }
 
-export function Heading5({ style, ...props }: Object): ReactElement {
+export function Heading5({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.h5, style]} {...props} />;
 }
 
-export function Paragraph({ style, ...props }: Object): ReactElement {
+export function Paragraph({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.p, style]} {...props} />;
 }
 
-// export function Hyperlink({style, ...props}: Object): ReactElement {
+// export function Hyperlink({style, ...props}: Object): ReactElement<ReactNative.Text> {
 //   return <ReactNative.Text style={[styles.a, style]} {...props} />;
 // }
 
-export function HeaderTitle({ style, ...props }: Object): ReactElement {
+export function HeaderTitle({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.Text style={[styles.headerTitle, style]} {...props} />;
 }
 
-export function HorizontalRule({ style, ...props }: Object): ReactElement {
+export function HorizontalRule({
+  style,
+  ...props
+}: Object): ReactElement<ReactNative.Text> {
   return <ReactNative.View style={[styles.hr, style]} {...props} />;
 }
 

js/common/F8TimelineBackground.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 
 import React from "react";

js/common/F8Touchable.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 
 "use strict";
@@ -29,7 +30,7 @@ import {
   Platform
 } from "react-native";
 
-function F8TouchableIOS(props: Object): ReactElement {
+function F8TouchableIOS(props: Object): ReactElement<TouchableHighlight> {
   return (
     <TouchableHighlight
       accessibilityTraits="button"

js/common/LaunchScreen.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 
@@ -37,6 +38,8 @@ const WIN_WIDTH = Dimensions.get("window").width,
 */
 
 class LaunchScreen extends React.Component {
+  static __cards__;
+
   render() {
     return (
       <View style={[styles.container, this.props.style]}>

js/common/LoginButton.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 
@@ -31,7 +32,7 @@ class LoginButton extends React.Component {
   props: {
     style: any,
     source?: string, // For Analytics
-    dispatch: (action: any) => Promise,
+    dispatch: (action: any) => Promise<any>,
     onLoggedIn: ?() => void
   };
   state: {

js/common/MessengerModal.js

@@ -18,6 +18,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE
+ * @flow
  */
 "use strict";
 
@@ -41,6 +42,8 @@ const APP_STORE = "https://itunes.apple.com/us/app/messenger/id454638411",
 ============================================================================= */
 
 class MessengerModal extends React.Component {
+  static __cards__;
+
   render() {
     return (
       <F8Modal
@@ -88,7 +91,7 @@ class MessengerModal extends React.Component {
     );
   };
 
-  openAppStore = _ => {
+  openAppStore = () => {
     const url = Platform.OS === "ios" ? APP_STORE : PLAY_STORE;
     F8Linking.canOpenURL(url)
       .then(supported => {

js/filter/TopicItem.js

@@ -86,7 +86,7 @@ const styles = StyleSheet.create({
     justifyContent: "space-between"
   },
   title: {
-    fontFamily: F8Fonts.fontWithWeight("basis", "offWhite"),
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "offWhite"),
     fontSize: 17,
     color: "white",
     flex: 1

js/flow-lib.js

@@ -34,3 +34,11 @@ declare var expect: any;
 declare module "graphql" {
   declare var exports: any;
 }
+
+declare module "react-native-linear-gradient" {
+  declare var exports: any;
+}
+
+declare module "resolveAssetSource" {
+  declare var exports: any;
+}

js/tabs/F8TabsView.js

@@ -289,7 +289,7 @@ const styles = StyleSheet.create({
   badgeText: {
     backgroundColor: "transparent",
     fontSize: 9,
-    fontFamily: F8Fonts.fontWithWeight("basis", "helveticaBold"),
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helveticaBold"),
     color: F8Colors.white,
 
     ios: {

js/tabs/demos/DemosCarousel.js

@@ -136,7 +136,7 @@ const styles = StyleSheet.create({
   },
   day: {
     color: F8Colors.yellow,
-    fontFamily: F8Fonts.fontWithWeight("basis", "helveticaBold"),
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helveticaBold"),
     fontSize: 13
   },
   time: {

js/tabs/schedule/F8SessionDetails.js

@@ -296,11 +296,11 @@ const styles = StyleSheet.create({
   },
   location: {
     fontSize: 13,
-    fontFamily: F8Fonts.fontWithWeight("basis", "helveticaBold")
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helveticaBold")
   },
   time: {
     color: F8Colors.tangaroa,
-    fontFamily: F8Fonts.fontWithWeight("basis", "helveticaBold")
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helveticaBold")
   },
   title: {
     marginVertical: 15,

js/tabs/schedule/GeneralScheduleView.js

@@ -240,7 +240,7 @@ class GeneralScheduleView extends React.Component {
         titleStyles={{ marginBottom: 5 }}
         text={`Swipe ${dayDir} for Day ${otherDay}`.toUpperCase()}
         textStyles={{
-          fontFamily: F8Fonts.fontWithWeight("basis", "helvetica"),
+          fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helvetica"),
           color: F8Colors.colorWithAlpha("tangaroa", 0.5),
           fontSize: 13
         }}

js/tabs/schedule/SessionsCarousel.js

@@ -216,7 +216,7 @@ const styles = StyleSheet.create({
   },
   day: {
     color: F8Colors.yellow,
-    fontFamily: F8Fonts.fontWithWeight("basis", "helveticaBold"),
+    fontFamily: F8Fonts.fontWithWeight(F8Fonts.basis, "helveticaBold"),
     fontSize: 13,
 
     android: {