From c889ff6f8ab2c3b14db3efa5fbc6c1664bd4c11f Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Wed, 18 Apr 2018 15:08:54 +0200
Subject: [PATCH 1/9] Improve toolbar styling and add a new "plus" button to
 launch the block picker

---
 block-management/toolbar.js   | 53 ++++++++++++++++++++++++-----------
 block-management/toolbar.scss | 16 ++++++-----
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/block-management/toolbar.js b/block-management/toolbar.js
index 7ee86289b7..b031f656e7 100644
--- a/block-management/toolbar.js
+++ b/block-management/toolbar.js
@@ -2,7 +2,7 @@
  * @format */
 
 import React from 'react';
-import { View, Button } from 'react-native';
+import { View, TouchableNativeFeedback, Text } from 'react-native';
 import { ToolbarButton } from './constants';
 
 import styles from './toolbar.scss';
@@ -16,30 +16,49 @@ export default class Toolbar extends React.Component<PropsType> {
 	render() {
 		return (
 			<View style={ styles.toolbar }>
-				<Button
-					style={ styles.toolbarButton }
+				<TouchableNativeFeedback
+					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.PLUS, this.props.uid ) }
+				>
+					<View style={ styles.toolbarButton }>
+						<Text>+</Text>
+					</View>
+				</TouchableNativeFeedback>
+				<View style={ styles.buttonSeparator } />
+				<TouchableNativeFeedback
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.UP, this.props.uid ) }
-					title="Up"
-				/>
-				<Button
-					style={ styles.toolbarButton }
+				>
+					<View style={ styles.toolbarButton }>
+						<Text>▲</Text>
+					</View>
+				</TouchableNativeFeedback>
+				<View style={ styles.buttonSeparator } />
+				<TouchableNativeFeedback
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.DOWN, this.props.uid ) }
-					title="Down"
-				/>
-				<Button
-					style={ styles.toolbarButton }
+				>
+					<View style={ styles.toolbarButton }>
+						<Text>▼</Text>
+					</View>
+				</TouchableNativeFeedback>
+				<View style={ styles.buttonSeparator } />
+				<TouchableNativeFeedback
 					onPress={ this.props.onButtonPressed.bind(
 						this,
 						ToolbarButton.SETTINGS,
 						this.props.uid
 					) }
-					title="Settings"
-				/>
-				<Button
-					style={ styles.toolbarButton }
+				>
+					<View style={ styles.toolbarButton }>
+						<Text>⚙️</Text>
+					</View>
+				</TouchableNativeFeedback>
+				<View style={ styles.buttonSeparator } />
+				<TouchableNativeFeedback
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.DELETE, this.props.uid ) }
-					title="Delete"
-				/>
+				>
+					<View style={ styles.toolbarButton }>
+						<Text>🗑</Text>
+					</View>
+				</TouchableNativeFeedback>
 			</View>
 		);
 	}
diff --git a/block-management/toolbar.scss b/block-management/toolbar.scss
index ed000fd0f3..464a2613f0 100644
--- a/block-management/toolbar.scss
+++ b/block-management/toolbar.scss
@@ -4,14 +4,16 @@
 	height: 34;
 	background-color: white;
 	flex-direction: row;
-	justify-content: space-between;
-	padding-left: 20;
-	padding-right: 20;
+	padding-left: 8;
+	padding-right: 8;
 }
 
 .toolbarButton {
-	padding-top: 4;
-	padding-right: 4;
-	padding-bottom: 4;
-	padding-left: 4;
+	width: 50;
+	justify-content: center;
+	align-items: center;
+}
+
+.buttonSeparator {
+	width: 8;
 }

From 0030161f95bd2ebd3654f25d3571ca63c13719aa Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Wed, 18 Apr 2018 15:42:23 +0200
Subject: [PATCH 2/9] Update monospace font management

---
 block-management/block-holder.js                    |  2 +-
 block-management/block-holder.scss                  | 13 +++++--------
 block-management/block-manager.js                   |  2 +-
 block-management/block-manager.scss                 |  9 ++++++++-
 block-management/block-styles.scss                  |  7 +++++++
 block-management/constants.js                       |  1 +
 ...block-styles.android.scss => fonts.android.scss} |  2 +-
 .../{block-styles.ios.scss => fonts.ios.scss}       |  2 +-
 block-management/picker/block-picker.js             |  0
 9 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 block-management/block-styles.scss
 rename block-management/{block-styles.android.scss => fonts.android.scss} (70%)
 rename block-management/{block-styles.ios.scss => fonts.ios.scss} (69%)
 create mode 100644 block-management/picker/block-picker.js

