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

fix: automated tests are now passing

Browse Source
This commit is contained in:
Martin Guillon
2021-02-17 17:07:38 +01:00
parent 5fc7d1a4d4
commit 016313bef1
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/ui/action-bar/index.android.ts
View File

@ -225,7 +225,16 @@ export class ActionBar extends ActionBarBase {
const nativeView = this.nativeViewProtected; const nativeView = this.nativeViewProtected;
if (backgroundDrawable && onlyColor && sdkVersion() >= 21) { if (backgroundDrawable && onlyColor && sdkVersion() >= 21) {
if (isBorderDrawable && (<any>nativeView)._cachedDrawable) { if (isBorderDrawable && (<any>nativeView)._cachedDrawable) {
backgroundDrawable = (<any>nativeView)._cachedDrawable.newDrawable(nativeView.getResources()); backgroundDrawable = (<any>nativeView)._cachedDrawable;
// we need to duplicate the drawable or we lose the "default" cached drawable
const constantState = backgroundDrawable.getConstantState();
if (constantState) {
try {
backgroundDrawable = constantState.newDrawable(nativeView.getResources());
// eslint-disable-next-line no-empty
} catch {}
}
nativeView.setBackground(backgroundDrawable);
nativeView.setBackground(backgroundDrawable); nativeView.setBackground(backgroundDrawable);
} }

11
packages/core/ui/button/index.android.ts
View File

@ -62,10 +62,17 @@ export class Button extends ButtonBase {
public _applyBackground(background: Background, isBorderDrawable, onlyColor: boolean, backgroundDrawable: any) { public _applyBackground(background: Background, isBorderDrawable, onlyColor: boolean, backgroundDrawable: any) {
const nativeView = this.nativeViewProtected; const nativeView = this.nativeViewProtected;
console.log('_applyBackground', nativeView, backgroundDrawable, onlyColor, isBorderDrawable);
if (backgroundDrawable && onlyColor) { if (backgroundDrawable && onlyColor) {
if (isBorderDrawable && (<any>nativeView)._cachedDrawable) { if (isBorderDrawable && (<any>nativeView)._cachedDrawable) {
backgroundDrawable = (<any>nativeView)._cachedDrawable.newDrawable(nativeView.getResources()); backgroundDrawable = (<any>nativeView)._cachedDrawable;
// we need to duplicate the drawable or we lose the "default" cached drawable
const constantState = backgroundDrawable.getConstantState();
if (constantState) {
try {
backgroundDrawable = constantState.newDrawable(nativeView.getResources());
// eslint-disable-next-line no-empty
} catch {}
}
nativeView.setBackground(backgroundDrawable); nativeView.setBackground(backgroundDrawable);
} }

2
packages/core/ui/core/view/index.android.ts
View File

@ -996,7 +996,7 @@ export class View extends ViewCommon {
if (constantState) { if (constantState) {
try { try {
drawable = constantState.newDrawable(nativeView.getResources()); drawable = constantState.newDrawable(nativeView.getResources());
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
} catch {} } catch {}
} }
} }