Skip to content

Fixed Android _onAttached logic. Fixes setting props in code-behind. #3334

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

Merged
hamorphis merged 1 commit into from
Dec 20, 2016
Merged

Fixed Android _onAttached logic. Fixes setting props in code-behind. #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions apps/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"diagnosticLogging": false,
"emulator": false,
"rebuild": false,
"syncAllFiles": true
"syncAllFiles": true,
"stopOnEntry": true
},
{
"name": "Launch on iOS",
Expand All @@ -22,7 +23,8 @@
"sourceMaps": true,
"diagnosticLogging": false,
"emulator": false,
"rebuild": true
"rebuild": true,
"stopOnEntry": true
},
{
"name": "Attach on iOS",
Expand All @@ -32,7 +34,8 @@
"appRoot": "${workspaceRoot}",
"sourceMaps": true,
"diagnosticLogging": false,
"emulator": false
"emulator": false,
"stopOnEntry": true
},
{
"name": "Sync on Android",
Expand All @@ -44,7 +47,8 @@
"diagnosticLogging": false,
"emulator": false,
"rebuild": false,
"syncAllFiles": true
"syncAllFiles": true,
"stopOnEntry": true
},
{
"name": "Launch on Android",
Expand All @@ -55,7 +59,8 @@
"sourceMaps": true,
"diagnosticLogging": false,
"emulator": false,
"rebuild": true
"rebuild": true,
"stopOnEntry": true
},
{
"name": "Attach on Android",
Expand All @@ -65,7 +70,8 @@
"appRoot": "${workspaceRoot}",
"sourceMaps": true,
"diagnosticLogging": false,
"emulator": false
"emulator": false,
"stopOnEntry": true
}
]
}
3 changes: 1 addition & 2 deletions apps/app/ui-tests-app/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ trace.enable();
trace.setCategories(trace.categories.concat(
trace.categories.NativeLifecycle,
trace.categories.Navigation,
//trace.categories.Animation,
trace.categories.Transition
));

Expand Down Expand Up @@ -69,7 +68,7 @@ application.on(application.lowMemoryEvent, function (args: application.Applicati
}
});

application.on(application.uncaughtErrorEvent, function (args: application.ApplicationEventData) {
application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) {
if (args.android) {
// For Android applications, args.android is NativeScriptError.
console.log("### NativeScriptError: " + args.android);
Expand Down
8 changes: 3 additions & 5 deletions tns-core-modules/ui/core/view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,12 @@ export class View extends ViewCommon {
}

// copy all the locally cached values to the native android widget
applyNativeSetters(child);
return true;
}
this._eachChildView(eachChild);
} else if (this._nativeView && !this.parent) {
// copy all the locally cached values to the native android widget
applyNativeSetters(this);
}
}

applyNativeSetters(this);
}

public _onDetached(force?: boolean) {
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/styling/background.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export module ad {
_defaultBackgrounds.set(viewClass, nativeView.getBackground());
}

backgroundDrawable = new org.nativescript.widgets.BorderDrawable(v.toString());
backgroundDrawable = new org.nativescript.widgets.BorderDrawable(1, v.toString());
refreshBorderDrawable(v, <org.nativescript.widgets.BorderDrawable>backgroundDrawable);

if (getSDK() >= 16) {
Expand Down
3 changes: 2 additions & 1 deletion tns-platform-declarations/android/org.nativescript.widgets.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
}

export class BorderDrawable extends android.graphics.drawable.ColorDrawable {
constructor(id: string);
constructor(density: number);
constructor(density: number, id: string);

public refresh(
borderTopColor: number,
Expand Down