FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(android-styling): correctly detect if drawable uses ColorFilter by edusperoni · Pull Request #6342 · NativeScript/NativeScript · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fdda551
fix(android-styling): correctly detect if drawable uses ColorFilter
edusperoni Oct 3, 2018
a506409
test(button): add test for changing border-radius and color in button
edusperoni Oct 3, 2018
e9bd886
Merge branch 'master' into fix-button-background
manoldonev Oct 12, 2018
42702fb
Merge branch 'master' into fix-button-background
manoldonev Oct 15, 2018
8c5ff06
Merge branch 'master' into fix-button-background
manoldonev Oct 16, 2018
4734ad9
Merge branch 'master' into fix-button-background
Oct 22, 2018
7749203
Merge branch 'master' into fix-button-background
manoldonev Oct 23, 2018
b6e5c75
Merge branch 'master' into fix-button-background
manoldonev Oct 23, 2018
b2ad854
Merge branch 'master' into fix-button-background
manoldonev Oct 26, 2018
0c66a55
Merge branch 'master' into fix-button-background
manoldonev Oct 26, 2018
2430ea5
Merge branch 'master' into fix-button-background
Nov 9, 2018
e3ea51f
Merge branch 'master' into fix-button-background
Nov 12, 2018
9719a53
test: fix test checks for IOS
Nov 13, 2018
9e44021
keep original drawable cached
edusperoni Nov 21, 2018
63c17e6
Merge branch 'fix-button-background' of github.com:edusperoni/NativeS…
edusperoni Nov 21, 2018
aac34e5
Merge branch 'master' into fix-button-background
Nov 21, 2018
f795c7c
Merge branch 'master' into fix-button-background
Nov 23, 2018
36e6fe8
Merge branch 'master' into fix-button-background
SvetoslavTsenov Nov 23, 2018
c95832c
Merge branch 'master' into fix-button-background
dtopuzov Nov 26, 2018
f0f5a4a
Merge branch 'master' into fix-button-background
dtopuzov Nov 27, 2018
File filter

Filter by extension

Filter by extension .ts  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 15 additions & 0 deletions tests/app/ui/button/button-tests.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -404,3 +404,18 @@ export function test_setting_formattedText_With_UnknownFont_DoesNotCrash() {
TKUnit.waitUntilReady(() => btn.isLayoutValid);
});
}

export function test_Native_Background_Color_BorderRadius_Change() {
let view = new buttonModule.Button();
view.text = "TEST";
helper.buildUIAndRunTest(view, function (views: Array<viewModule.View>) {
let page = <pagesModule.Page>views[1];
page.css = ".border { background-color: #00FF00; border-radius: 1; } .colorfilter { background-color: #FF0000; }";
view.className = "border";
helper.waitUntilLayoutReady(view);
TKUnit.assertEqual(buttonTestsNative.getNativeBackgroundColor(view).hex, "#00FF00");
view.className = "colorfilter";
helper.waitUntilLayoutReady(view);
TKUnit.assertEqual(buttonTestsNative.getNativeBackgroundColor(view).hex, "#FF0000");
});
}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export module ad {

if (isSetColorFilterOnlyWidget(nativeView)
&& drawable
&& !(drawable instanceof org.nativescript.widgets.BorderDrawable)
&& !background.hasBorderWidth()
&& !background.hasBorderRadius()
&& !background.clipPath
Expand Down

Back | FazBrowse Home | New Git URL