From 61a8921c0c1b27cf24ec5779fbcac4b2a3e9ba22 Mon Sep 17 00:00:00 2001 From: kawatsu kenya <3982ne@gmail.com> Date: Sat, 21 Jul 2018 15:10:31 +0900 Subject: [PATCH 01/12] fix button name --- App.js | 2 +- .../components/LentScanScreen.test.js | 13 +++ .../__snapshots__/DetailScreen.test.js.snap | 12 +- .../__snapshots__/LentScanScreen.test.js.snap | 48 ++++++++ .../DetailScreen/BorrowReturnButton.js | 58 ++++++++++ src/components/DetailScreen/LendingButton.js | 58 ---------- src/components/DetailScreen/Styles.js | 2 +- src/components/DetailScreen/index.js | 4 +- src/components/LentScanScreen/Styles.js | 73 +++++++++++++ .../index.js} | 103 +++--------------- src/components/screens/ScanScreen.js | 2 +- 11 files changed, 221 insertions(+), 154 deletions(-) create mode 100644 src/__tests__/components/LentScanScreen.test.js create mode 100644 src/__tests__/components/__snapshots__/LentScanScreen.test.js.snap create mode 100644 src/components/DetailScreen/BorrowReturnButton.js delete mode 100644 src/components/DetailScreen/LendingButton.js create mode 100644 src/components/LentScanScreen/Styles.js rename src/components/{screens/LentScanScreen.js => LentScanScreen/index.js} (71%) diff --git a/App.js b/App.js index 8dec87e..24962b1 100644 --- a/App.js +++ b/App.js @@ -16,7 +16,7 @@ import DetailScreenContainer from './src/containers/DetailScreenContainer'; import EntryScreen from './src/components/screens/EntryScreen'; import ScanScreen from './src/components/screens/ScanScreen'; import EntryTagsScreen from './src/components/screens/EntryTagsScreen'; -import LentScanScreen from './src/components/screens/LentScanScreen'; +import LentScanScreen from './src/components/LentScanScreen'; import { setTopLevelNavigator } from './src/utils/NavigationService'; const RootStack = StackNavigator( diff --git a/src/__tests__/components/LentScanScreen.test.js b/src/__tests__/components/LentScanScreen.test.js new file mode 100644 index 0000000..0c54c18 --- /dev/null +++ b/src/__tests__/components/LentScanScreen.test.js @@ -0,0 +1,13 @@ +import React from 'react'; +import renderer from 'react-test-renderer'; + +import LentScanScreen from '../../components/LentScanScreen'; + +describe('', () => { + it('正しくレンダリングされること', () => { + const tree = renderer + .create() + .toJSON(); + expect(tree).toMatchSnapshot(); + }); +}); diff --git a/src/__tests__/components/__snapshots__/DetailScreen.test.js.snap b/src/__tests__/components/__snapshots__/DetailScreen.test.js.snap index c9c733b..a844d3f 100644 --- a/src/__tests__/components/__snapshots__/DetailScreen.test.js.snap +++ b/src/__tests__/components/__snapshots__/DetailScreen.test.js.snap @@ -113,7 +113,7 @@ ShallowWrapper { - @@ -196,7 +196,7 @@ ShallowWrapper { - @@ -315,7 +315,7 @@ ShallowWrapper { , - , @@ -429,7 +429,7 @@ ShallowWrapper { - @@ -512,7 +512,7 @@ ShallowWrapper { - @@ -631,7 +631,7 @@ ShallowWrapper { , - , diff --git a/src/__tests__/components/__snapshots__/LentScanScreen.test.js.snap b/src/__tests__/components/__snapshots__/LentScanScreen.test.js.snap new file mode 100644 index 0000000..a821a3d --- /dev/null +++ b/src/__tests__/components/__snapshots__/LentScanScreen.test.js.snap @@ -0,0 +1,48 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[` 正しくレンダリングされること 1`] = ` + + + + カメラを使用できません + + + +`; diff --git a/src/components/DetailScreen/BorrowReturnButton.js b/src/components/DetailScreen/BorrowReturnButton.js new file mode 100644 index 0000000..02cf8b9 --- /dev/null +++ b/src/components/DetailScreen/BorrowReturnButton.js @@ -0,0 +1,58 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { View } from 'react-native'; +import { Button } from 'react-native-elements'; +import { MaterialCommunityIcons } from '@expo/vector-icons'; + +import { borrowReturnButton as styles } from './Styles'; + +const RenderButton = (props) => { + const { + title, + bgColor, + action, + navigate, + } = props; + + return ( + +