Skip to content

[ANDROID] color support for TextInput secureTextEntry={true} #6563

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

Closed
wants to merge 8 commits into from
Closed

[ANDROID] color support for TextInput secureTextEntry={true} #6563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c5edea
add support for color
brunobar79 Mar 21, 2016
f410eca
update branch
brunobar79 Mar 21, 2016
f30138d
Merge branch 'master' into pr/android-password-input-color
brunobar79 Mar 21, 2016
9ecf6e9
updated TestInputExample with colors
brunobar79 Mar 21, 2016
d93f77b
Merge branch 'master' of github.com:facebook/react-native into pr/and…
brunobar79 Mar 21, 2016
5d7616e
example updated
brunobar79 Mar 21, 2016
48e7608
Merge branch 'pr/android-password-input-color' of github.com:brunobar…
brunobar79 Mar 21, 2016
c8f42ff
Merge branch 'master' into pr/android-password-input-color
brunobar79 Mar 21, 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
18 changes: 13 additions & 5 deletions Examples/UIExplorer/TextInputExample.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,19 @@ exports.examples = [
title: 'Passwords',
render: function() {
return (
<TextInput
defaultValue="iloveturtles"
password={true}
style={styles.singleLine}
/>
<View>
<TextInput
defaultValue="iloveturtles"
secureTextEntry={true}
style={styles.singleLine}
/>
<TextInput
secureTextEntry={true}
style={[styles.singleLine, {color: 'red'}]}
placeholder="color is supported too"
placeholderTextColor="red"
/>
</View>
);
}
},
Expand Down
9 changes: 9 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,15 @@ public void setSelectionColor(ReactEditText view, @Nullable Integer color) {
}
}

@ReactProp(name = ViewProps.COLOR, customType = "Color")
public void setColor(ReactEditText view, @Nullable Integer color) {
if (color == null) {
view.setTextColor(DefaultStyleValuesUtil.getDefaultTextColor(view.getContext()));
} else {
view.setTextColor(color);
}
}

@ReactProp(name = "underlineColorAndroid", customType = "Color")
public void setUnderlineColor(ReactEditText view, @Nullable Integer underlineColor) {
if (underlineColor == null) {
Expand Down