Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modal Status Bar Translucent #7157

Closed
wants to merge 14 commits into from
Closed

Modal Status Bar Translucent #7157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4b2a90f
add translucentStatusBar prop to Modal for android
jemise111 Apr 21, 2016
e4dfc8a
taps to spaces
jemise111 Apr 22, 2016
e607b2d
small cleanup
jemise111 Apr 21, 2016
ae66097
use StatusBar current height instead of fixed
jemise111 Apr 22, 2016
dbe56b1
require statusbar
jemise111 Apr 22, 2016
7c499a7
Merge branch 'master' into js-modal-status-bar-translucent
jemise111 Apr 28, 2016
01939a3
dont change top value for older api versions
jemise111 Apr 28, 2016
92adea5
remove translucentStatusBar prop, make it default behavior
jemise111 May 1, 2016
6d91f09
fix conflicts with master
jemise111 May 1, 2016
3294494
new line at end of modal file
jemise111 May 1, 2016
b378c49
Merge branch 'master' into js-modal-status-bar-translucent
jemise111 May 3, 2016
2903c7e
remove non static proptypes and defaultprops
jemise111 May 5, 2016
0dae882
Merge branch 'master' into js-modal-status-bar-translucent
jemise111 May 5, 2016
9ba161e
Merge branch 'js-modal-status-bar-translucent' of https://github.com/…
jemise111 May 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Libraries/Modal/Modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
const Platform = require('Platform');
const PropTypes = require('ReactPropTypes');
const React = require('React');
const StatusBar = require('StatusBar');
const StyleSheet = require('StyleSheet');
const View = require('View');
const deprecatedPropType = require('deprecatedPropType');

const requireNativeComponent = require('requireNativeComponent');
const RCTModalHostView = requireNativeComponent('RCTModalHostView', null);

const STATUS_BAR_HEIGHT = StatusBar.currentHeight;

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no-undef: 'StatusBar' is not defined.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

identifier StatusBar Could not resolve name

/**
* A Modal component covers the native view (e.g. UIViewController, Activity)
* that contains the React Native root.
Expand Down Expand Up @@ -56,9 +59,10 @@ class Modal extends React.Component {
return null;
}

const containerBackgroundColor = {
const containerStyles = {
backgroundColor: this.props.transparent ? 'transparent' : 'white',
};
top: Platform.OS === 'android' && Platform.Version >= 19 ? STATUS_BAR_HEIGHT : 0,
}

let animationType = this.props.animationType;
if (!animationType) {
Expand All @@ -78,7 +82,7 @@ class Modal extends React.Component {
style={styles.modal}
onStartShouldSetResponder={this._shouldSetResponder}
>
<View style={[styles.container, containerBackgroundColor]}>
<View style={[styles.container, containerStyles]}>
{this.props.children}
</View>
</RCTModalHostView>
Expand All @@ -102,4 +106,4 @@ const styles = StyleSheet.create({
}
});

module.exports = Modal;
module.exports = Modal;
3 changes: 3 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
private void updateProperties() {
Assertions.assertNotNull(mDialog, "mDialog must exist when we call updateProperties");

mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);

if (mTransparent) {
mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
} else {
Expand Down Expand Up @@ -279,3 +281,4 @@ private EventDispatcher getEventDispatcher() {
}
}
}