Merge pull request #1474 from StoDevX/landscape

Fix Landscape stuffs

Author: hawkrives

package-lock.json

@@ -80,7 +80,7 @@
     "react-native-restart": "0.0.3",
     "react-native-safari-view": "2.0.0",
     "react-native-search-bar": "3.0.0",
-    "react-native-sortable-list": "github:hawkrives/react-native-sortable-list#a46c78161e0a1a8d3a45f2fef69d98af3e911b6d",
+    "react-native-sortable-list": "github:hawkrives/react-native-sortable-list#7b72cc8e16cc71751836b49b3ea4bbc9e8e9cb99",
     "react-native-tableview-simple": "0.16.11",
     "react-native-vector-icons": "4.3.0",
     "react-native-video": "2.0.0",

package.json

@@ -0,0 +1,12 @@
+// @flow
+
+export function partitionByIndex<T>(arr: T[]): [T[], T[]] {
+  return arr.reduce(
+    (acc, val, idx) => {
+      return idx % 2 === 0
+        ? [acc[0].concat(val), acc[1]]
+        : [acc[0], acc[1].concat(val)]
+    },
+    [[], []],
+  )
+}

source/lib/partition-by-index.js

@@ -34,7 +34,7 @@ import {HomeView, EditHomeView} from '../views/home'
 
 import StreamingView from '../views/streaming'
 import KSTOView from '../views/streaming/radio'
-import WebcamsView from '../views/streaming/webcams'
+import {WebcamsView} from '../views/streaming/webcams'
 
 import {MenusView} from '../views/menus'
 

source/storybook/index.js

@@ -1,26 +1,26 @@
 // @flow
 
 import React from 'react'
-import {Text, StyleSheet, Platform, Dimensions} from 'react-native'
+import {Text, StyleSheet, Platform} from 'react-native'
 import Icon from 'react-native-vector-icons/Entypo'
 import type {ViewType} from '../views'
 import {Touchable} from '../components/touchable'
 import * as c from '../components/colors'
 
-const Viewport = Dimensions.get('window')
-
 export function HomeScreenButton({
   view,
   onPress,
 }: {
   view: ViewType,
   onPress: () => any,
 }) {
+  const style = {backgroundColor: view.tint}
+
   return (
     <Touchable
       highlight={false}
       onPress={onPress}
-      style={[styles.rectangle, {backgroundColor: view.tint}]}
+      style={[styles.rectangle, style]}
     >
       <Icon name={view.icon} size={32} style={styles.rectangleButtonIcon} />
       <Text style={styles.rectangleButtonText}>
@@ -33,18 +33,20 @@ export function HomeScreenButton({
 export const CELL_MARGIN = 10
 const cellVerticalPadding = 8
 const cellHorizontalPadding = 4
-const cellWidth = Viewport.width / 2 - CELL_MARGIN * 1.5
 
 const styles = StyleSheet.create({
   // Main buttons for actions on home screen
   rectangle: {
-    width: cellWidth,
+    flex: 1,
+
     alignItems: 'center',
     justifyContent: 'center',
+
     paddingTop: cellVerticalPadding,
     paddingBottom: cellVerticalPadding / 2,
     paddingHorizontal: cellHorizontalPadding,
     borderRadius: Platform.OS === 'ios' ? 6 : 3,
+
     elevation: 2,
 
     marginTop: CELL_MARGIN / 2,
@@ -59,9 +61,9 @@ const styles = StyleSheet.create({
   },
   rectangleButtonText: {
     color: c.white,
-    marginTop: cellVerticalPadding / 2,
+    // marginTop: cellVerticalPadding / 2,
     fontFamily: Platform.OS === 'ios' ? 'System' : 'sans-serif-condensed',
-    textAlign: 'center',
+    // textAlign: 'center',
     fontSize: 14,
   },
 })