fix(android-styling): correctly detect if drawable uses ColorFilter (… · NativeScript/NativeScript@11d3884 · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 773
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 11d3884

Browse filesBrowse the repository at this point in the historyBrowse files

edusperoni

authored and

dtopuzov

committed

fix(android-styling): correctly detect if drawable uses ColorFilter (#6342)

* fix(android-styling): correctly detect if drawable uses ColorFilter Treat a widget with a BorderDrawable background as any other, even if it's FilterOnly If the drawable has been replaced with a new one, clear _cachedDrawable Fixes #6341 * test(button): add test for changing border-radius and color in button * test: fix test checks for IOS * keep original drawable cached

1 parent 00c25b7 commit 11d3884
Copy full SHA for 11d3884

2 files changed

+16Lines changed: 16 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tests/app/ui/button
  • button-tests.ts
• tns-core-modules/ui/styling
  • background.android.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tests/app/ui/button/button-tests.ts‎

Copy file name to clipboardExpand all lines: tests/app/ui/button/button-tests.ts

+15Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -404,3 +404,18 @@ export function test_setting_formattedText_With_UnknownFont_DoesNotCrash() {
404	404	TKUnit.waitUntilReady(() => btn.isLayoutValid);
405	405	});
406	406	}
	407	+
	408	+ export function test_Native_Background_Color_BorderRadius_Change() {
	409	+ let view = new buttonModule.Button();
	410	+ view.text = "TEST";
	411	+ helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
	412	+ let page = <pagesModule.Page>views[1];
	413	+ page.css = ".border { background-color: #00FF00; border-radius: 1; } .colorfilter { background-color: #FF0000; }";
	414	+ view.className = "border";
	415	+ helper.waitUntilLayoutReady(view);
	416	+ TKUnit.assertEqual(buttonTestsNative.getNativeBackgroundColor(view).hex, "#00FF00");
	417	+ view.className = "colorfilter";
	418	+ helper.waitUntilLayoutReady(view);
	419	+ TKUnit.assertEqual(buttonTestsNative.getNativeBackgroundColor(view).hex, "#FF0000");
	420	+ });
	421	+ }

Collapse file

‎tns-core-modules/ui/styling/background.android.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/styling/background.android.ts

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -50,6 +50,7 @@ export module ad {
50	50
51	51	if (isSetColorFilterOnlyWidget(nativeView)
52	52	&& drawable
	53	+ && !(drawable instanceof org.nativescript.widgets.BorderDrawable)
53	54	&& !background.hasBorderWidth()
54	55	&& !background.hasBorderRadius()
55	56	&& !background.clipPath

0 commit comments

Comments

0 (0)