diff options
| author | anderklander <anderklander@gmail.com> | 2018-04-12 09:53:22 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-04-16 12:01:12 +0200 |
| commit | 898dd74e5ac86dac2638dc26975b22a9fb0392d4 (patch) | |
| tree | ddd20a989d7c5b0fc9cae12724970d69976f889c | |
| parent | cf7654cc7b3c139ac18d997da0957180c8070456 (diff) | |
| download | mullvadvpn-898dd74e5ac86dac2638dc26975b22a9fb0392d4.tar.xz mullvadvpn-898dd74e5ac86dac2638dc26975b22a9fb0392d4.zip | |
Lint for transitionstyles
| -rw-r--r-- | app/components/TransitionContainer.js | 2 | ||||
| -rw-r--r-- | app/components/TransitionContainerStyles.android.js | 16 | ||||
| -rw-r--r-- | app/components/TransitionContainerStyles.js | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/app/components/TransitionContainer.js b/app/components/TransitionContainer.js index a1609890d8..687a9ae9e0 100644 --- a/app/components/TransitionContainer.js +++ b/app/components/TransitionContainer.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Styles, Component, Animated, View, Types, UserInterface } from 'reactxp'; import type { TransitionGroupProps } from '../transitions'; -import getStyles from './TransitionContainerStyles' +import getStyles from './TransitionContainerStyles'; type TransitionContainerProps = { children: React.Node, diff --git a/app/components/TransitionContainerStyles.android.js b/app/components/TransitionContainerStyles.android.js index 30abdfede8..d335eea680 100644 --- a/app/components/TransitionContainerStyles.android.js +++ b/app/components/TransitionContainerStyles.android.js @@ -1,20 +1,16 @@ // @flow import { Styles, UserInterface } from 'reactxp'; import { MobileAppBridge } from 'NativeModules'; +import { log } from '../lib/platform'; const dimensions = UserInterface.measureWindow(); let menuBarHeight; -/*MobileAppBridge.getHeight().then(_response => {height = _response}).catch(e => { +MobileAppBridge.getMenuBarHeight().then(_response => {menuBarHeight = _response;}).catch(e => { log.error('Failed getting menuBarHeight:', e); }); -*/ -MobileAppBridge.getMenuBarHeight().then(_response => {menuBarHeight = _response}).catch(e => { - log.error('Failed getting menuBarHeight:', e); -}); - -export default getStyles = () => { +export default () => { return { animationDefaultStyle: Styles.createAnimatedViewStyle({ position: 'absolute', @@ -24,7 +20,7 @@ export default getStyles = () => { allowPointerEventsStyle: null, transitionContainerStyle: Styles.createViewStyle({ width: dimensions.width, - height: dimensions.height - menuBarHeight + 24, //TODO: Remove ugly hack since it seems that at least my LG is hard to find the real display area ... Probably needs to be fixed for some versions or models + height: dimensions.height - menuBarHeight + 24, //TODO: Remove ugly hack since it seems that at least my LG is seems hard to find the real display area ... Probably needs to be fixed for some versions or models }, false) - } -}; + }; +};
\ No newline at end of file diff --git a/app/components/TransitionContainerStyles.js b/app/components/TransitionContainerStyles.js index 522398920c..eb03570d46 100644 --- a/app/components/TransitionContainerStyles.js +++ b/app/components/TransitionContainerStyles.js @@ -17,6 +17,6 @@ const styles = { }) }; -export default function getStyles() { - return styles +export default () => { + return styles; };
\ No newline at end of file |
