javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 22:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3364 from NativeScript/fix-search-bar

Browse Source 
Fix SearchBar for Android
This commit is contained in:
Rossen Hristov
2016-12-27 12:34:14 +02:00
committed by GitHub
parent ca4f39f272 80f45105bc
commit e4bf9ec7b2
1 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tns-core-modules/ui/search-bar/search-bar.android.ts
View File

@ -96,7 +96,8 @@ export class SearchBar extends SearchBarBase {
get [backgroundColorProperty.native](): number { get [backgroundColorProperty.native](): number {
// TODO: Why do we get DrawingCacheBackgroundColor but set backgroundColor????? // TODO: Why do we get DrawingCacheBackgroundColor but set backgroundColor?????
return this._android.getDrawingCacheBackgroundColor(); let result = this._android.getDrawingCacheBackgroundColor();
return result;
} }
set [backgroundColorProperty.native](value: Color) { set [backgroundColorProperty.native](value: Color) {
let color: number; let color: number;
@ -107,17 +108,14 @@ export class SearchBar extends SearchBarBase {
} }
this._android.setBackgroundColor(color); this._android.setBackgroundColor(color);
changeSearchViewPlateBackgroundColor(this._android, color); let searchPlate = this._getSearchPlate();
searchPlate.setBackgroundColor(color);
} }
get [colorProperty.native](): number { get [colorProperty.native](): number {
let textView = getSearchViewTextView(this._android); let textView = this._getTextView();
if (textView) {
return textView.getCurrentTextColor(); return textView.getCurrentTextColor();
} }
throw new Error("TextView not founf in android.widget.SearchView.");
}
set [colorProperty.native](value: Color) { set [colorProperty.native](value: Color) {
let color: number; let color: number;
if (typeof value === "number") { if (typeof value === "number") {
@ -126,21 +124,19 @@ export class SearchBar extends SearchBarBase {
color = value.android; color = value.android;
} }
let textView = getSearchViewTextView(this._android); let textView = this._getTextView();
if (textView) {
textView.setTextColor(color); textView.setTextColor(color);
} }
}
get [fontInternalProperty.native](): { typeface: android.graphics.Typeface, fontSize: number } { get [fontInternalProperty.native](): { typeface: android.graphics.Typeface, fontSize: number } {
let textView = getSearchViewTextView(this._android); let textView = this._getTextView();
return { return {
typeface: textView.getTypeface(), typeface: textView.getTypeface(),
fontSize: textView.getTextSize() fontSize: textView.getTextSize()
}; };
} }
set [fontInternalProperty.native](value: Font | { typeface: android.graphics.Typeface, fontSize: number }) { set [fontInternalProperty.native](value: Font | { typeface: android.graphics.Typeface, fontSize: number }) {
let textView = getSearchViewTextView(this._android); let textView = this._getTextView();
let typeface: android.graphics.Typeface; let typeface: android.graphics.Typeface;
if (value instanceof Font) { if (value instanceof Font) {
@ -174,44 +170,31 @@ export class SearchBar extends SearchBarBase {
this._android.setQueryHint(value); this._android.setQueryHint(value);
} }
get [textFieldBackgroundColorProperty.native](): number { get [textFieldBackgroundColorProperty.native](): number {
let textView = getTextView(this._android); let textView = this._getTextView();
return textView.getCurrentTextColor(); return textView.getCurrentTextColor();
} }
set [textFieldBackgroundColorProperty.native](value: Color) { set [textFieldBackgroundColorProperty.native](value: Color) {
let textView = getTextView(this._android); let textView = this._getTextView();
let color = value instanceof Color ? value.android : value; let color = value instanceof Color ? value.android : value;
textView.setBackgroundColor(color); textView.setBackgroundColor(color);
} }
get [textFieldHintColorProperty.native](): number { get [textFieldHintColorProperty.native](): number {
let textView = getTextView(this._android); let textView = this._getTextView();
return textView.getCurrentTextColor(); return textView.getCurrentTextColor();
} }
set [textFieldHintColorProperty.native](value: Color) { set [textFieldHintColorProperty.native](value: Color) {
let textView = getTextView(this._android); let textView = this._getTextView();
let color = value instanceof Color ? value.android : value; let color = value instanceof Color ? value.android : value;
textView.setHintTextColor(color); textView.setHintTextColor(color);
} }
private _getTextView(): android.widget.TextView {
let id = this._android.getContext().getResources().getIdentifier("android:id/search_src_text", null, null);
return <android.widget.TextView>this._android.findViewById(id);
} }
function changeSearchViewPlateBackgroundColor(searchView: android.widget.SearchView, color: number) { private _getSearchPlate(): android.widget.LinearLayout {
let textView = getSearchViewTextView(searchView); let id = this._android.getContext().getResources().getIdentifier("android:id/search_plate", null, null);
if (textView) { return <android.widget.LinearLayout>this._android.findViewById(id);
textView.setBackgroundColor(color);
} }
} }
function getSearchViewTextView(searchView: android.widget.SearchView): android.widget.TextView {
let id = searchView.getContext().getResources().getIdentifier("android:id/search_plate", null, null);
return <android.widget.TextView>searchView.findViewById(id);
}
function getTextView(bar: android.widget.SearchView): android.widget.TextView {
if (bar) {
var id = bar.getContext().getResources().getIdentifier("android:id/search_src_text", null, null);
if (id) {
return <android.widget.TextView>bar.findViewById(id);
}
}
return undefined;
}