diff --git a/block-management/block-holder.js b/block-management/block-holder.js
index 4c37d25530..63e7771032 100644
--- a/block-management/block-holder.js
+++ b/block-management/block-holder.js
@@ -30,7 +30,7 @@ export default class BlockHolder extends React.Component<PropsType, StateType> {
 		}
 
 		// Return empty view, toolbar won't be rendered
-		return <View />;
+		return <View />
 	}
 
 	getBlockForType() {
diff --git a/block-management/block-holder.scss b/block-management/block-holder.scss
index e9c91dca27..fc3f2b68b0 100644
--- a/block-management/block-holder.scss
+++ b/block-management/block-holder.scss
@@ -8,18 +8,15 @@
 
 .blockContainer {
 	background-color: white;
-}
-
-.blockContent {
-	padding-left: 10;
-	padding-right: 10;
-	padding-top: 10;
-	padding-bottom: 10;
+	padding-left: 8;
+	padding-right: 8;
+	padding-top: 8;
+	padding-bottom: 8;
 }
 
 .blockTitle {
 	background-color: grey;
-	padding-left: 10;
+	padding-left: 8;
 	padding-top: 4;
 	padding-bottom: 4;
 }
diff --git a/block-management/block-manager.js b/block-management/block-manager.js
index 0c63bf4929..2b8fb59990 100644
--- a/block-management/block-manager.js
+++ b/block-management/block-manager.js
@@ -149,7 +149,7 @@ export default class BlockManager extends React.Component<PropsType, StateType>
 						onValueChange={ value => this.setState( { showHtml: value } ) }
 					/>
 				</View>
-				{ this.state.showHtml && <Text style={ styles.list }>{ this.serializeToHtml() }</Text> }
+				{ this.state.showHtml && <Text style={ styles.htmlView }>{ this.serializeToHtml() }</Text> }
 				{ ! this.state.showHtml && list }
 			</View>
 		);
diff --git a/block-management/block-manager.scss b/block-management/block-manager.scss
index 4ab1dd351b..cce2e0b7a2 100644
--- a/block-management/block-manager.scss
+++ b/block-management/block-manager.scss
@@ -1,5 +1,7 @@
 /** @format */
 
