Merge branch 'platform-window'

3 files changed, 18 insertions, 1 deletions

diff --git a/app/components/PlatformWindow.android.js b/app/components/PlatformWindow.android.js
new file mode 100644
index 0000000000..6670a654e7
--- /dev/null
+++ b/app/components/PlatformWindow.android.js
@@ -0,0 +1,17 @@
+// @flow
+import React, { Component } from 'react';
+import { KeyboardAvoidingView } from 'react-native';
+
+export default class PlatformWindow extends Component {
+  props: {
+    children: Array<React.Element<*>> | React.Element<*>
+  };
+
+  render() {
+    return (
+      <KeyboardAvoidingView behavior={'position'}>
+        { this.props.children }
+      </KeyboardAvoidingView>
+    );
+  }
+}
\ No newline at end of file
diff --git a/app/components/WindowChrome.css b/app/components/PlatformWindow.css
index 2c6b820a40..2c6b820a40 100644
--- a/app/components/WindowChrome.css
+++ b/app/components/PlatformWindow.css
diff --git a/app/components/WindowChrome.js b/app/components/PlatformWindow.js
index d7094813db..8b8e2c462f 100644
--- a/app/components/WindowChrome.js
+++ b/app/components/PlatformWindow.js
@@ -1,7 +1,7 @@
 // @flow
 import React, { Component } from 'react';
 
-export default class WindowChrome extends Component {
+export default class PlatformWindow extends Component {
   props: {
     children: Array<React.Element<*>> | React.Element<*>
   }