Calendar redesign

components/common/app-icon.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { StyleSheet } from 'react-native'
 import Icon from 'react-native-vector-icons/Entypo'
 
-import { Sizes } from '../../styles/redesign'
+import { Sizes } from '../../styles'
 
 const AppIcon = ({ color, name, style, ...props }) => {
   const iconStyle = [styles.icon, style, { color }]

components/common/app-loading.js

@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native'
 
 import AppText from './app-text'
 
-import { Containers } from '../../styles/redesign'
+import { Containers } from '../../styles'
 
 import { shared } from '../../i18n/en/labels'
 

components/common/app-page.js

@@ -4,7 +4,7 @@ import { ScrollView, StyleSheet, View } from 'react-native'
 
 import AppText from '../common/app-text'
 
-import { Colors, Typography } from '../../styles/redesign'
+import { Colors, Typography } from '../../styles'
 
 const AppPage = ({
   children,

components/common/app-switch.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Containers } from '../../styles/redesign'
+import { Containers } from '../../styles'
 
 const AppSwitch = ({ onToggle, text, value }) => {
   return (

components/common/app-text-input.js

@@ -2,7 +2,7 @@ import React from 'react'
 import { StyleSheet, TextInput } from 'react-native'
 import PropTypes from 'prop-types'
 
-import { Colors, Spacing, Typography } from '../../styles/redesign'
+import { Colors, Spacing, Typography } from '../../styles'
 
 const AppTextInput = ({ style, ...props }) => {
   return <TextInput style={[styles.input, style]} {...props} />

components/common/app-text.js

@@ -4,7 +4,7 @@ import { StyleSheet, Text } from 'react-native'
 
 import Link from './link'
 
-import { Colors, Typography } from '../../styles/redesign'
+import { Colors, Typography } from '../../styles'
 
 const AppText = ({ children, linkStyle, style, ...props }) => {
   // we parse for links in case the text contains any

components/common/button.js

@@ -5,7 +5,7 @@ import { StyleSheet, TouchableOpacity } from 'react-native'
 import AppIcon from './app-icon'
 import AppText from './app-text'
 
-import { Colors, Fonts, Spacing } from '../../styles/redesign'
+import { Colors, Fonts, Spacing } from '../../styles'
 
 const Button = ({
   children,

components/common/close-icon.js

@@ -4,7 +4,7 @@ import { StyleSheet, TouchableOpacity } from 'react-native'
 
 import AppIcon from './app-icon'
 
-import { Colors, Sizes } from '../../styles/redesign'
+import { Colors, Sizes } from '../../styles'
 
 const CloseIcon = ({ onClose, ...props }) => {
   return (

components/common/link.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import Hyperlink from 'react-native-hyperlink'
 import { StyleSheet } from 'react-native'
 
-import { Colors, Typography } from '../../styles/redesign'
+import { Colors, Typography } from '../../styles'
 
 import links from '../../i18n/en/links'
 

components/common/menu-icon.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { createIconSetFromIcoMoon } from 'react-native-vector-icons'
 import iconConfig from '../../selection.json'
 
-import { Colors, Sizes } from '../../styles/redesign'
+import { Colors, Sizes } from '../../styles'
 
 const Icon = createIconSetFromIcoMoon(iconConfig, '', 'Menu')
 

components/common/segment.js

@@ -4,13 +4,14 @@ import { StyleSheet, View } from 'react-native'
 
 import AppText from './app-text'
 
-import { Colors, Spacing, Typography } from '../../styles/redesign'
+import { Colors, Spacing, Typography } from '../../styles'
 
 const Segment = ({ children, last, title }) => {
   const containerStyle = last ? styles.containerLast : styles.container
+  const commonStyle = Object.assign({}, containerStyle)
 
   return (
-    <View style={containerStyle}>
+    <View style={commonStyle}>
       {title && <AppText style={styles.title}>{title}</AppText>}
       {children}
     </View>
@@ -33,7 +34,7 @@ const styles = StyleSheet.create({
   container: {
     borderStyle: 'solid',
     borderBottomWidth: 2,
-    borderBottomColor: Colors.greyLight,
+    borderBottomColor: Colors.grey,
     paddingBottom: Spacing.base,
     ...segmentContainer
   },

components/common/table.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Spacing, Typography } from '../../styles/redesign'
+import { Spacing, Typography } from '../../styles'
 
 const Table = ({ tableContent }) => {
   return (