+@import 'fonts.scss';
+
 .container {
 	flex: 1;
 	justify-content: flex-start;
@@ -12,8 +14,13 @@
 }
 
 .htmlView {
+	@extend %monospace-font;
 	flex: 1;
-	background-color: #fff;
+	background-color: #eee;
+	padding-left: 8;
+	padding-right: 8;
+	padding-top: 8;
+	padding-bottom: 8;
 }
 
 .switch {
diff --git a/block-management/block-styles.scss b/block-management/block-styles.scss
new file mode 100644
index 0000000000..58caef65b1
--- /dev/null
+++ b/block-management/block-styles.scss
@@ -0,0 +1,7 @@
+/** @format */
+
+@import 'fonts.scss';
+
+.block_code {
+	@extend %monospace-font;
+}
diff --git a/block-management/constants.js b/block-management/constants.js
index 29e43695b6..38c1ff8d24 100644
--- a/block-management/constants.js
+++ b/block-management/constants.js
@@ -8,6 +8,7 @@ const ToolbarButton = {
 	DOWN: 2,
 	SETTINGS: 3,
 	DELETE: 4,
+	PLUS: 5,
 };
 
 export { ToolbarButton };
diff --git a/block-management/block-styles.android.scss b/block-management/fonts.android.scss
similarity index 70%
rename from block-management/block-styles.android.scss
rename to block-management/fonts.android.scss
index 50dae4b8a7..9a386d7ced 100644
--- a/block-management/block-styles.android.scss
+++ b/block-management/fonts.android.scss
@@ -1,5 +1,5 @@
 /** @format */
 
-.block_code {
+%monospace-font {
 	font-family: monospace;
 }
diff --git a/block-management/block-styles.ios.scss b/block-management/fonts.ios.scss
similarity index 69%
rename from block-management/block-styles.ios.scss
rename to block-management/fonts.ios.scss
index e6af99c5a0..7551d900cf 100644
--- a/block-management/block-styles.ios.scss
+++ b/block-management/fonts.ios.scss
@@ -1,5 +1,5 @@
 /** @format */
 
-.block_code {
+%monospace-font {
 	font-family: courier;
 }
diff --git a/block-management/picker/block-picker.js b/block-management/picker/block-picker.js
new file mode 100644
index 0000000000..e69de29bb2

From 7fb652d5d1893b98c3f346a0e15557ccb3a6981e Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Wed, 18 Apr 2018 15:43:59 +0200
Subject: [PATCH 3/9] Update gutenberg submodule version to fix an issue on iOS

---
 gutenberg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gutenberg b/gutenberg
index dee7e45e9a..abfdd083b3 160000
--- a/gutenberg
+++ b/gutenberg
@@ -1 +1 @@
-Subproject commit dee7e45e9acce415d242ef5cbb9336e0ef70be25
+Subproject commit abfdd083b3bc764ee9a144234ef3fc0717bcf093

From 18b6660acbefd2da72c5c7c95327ce520177e833 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 19 Apr 2018 09:24:34 +0200
Subject: [PATCH 4/9] Prettier fix

---
 block-management/block-holder.js        | 2 +-
 block-management/picker/block-picker.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/block-management/block-holder.js b/block-management/block-holder.js
index 63e7771032..4c37d25530 100644
--- a/block-management/block-holder.js
+++ b/block-management/block-holder.js
@@ -30,7 +30,7 @@ export default class BlockHolder extends React.Component<PropsType, StateType> {
 		}
 
 		// Return empty view, toolbar won't be rendered
-		return <View />
+		return <View />;
 	}
 
 	getBlockForType() {
diff --git a/block-management/picker/block-picker.js b/block-management/picker/block-picker.js
index e69de29bb2..1a1f0eb876 100644
--- a/block-management/picker/block-picker.js
+++ b/block-management/picker/block-picker.js
@@ -0,0 +1 @@
+/** @format */

From f283d24dfd2481b33ff2a4f58fde98381d06579e Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 19 Apr 2018 09:39:33 +0200
Subject: [PATCH 5/9] Ignore eslint accessibility for temporary icon

---
 block-management/toolbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block-management/toolbar.js b/block-management/toolbar.js
index b031f656e7..42e5b5f6e2 100644
--- a/block-management/toolbar.js
+++ b/block-management/toolbar.js
@@ -48,6 +48,7 @@ export default class Toolbar extends React.Component<PropsType> {
 					) }
 				>
 					<View style={ styles.toolbarButton }>
+						{ /* eslint-disable-next-line jsx-a11y/accessible-emoji */ }
 						<Text>⚙️</Text>
 					</View>
 				</TouchableNativeFeedback>

From b402c73437f229fc2622394aff018ffcc3084faf Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 19 Apr 2018 14:00:36 +0200
Subject: [PATCH 6/9] Move sources to src/, fix sass auto imports and update
 variables in package.json

---
 block-management/block-styles.scss                         | 7 -------
 block-management/fonts.android.scss                        | 5 -----
 block-management/fonts.ios.scss                            | 5 -----
 block-management/picker/block-picker.js                    | 1 -
 index.js                                                   | 2 +-
 package.json                                               | 4 ++--
 sass-transformer.js                                        | 2 +-
 {app => src/app}/App.js                                    | 0
 {app => src/app}/App.test.js                               | 0
 {app => src/app}/AppContainer.js                           | 0
 {app => src/app}/MainApp.js                                | 0
 {app => src/app}/globals.js                                | 0
 {block-management => src/block-management}/block-holder.js | 0
 .../block-management}/block-holder.scss                    | 0
 .../block-management}/block-manager.js                     | 0
 .../block-management}/block-manager.scss                   | 4 ++--
 src/block-management/block-styles.scss                     | 7 +++++++
 {block-management => src/block-management}/constants.js    | 0
 {block-management => src/block-management}/toolbar.js      | 0
 {block-management => src/block-management}/toolbar.scss    | 0
 {store => src/store}/actions/ActionTypes.js                | 0
 {store => src/store}/actions/index.js                      | 0
 {store => src/store}/actions/test.js                       | 0
 {store => src/store}/index.js                              | 0
 {store => src/store}/reducers/index.js                     | 0
 {store => src/store}/reducers/test.js                      | 0
 src/variables.android.scss                                 | 4 ++++
 src/variables.ios.scss                                     | 4 ++++
 28 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 block-management/block-styles.scss
 delete mode 100644 block-management/fonts.android.scss
 delete mode 100644 block-management/fonts.ios.scss
 delete mode 100644 block-management/picker/block-picker.js
 rename {app => src/app}/App.js (100%)
 rename {app => src/app}/App.test.js (100%)
 rename {app => src/app}/AppContainer.js (100%)
 rename {app => src/app}/MainApp.js (100%)
 rename {app => src/app}/globals.js (100%)
 rename {block-management => src/block-management}/block-holder.js (100%)
 rename {block-management => src/block-management}/block-holder.scss (100%)
 rename {block-management => src/block-management}/block-manager.js (100%)
 rename {block-management => src/block-management}/block-manager.scss (83%)
 create mode 100644 src/block-management/block-styles.scss
 rename {block-management => src/block-management}/constants.js (100%)
 rename {block-management => src/block-management}/toolbar.js (100%)
 rename {block-management => src/block-management}/toolbar.scss (100%)
 rename {store => src/store}/actions/ActionTypes.js (100%)
 rename {store => src/store}/actions/index.js (100%)
 rename {store => src/store}/actions/test.js (100%)
 rename {store => src/store}/index.js (100%)
 rename {store => src/store}/reducers/index.js (100%)
 rename {store => src/store}/reducers/test.js (100%)
 create mode 100644 src/variables.android.scss
 create mode 100644 src/variables.ios.scss

