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

Jump to bottom

[AC-5514] Android: SearchView hintTextColor #9729

Merged
merged 10 commits into from
May 1, 2018
Merged

[AC-5514] Android: SearchView hintTextColor #9729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
99b584f
Android: SearchView hintTextColor
m1ga Jan 13, 2018
2de59dc
Merge branch 'master' into searchview
m1ga Jan 13, 2018
2a967b2
Merge branch 'master' into searchview
m1ga Jan 13, 2018
10e6219
Update SearchViewProxy.java
m1ga Jan 13, 2018
1285518
Update SearchViewProxy.java
m1ga Jan 13, 2018
a1f3d44
Update SearchViewProxy.java
m1ga Jan 13, 2018
bd7be3b
Update SearchViewProxy.java
m1ga Jan 13, 2018
5630c62
Merge branch 'master' into searchview
ssjsamir Jan 17, 2018
a593150
Merge branch 'master' into searchview
m1ga Jan 21, 2018
c5f7ac9
Merge branch 'master' into searchview
ssjsamir Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/android/SearchViewProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
TiC.PROPERTY_ICONIFIED,
TiC.PROPERTY_ICONIFIED_BY_DEFAULT,
TiC.PROPERTY_HINT_TEXT,
TiC.PROPERTY_HINT_TEXT_COLOR,
TiC.PROPERTY_VALUE
})
// clang-format on
Expand Down
21 changes: 21 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/searchview/TiUISearchView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ public void processProperties(KrollDict props)
if (props.containsKey(TiC.PROPERTY_HINT_TEXT)) {
searchView.setQueryHint(props.getString(TiC.PROPERTY_HINT_TEXT));
}
if (props.containsKey(TiC.PROPERTY_HINT_TEXT_COLOR)) {
try {
int id = TiRHelper.getResource("id.search_src_text");
EditText text = (EditText) searchView.findViewById(id);
if (text != null) {
text.setHintTextColor(TiConvert.toColor(props, TiC.PROPERTY_HINT_TEXT_COLOR));
}
} catch (ResourceNotFoundException e) {
Log.e(TAG, "Could not find SearchView EditText");
}
}
if (props.containsKey(TiC.PROPERTY_VALUE)) {
changeEventEnabled = false;
searchView.setQuery(props.getString(TiC.PROPERTY_VALUE), false);
Expand Down Expand Up @@ -96,6 +107,16 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
}
} else if (key.equals(TiC.PROPERTY_HINT_TEXT)) {
searchView.setQueryHint((String) newValue);
} else if (key.equals(TiC.PROPERTY_HINT_TEXT_COLOR)) {
try {
int id = TiRHelper.getResource("id.search_src_text");
EditText text = (EditText) searchView.findViewById(id);
if (text != null) {
text.setHintTextColor(TiConvert.toColor((String) newValue));
}
} catch (ResourceNotFoundException e) {
Log.e(TAG, "Could not find SearchView EditText");
}
} else if (key.equals(TiC.PROPERTY_VALUE)) {
searchView.setQuery((String) newValue, false);
} else if (key.equals(TiC.PROPERTY_ICONIFIED)) {
Expand Down
8 changes: 8 additions & 0 deletions apidoc/Titanium/UI/Android/SearchView.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ properties:
type: String
default: no hint text

- name: hintTextColor
summary: Color of hint text that displays when field is empty.
description: |
Color of hint text that displays when field is empty.
type: String
default: Default Android theme's hint text color.
since: 7.1.0

- name: value
summary: Value of the search view.
description: |
Expand Down