diff --git a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js index e797ad07a23..52413188abf 100644 --- a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js @@ -11,6 +11,7 @@ const React = require('React'); const Recording = require('NativeModules').Recording; +const StyleSheet = require('StyleSheet'); const View = require('View'); class CatalystRootViewTestApp extends React.Component { @@ -19,10 +20,16 @@ class CatalystRootViewTestApp extends React.Component { } render() { - return ; + return ; } } +const styles = StyleSheet.create({ + container: { + alignSelf: 'stretch', + }, +}); + module.exports = { CatalystRootViewTestApp: CatalystRootViewTestApp, }; diff --git a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js index b2d1d5802ca..7f89b087b13 100644 --- a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js +++ b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js @@ -11,6 +11,7 @@ const React = require('React'); const View = require('View'); +const StyleSheet = require('StyleSheet'); const RecordingModule = require('NativeModules').Recording; @@ -61,7 +62,7 @@ class LayoutEventsTestApp extends React.Component { + style={styles.container}> RecordingModule.onRefresh()} /> @@ -85,4 +86,13 @@ BatchedBridge.registerCallableModule( SwipeRefreshLayoutTestModule, ); +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + content: { + flex: 1, + }, +}); + module.exports = SwipeRefreshLayoutTestModule; diff --git a/ReactAndroid/src/androidTest/js/TextInputTestModule.js b/ReactAndroid/src/androidTest/js/TextInputTestModule.js index 1a214286a8a..cf7c52791c6 100644 --- a/ReactAndroid/src/androidTest/js/TextInputTestModule.js +++ b/ReactAndroid/src/androidTest/js/TextInputTestModule.js @@ -122,18 +122,18 @@ class TextInputTestApp extends React.Component { /> @@ -166,6 +166,9 @@ const styles = StyleSheet.create({ color: 'blue', fontWeight: 'bold', }, + textInputColor: { + marginLeft: 20, + }, }); const TextInputTestModule = { diff --git a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js index bc921f6318c..8d8f3c24437 100644 --- a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js +++ b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js @@ -15,14 +15,6 @@ const View = require('View'); const StyleSheet = require('StyleSheet'); const renderApplication = require('renderApplication'); - -const styles = StyleSheet.create({ - view: { - opacity: 0.75, - backgroundColor: 'rgb(255, 0, 0)', - }, -}); - class ViewSampleApp extends React.Component { state = {}; @@ -40,7 +32,7 @@ class MarginSampleApp extends React.Component { updateMargins = this.setState.bind(this, {margin: 15}); return ( ); @@ -50,13 +42,8 @@ class MarginSampleApp extends React.Component { class BorderSampleApp extends React.Component { render() { return ( - - + + ); } @@ -100,4 +87,24 @@ BatchedBridge.registerCallableModule( ViewRenderingTestModule, ); +const styles = StyleSheet.create({ + view: { + opacity: 0.75, + backgroundColor: 'rgb(255, 0, 0)', + }, + borderSample: { + borderLeftWidth: 20, + borderWidth: 5, + backgroundColor: 'blue', + }, + borderSampleContent: { + backgroundColor: 'red', + width: 20, + height: 20, + }, + marginSample: { + marginLeft: 20, + }, +}); + module.exports = ViewRenderingTestModule;