Merge branch 'platform-window'

5 files changed, 22 insertions, 5 deletions

diff --git a/app/assets/css/style.css b/app/assets/css/style.css
index d3da3124a0..ac33356ce0 100644
--- a/app/assets/css/style.css
+++ b/app/assets/css/style.css
@@ -6,7 +6,7 @@
 @import 'transitions.css';
 
 /* app */
-@import '../../components/WindowChrome.css';
+@import '../../components/PlatformWindow.css';
 @import '../../components/CustomScrollbars.css';
 @import '../../components/Login.css';
 @import '../../components/Connect.css';
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<*>
   }
diff --git a/app/routes.js b/app/routes.js
index 9caea27884..1fc94b795b 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import { Switch, Route, Redirect } from 'react-router';
 import { CSSTransitionGroup } from 'react-transition-group';
-import WindowChrome from './components/WindowChrome';
+import PlatformWindow from './components/PlatformWindow';
 import LoginPage from './containers/LoginPage';
 import ConnectPage from './containers/ConnectPage';
 import SettingsPage from './containers/SettingsPage';
@@ -91,7 +91,7 @@ export default function makeRoutes(getState: ReduxGetState, componentProps: Shar
       previousRoute = toRoute;
 
       return (
-        <WindowChrome>
+        <PlatformWindow>
           <CSSTransitionGroup component="div" className="transition-container" { ...transitionProps }>
             <Switch key={ location.key } location={ location }>
               <LoginRoute exact path="/" component={ LoginPage } />
@@ -104,7 +104,7 @@ export default function makeRoutes(getState: ReduxGetState, componentProps: Shar
               <PrivateRoute exact path="/select-location" component={ SelectLocationPage } />
             </Switch>
           </CSSTransitionGroup>
-        </WindowChrome>
+        </PlatformWindow>
       );
     }} />
   );