diff --git a/block-management/block-styles.scss b/block-management/block-styles.scss
deleted file mode 100644
index 58caef65b1..0000000000
--- a/block-management/block-styles.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @format */
-
-@import 'fonts.scss';
-
-.block_code {
-	@extend %monospace-font;
-}
diff --git a/block-management/fonts.android.scss b/block-management/fonts.android.scss
deleted file mode 100644
index 9a386d7ced..0000000000
--- a/block-management/fonts.android.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @format */
-
-%monospace-font {
-	font-family: monospace;
-}
diff --git a/block-management/fonts.ios.scss b/block-management/fonts.ios.scss
deleted file mode 100644
index 7551d900cf..0000000000
--- a/block-management/fonts.ios.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @format */
-
-%monospace-font {
-	font-family: courier;
-}
diff --git a/block-management/picker/block-picker.js b/block-management/picker/block-picker.js
deleted file mode 100644
index 1a1f0eb876..0000000000
--- a/block-management/picker/block-picker.js
+++ /dev/null
@@ -1 +0,0 @@
-/** @format */
diff --git a/index.js b/index.js
index 6a4de91c59..7faf9d5fcc 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 /** @format */
 
 import { AppRegistry } from 'react-native';
-import App from './app/App';
+import App from './src/app/App';
 AppRegistry.registerComponent( 'gutenberg', () => App );
