resolving merge conflicts

1 files changed, 0 insertions, 33 deletions

diff --git a/app_expo/components/button/button.story.tsx b/app_expo/components/button/button.story.tsx
deleted file mode 100644
index 54dc2a9..0000000
--- a/app_expo/components/button/button.story.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as React from 'react'
-import { ViewStyle, TextStyle, Alert } from 'react-native'
-import { storiesOf } from '@storybook/react-native'
-import { StoryScreen, Story, UseCase } from '../../../storybook/views'
-import { Button } from './button'
-
-declare let module
-
-const buttonStyleArray: ViewStyle[] = [{ paddingVertical: 100 }, { borderRadius: 0 }]
-
-const buttonTextStyleArray: TextStyle[] = [{ fontSize: 20 }, { color: '#a511dc' }]
-
-storiesOf('Button', module)
-  .addDecorator((fn) => <StoryScreen>{fn()}</StoryScreen>)
-  .add('Style Presets', () => (
-    <Story>
-      <UseCase text="Primary" usage="The primary button.">
-        <Button text="Click It" preset="primary" onPress={() => Alert.alert('pressed')} />
-      </UseCase>
-      <UseCase text="Disabled" usage="The disabled behaviour of the primary button.">
-        <Button text="Click It" preset="primary" onPress={() => Alert.alert('pressed')} disabled />
-      </UseCase>
-      <UseCase text="Array Style" usage="Button with array style">
-        <Button
-          text="Click It"
-          preset="primary"
-          onPress={() => Alert.alert('pressed')}
-          style={buttonStyleArray}
-          textStyle={buttonTextStyleArray}
-        />
-      </UseCase>
-    </Story>
-  ))