Skip to content

Commit dc72d25

Browse files
author
VladimirAmiorkov
committed
feat: upgrade to latest native iOS Facebook SDK frameworks
1 parent e5ce864 commit dc72d25

15 files changed

+251
-608
lines changed

demo-angular/app/app.module.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
22
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
33
import { NativeScriptRouterModule } from "nativescript-angular/router";
44
import { AppComponent } from "./app.component";
5-
import { LoginModule } from "./pages/login/login.module";
6-
import { HomeModule } from "./pages/home/home.module";
75
import { NativeScriptFacebookModule } from "nativescript-facebook/angular";
86
import * as application from 'tns-core-modules/application';
97
import { routes } from "./app.routing";
108
import { NavigationService } from "./services/navigation.service";
11-
import { init, LoginBehavior } from "nativescript-facebook";
9+
import { init } from "nativescript-facebook";
1210

1311
application.on(application.launchEvent, function (args) {
14-
init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
12+
init("1771472059772879");
1513
});
1614

1715
@NgModule({

demo-vue/app/app.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Login from "./components/Login";
44

55
import {
66
init,
7-
LoginBehavior
87
} from 'nativescript-facebook';
98

109
import FacebookPlugin from "nativescript-facebook/vue";
@@ -13,7 +12,7 @@ Vue.use(FacebookPlugin);
1312
Vue.config.silent = true;
1413

1514
application.on(application.launchEvent, function (args) {
16-
init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
15+
init("1771472059772879");
1716
});
1817

1918
new Vue({

demo/app/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as application from 'tns-core-modules/application';
2-
import { init, LoginBehavior } from "nativescript-facebook";
2+
import { init } from "nativescript-facebook";
33

44
application.on(application.launchEvent, function (args) {
5-
init("1771472059772879", LoginBehavior.LoginBehaviorWeb);
5+
init("1771472059772879");
66
});
77

88
application.run({ moduleName: "app-root" });

src/index.android.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export * from "./login-manager";
22
export * from "./ui/login-button";
33
export * from "./login-event-data";
4-
export * from "./login-behavior";
54
export * from './share-manager';
65
export * from "./ui/share-button";

src/index.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ export * from "./login-manager";
22
export * from "./ui/login-button";
33
export * from "./login-response";
44
export * from "./login-event-data";
5-
export * from "./login-behavior";
65
export * from './share-manager';
76
export * from "./ui/share-button";

src/index.ios.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as applicationModule from "tns-core-modules/application";
22
export * from "./ui/login-button";
33
export * from "./login-manager";
44
export * from "./login-event-data";
5-
export * from "./login-behavior";
65
export * from './share-manager';
76
export * from "./ui/share-button";
87

@@ -13,11 +12,11 @@ class BaseDelegate extends UIResponder implements UIApplicationDelegate {
1312
public static ObjCProtocols = [UIApplicationDelegate];
1413

1514
applicationDidFinishLaunchingWithOptions(application: UIApplication, launchOptions: NSDictionary<any, any>): boolean {
16-
return FBSDKApplicationDelegate.sharedInstance().applicationDidFinishLaunchingWithOptions(application, launchOptions);
15+
return FBSDKApplicationDelegate.sharedInstance.applicationDidFinishLaunchingWithOptions(application, launchOptions);
1716
}
1817

1918
applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation) {
20-
return FBSDKApplicationDelegate.sharedInstance().applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation);
19+
return FBSDKApplicationDelegate.sharedInstance.applicationOpenURLSourceApplicationAnnotation(application, url, sourceApplication, annotation);
2120
}
2221

2322
applicationDidBecomeActive(application: UIApplication): void {

src/login-behavior.d.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/login-behavior.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/login-manager.android.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as application from "tns-core-modules/application";
22
import { LoginResponse } from './login-response';
33
import { FacebookAccessToken } from "./facebook-access-token";
4-
import { LoginBehavior } from "./login-behavior";
54

65
const LOGIN_PERMISSIONS = ["public_profile", "email"];
76

@@ -15,7 +14,7 @@ export function _registerLogoutCallback(callback: Function) {
1514
onLogoutCallback = callback;
1615
}
1716

18-
export function init(fbId: string, fbLoginBehavior: LoginBehavior = LoginBehavior.LoginBehaviorBrowser) {
17+
export function init(fbId: string) {
1918
com.facebook.FacebookSdk.setAutoLogAppEventsEnabled(true);
2019
setAppId(fbId);
2120
androidApplication = application.android;

src/login-manager.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ export declare function _registerLoginCallback(callback: Function): void;
22
export declare function _registerLogoutCallback(callback: Function): void;
33
export declare let onLoginCallback: Function;
44
export declare let onLogoutCallback: Function;
5-
import { LoginBehavior } from "./login-behavior";
65
import { FacebookAccessToken } from "./facebook-access-token";
76

87
/**
98
* Sets the Facebook application Id for the current app and init the native facebook sdk.
109
* @param {string} fbAppId the application Id
11-
* @param {LoginBehavior} fbLoginBehavior (iOS only) specifies the login behavior, default value: LoginBehavior.FBSDKLoginBehaviorSystemAccount
1210
*/
13-
export declare function init(fbId: string, fbLoginBehavior?: LoginBehavior): void;
11+
export declare function init(fbId: string): void;
1412
/**
1513
* Request the specified publish permissions.
1614
* @param {string[]} permissions Array of the requested publish permissions.

0 commit comments

Comments
 (0)