resolving merge conflicts

1 files changed, 0 insertions, 121 deletions

diff --git a/app_expo/components/checkbox/checkbox.story.tsx b/app_expo/components/checkbox/checkbox.story.tsx
deleted file mode 100644
index a6dce83..0000000
--- a/app_expo/components/checkbox/checkbox.story.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-/* eslint-disable react-native/no-inline-styles */
-/* eslint-disable react-native/no-color-literals */
-
-import * as React from 'react'
-import { View, ViewStyle } from 'react-native'
-import { storiesOf } from '@storybook/react-native'
-import { StoryScreen, Story, UseCase } from '../../../storybook/views'
-import { Checkbox } from './checkbox'
-import { Toggle } from 'react-powerplug'
-
-declare let module
-
-const arrayStyle: ViewStyle[] = [{ paddingVertical: 40 }, { alignSelf: 'flex-end' }]
-const arrayOutlineStyle: ViewStyle[] = [{ borderColor: '#b443c9' }, { borderWidth: 25 }]
-const arrayFillStyle: ViewStyle[] = [{ backgroundColor: '#55e0ff' }]
-
-storiesOf('Checkbox', module)
-  .addDecorator((fn) => <StoryScreen>{fn()}</StoryScreen>)
-  .add('Behaviour', () => (
-    <Story>
-      <UseCase text="The Checkbox" usage="Use the checkbox to represent on/off states.">
-        <Toggle initial={false}>
-          {({ on, toggle }) => <Checkbox value={on} onToggle={toggle} text="Toggle me" />}
-        </Toggle>
-      </UseCase>
-      <UseCase text="value = true" usage="This is permanently on.">
-        <Checkbox value={true} text="Always on" />
-      </UseCase>
-      <UseCase text="value = false" usage="This is permanantly off.">
-        <Checkbox value={false} text="Always off" />
-      </UseCase>
-    </Story>
-  ))
-  .add('Styling', () => (
-    <Story>
-      <UseCase text="multiline = true" usage="For really really long text">
-        <Toggle initial={false}>
-          {({ on, toggle }) => (
-            <View>
-              <Checkbox
-                text="We’re an App Design & Development Team. Experts in mobile & web technologies. We create beautiful, functional mobile apps and websites."
-                value={on}
-                multiline
-                onToggle={toggle}
-              />
-            </View>
-          )}
-        </Toggle>
-      </UseCase>
-      <UseCase text=".style" usage="Override the container style">
-        <Toggle initial={false}>
-          {({ on, toggle }) => (
-            <View>
-              <Checkbox
-                text="Hello there!"
-                value={on}
-                style={{
-                  backgroundColor: 'purple',
-                  marginLeft: 40,
-                  paddingVertical: 30,
-                  paddingLeft: 60,
-                }}
-                onToggle={toggle}
-              />
-            </View>
-          )}
-        </Toggle>
-      </UseCase>
-      <UseCase text=".outlineStyle" usage="Override the outline style">
-        <Toggle initial={false}>
-          {({ on, toggle }) => (
-            <View>
-              <Checkbox
-                text="Outline is the box frame"
-                value={on}
-                outlineStyle={{
-                  borderColor: 'green',
-                  borderRadius: 10,
-                  borderWidth: 4,
-                  width: 60,
-                  height: 20,
-                }}
-                onToggle={toggle}
-              />
-            </View>
-          )}
-        </Toggle>
-      </UseCase>
-      <UseCase text=".fillStyle" usage="Override the fill style">
-        <Toggle initial={false}>
-          {({ on, toggle }) => (
-            <View>
-              <Checkbox
-                text="Fill er up"
-                value={on}
-                fillStyle={{ backgroundColor: 'red', borderRadius: 8 }}
-                onToggle={toggle}
-              />
-            </View>
-          )}
-        </Toggle>
-      </UseCase>
-
-      <UseCase text="Array style" usage="Use array styles">
-        <Toggle initial={false}>
-          {({ on, toggle }) => (
-            <View>
-              <Checkbox
-                text="Check it twice"
-                value={on}
-                onToggle={toggle}
-                style={arrayStyle}
-                outlineStyle={arrayOutlineStyle}
-                fillStyle={arrayFillStyle}
-              />
-            </View>
-          )}
-        </Toggle>
-      </UseCase>
-    </Story>
-  ))