diff --git a/package.json b/package.json
index 22bed55255..0dccbedd39 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "config": {
-    "jsfiles": "index.js app/*.js app/**/*.js block-management/*.js block-management/**/*.js store/*.js store/**/*.js",
-    "scssfiles": "app/*.scss app/**/*.scss block-management/*.scss block-management/**/*.scss store/*.scss store/**/*.scss"
+    "jsfiles": "index.js src/*.js src/**/*.js",
+    "scssfiles": "src/*.scss src/**/*.scss"
   },
   "devDependencies": {
     "@wordpress/babel-preset-default": "^1.1.2",
diff --git a/sass-transformer.js b/sass-transformer.js
index f58c3fa509..7a7cea0e42 100644
--- a/sass-transformer.js
+++ b/sass-transformer.js
@@ -60,7 +60,7 @@ if ( reactNativeMinorVersion >= 52 ) {
 }
 
 // TODO: need to find a way to pass the include paths and the default asset files via some config
-const autoImportIncludePaths = [ 'gutenberg/edit-post/assets/stylesheets' ];
+const autoImportIncludePaths = [ 'src', 'gutenberg/edit-post/assets/stylesheets' ];
 const autoImportAssets = [
 	'_colors.scss',
 	'_admin-schemes.scss',
diff --git a/app/App.js b/src/app/App.js
similarity index 100%
rename from app/App.js
rename to src/app/App.js
diff --git a/app/App.test.js b/src/app/App.test.js
similarity index 100%
rename from app/App.test.js
rename to src/app/App.test.js
diff --git a/app/AppContainer.js b/src/app/AppContainer.js
similarity index 100%
rename from app/AppContainer.js
rename to src/app/AppContainer.js
diff --git a/app/MainApp.js b/src/app/MainApp.js
similarity index 100%
rename from app/MainApp.js
rename to src/app/MainApp.js
diff --git a/app/globals.js b/src/app/globals.js
similarity index 100%
rename from app/globals.js
rename to src/app/globals.js
diff --git a/block-management/block-holder.js b/src/block-management/block-holder.js
similarity index 100%
rename from block-management/block-holder.js
rename to src/block-management/block-holder.js
diff --git a/block-management/block-holder.scss b/src/block-management/block-holder.scss
similarity index 100%
rename from block-management/block-holder.scss
rename to src/block-management/block-holder.scss
diff --git a/block-management/block-manager.js b/src/block-management/block-manager.js
similarity index 100%
rename from block-management/block-manager.js
rename to src/block-management/block-manager.js
diff --git a/block-management/block-manager.scss b/src/block-management/block-manager.scss
similarity index 83%
rename from block-management/block-manager.scss
rename to src/block-management/block-manager.scss
index cce2e0b7a2..48d1c0dc86 100644
--- a/block-management/block-manager.scss
+++ b/src/block-management/block-manager.scss
@@ -1,6 +1,6 @@
 /** @format */
 
-@import 'fonts.scss';
+@import '../variables.scss';
 
 .container {
 	flex: 1;
@@ -14,7 +14,7 @@
 }
 
 .htmlView {
-	@extend %monospace-font;
+	font-family: $default-monospace-font;
 	flex: 1;
 	background-color: #eee;
 	padding-left: 8;
diff --git a/src/block-management/block-styles.scss b/src/block-management/block-styles.scss
new file mode 100644
index 0000000000..dc68898668
--- /dev/null
+++ b/src/block-management/block-styles.scss
@@ -0,0 +1,7 @@
+/** @format */
+
+@import '../variables.scss';
+
+.block_code {
+	font-family: $default-monospace-font;
+}
diff --git a/block-management/constants.js b/src/block-management/constants.js
similarity index 100%
rename from block-management/constants.js
rename to src/block-management/constants.js
diff --git a/block-management/toolbar.js b/src/block-management/toolbar.js
similarity index 100%
rename from block-management/toolbar.js
rename to src/block-management/toolbar.js
diff --git a/block-management/toolbar.scss b/src/block-management/toolbar.scss
similarity index 100%
rename from block-management/toolbar.scss
rename to src/block-management/toolbar.scss
diff --git a/store/actions/ActionTypes.js b/src/store/actions/ActionTypes.js
similarity index 100%
rename from store/actions/ActionTypes.js
rename to src/store/actions/ActionTypes.js
diff --git a/store/actions/index.js b/src/store/actions/index.js
similarity index 100%
rename from store/actions/index.js
rename to src/store/actions/index.js
diff --git a/store/actions/test.js b/src/store/actions/test.js
similarity index 100%
rename from store/actions/test.js
rename to src/store/actions/test.js
diff --git a/store/index.js b/src/store/index.js
similarity index 100%
rename from store/index.js
rename to src/store/index.js
diff --git a/store/reducers/index.js b/src/store/reducers/index.js
similarity index 100%
rename from store/reducers/index.js
rename to src/store/reducers/index.js
diff --git a/store/reducers/test.js b/src/store/reducers/test.js
similarity index 100%
rename from store/reducers/test.js
rename to src/store/reducers/test.js
diff --git a/src/variables.android.scss b/src/variables.android.scss
new file mode 100644
index 0000000000..5e3b748a6f
--- /dev/null
+++ b/src/variables.android.scss
@@ -0,0 +1,4 @@
+/** @format */
+
+// Fonts
+$default-monospace-font: monospace;
diff --git a/src/variables.ios.scss b/src/variables.ios.scss
new file mode 100644
index 0000000000..6c0e52ba1e
--- /dev/null
+++ b/src/variables.ios.scss
@@ -0,0 +1,4 @@
+/** @format */
+
+// Fonts
+$default-monospace-font: courier;

From de8629d995c582945e705f9748d13e2a84ab36aa Mon Sep 17 00:00:00 2001
From: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
Date: Thu, 19 Apr 2018 17:34:25 +0300
Subject: [PATCH 7/9] Resolve the import's absolute path and include it

---
 sass-transformer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sass-transformer.js b/sass-transformer.js
index 7a7cea0e42..f9177b378e 100644
--- a/sass-transformer.js
+++ b/sass-transformer.js
@@ -120,7 +120,7 @@ function transform( src, filename, options ) {
 				const importerOptions = this.options;
 				const incPaths = importerOptions.includePaths.slice( 0 ).split( ':' );
 				if ( urlPath.dir.length > 0 ) {
-					incPaths.unshift( urlPath.dir ); // add the file's dir to the search array
+					incPaths.unshift( path.resolve( path.dirname( filename ), urlPath.dir ) ); // add the file's dir to the search array
 				}
 				const f = findVariant( urlPath.name, exts, incPaths );
 

From 0d2b5016393f943d00631092c9af4a60e781ce13 Mon Sep 17 00:00:00 2001
From: Stefanos Togkoulidis <stefanostogoulidis@gmail.com>
Date: Thu, 19 Apr 2018 17:35:29 +0300
Subject: [PATCH 8/9] No need for `src/` in include paths

---
 sass-transformer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sass-transformer.js b/sass-transformer.js
index f9177b378e..0ba4babc3b 100644
--- a/sass-transformer.js
+++ b/sass-transformer.js
@@ -60,7 +60,7 @@ if ( reactNativeMinorVersion >= 52 ) {
 }
 
 // TODO: need to find a way to pass the include paths and the default asset files via some config
-const autoImportIncludePaths = [ 'src', 'gutenberg/edit-post/assets/stylesheets' ];
+const autoImportIncludePaths = [ 'gutenberg/edit-post/assets/stylesheets' ];
 const autoImportAssets = [
 	'_colors.scss',
 	'_admin-schemes.scss',

From 69e671785402ecd2b84379c18167761d49a7856f Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 19 Apr 2018 16:59:41 +0200
Subject: [PATCH 9/9] Replace TouchableNativeFeedback by TouchableOpacity

---
 src/block-management/toolbar.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/block-management/toolbar.js b/src/block-management/toolbar.js
index 42e5b5f6e2..07a4d3bd43 100644
--- a/src/block-management/toolbar.js
+++ b/src/block-management/toolbar.js
@@ -2,7 +2,7 @@
  * @format */
 
 import React from 'react';
-import { View, TouchableNativeFeedback, Text } from 'react-native';
+import { View, TouchableOpacity, Text } from 'react-native';
 import { ToolbarButton } from './constants';
 
 import styles from './toolbar.scss';
@@ -16,31 +16,31 @@ export default class Toolbar extends React.Component<PropsType> {
 	render() {
 		return (
 			<View style={ styles.toolbar }>
-				<TouchableNativeFeedback
+				<TouchableOpacity
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.PLUS, this.props.uid ) }
 				>
 					<View style={ styles.toolbarButton }>
 						<Text>+</Text>
 					</View>
-				</TouchableNativeFeedback>
+				</TouchableOpacity>
 				<View style={ styles.buttonSeparator } />
-				<TouchableNativeFeedback
+				<TouchableOpacity
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.UP, this.props.uid ) }
 				>
 					<View style={ styles.toolbarButton }>
 						<Text>▲</Text>
 					</View>
-				</TouchableNativeFeedback>
+				</TouchableOpacity>
 				<View style={ styles.buttonSeparator } />
-				<TouchableNativeFeedback
+				<TouchableOpacity
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.DOWN, this.props.uid ) }
 				>
 					<View style={ styles.toolbarButton }>
 						<Text>▼</Text>
 					</View>
-				</TouchableNativeFeedback>
+				</TouchableOpacity>
 				<View style={ styles.buttonSeparator } />
-				<TouchableNativeFeedback
+				<TouchableOpacity
 					onPress={ this.props.onButtonPressed.bind(
 						this,
 						ToolbarButton.SETTINGS,
@@ -51,15 +51,15 @@ export default class Toolbar extends React.Component<PropsType> {
 						{ /* eslint-disable-next-line jsx-a11y/accessible-emoji */ }
 						<Text>⚙️</Text>
 					</View>
-				</TouchableNativeFeedback>
+				</TouchableOpacity>
 				<View style={ styles.buttonSeparator } />
-				<TouchableNativeFeedback
+				<TouchableOpacity
 					onPress={ this.props.onButtonPressed.bind( this, ToolbarButton.DELETE, this.props.uid ) }
 				>
 					<View style={ styles.toolbarButton }>
 						<Text>🗑</Text>
 					</View>
-				</TouchableNativeFeedback>
+				</TouchableOpacity>
 			</View>
 		);
 	}