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

[TIMOB-26187] Android: Fix Ti.UI.CardView borderRadius #10157

Merged
merged 7 commits into from
Jul 12, 2018
Merged

[TIMOB-26187] Android: Fix Ti.UI.CardView borderRadius #10157

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bdce01e
[TIMOB-26187] Fix Ti.UI.CardView borderRadius
Jul 9, 2018
679b172
Merge branch 'master' into TIMOB-26187
garymathews Jul 10, 2018
2e3a8e9
Merge branch 'master' into TIMOB-26187
garymathews Jul 10, 2018
ec0b9c5
Merge branch 'master' into TIMOB-26187
ssjsamir Jul 11, 2018
4cc87b1
Merge branch 'master' into TIMOB-26187
hansemannn Jul 11, 2018
29c4a69
Merge branch 'master' into TIMOB-26187
garymathews Jul 11, 2018
ba8a0bc
Merge branch 'master' into TIMOB-26187
hansemannn Jul 12, 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
6 changes: 6 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUICardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,10 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
super.propertyChanged(key, oldValue, newValue, proxy);
}
}

@Override
protected boolean hasBorder(KrollDict d)
{
return false;
}
}
2 changes: 1 addition & 1 deletion android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ private boolean hasGradient(KrollDict d)
return d.containsKeyAndNotNull(TiC.PROPERTY_BACKGROUND_GRADIENT);
}

private boolean hasBorder(KrollDict d)
protected boolean hasBorder(KrollDict d)
{
return d.containsKeyAndNotNull(TiC.PROPERTY_BORDER_COLOR)
|| (d.containsKeyAndNotNull(TiC.PROPERTY_BORDER_WIDTH)
Expand Down