Skip to content

Commit 6b44588

Browse files
triniwiztriniwiz
committed
feat: upgrade dependencies
closes: #131 closes: #130 closes: #129 closes: #127 closes: #123 closes: #51
1 parent 8b4f102 commit 6b44588

File tree

62 files changed

+2226
-2171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2226
-2171
lines changed

‎packages/firebase-admob/adsconsent/index.android.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ import { AdsConsentBase, AdsConsentDebugGeography, AdsConsentStatus } from './co
55
export { AdsConsentStatus, AdsConsentDebugGeography };
66

77
export class AdsConsent extends AdsConsentBase {
8-
static #geography: AdsConsentDebugGeography;
9-
static #deviceIds: string[];
10-
static #tagForUnderAgeOfConsent: boolean;
11-
static #consentForm: com.google.android.ump.ConsentForm;
12-
static #consentInfo: com.google.android.ump.ConsentInformation;
8+
static _geography: AdsConsentDebugGeography;
9+
static _deviceIds: string[];
10+
static _tagForUnderAgeOfConsent: boolean;
11+
static _consentForm: com.google.android.ump.ConsentForm;
12+
static _consentInfo: com.google.android.ump.ConsentInformation;
1313
static reset() {
1414
org.nativescript.firebase.admob.FirebaseAdmob.AdConsent.reset(Utils.android.getApplicationContext());
1515
}
1616
static addTestDevices(deviceIds: string[]) {
17-
this.#deviceIds = deviceIds;
17+
this._deviceIds = deviceIds;
1818
}
1919
static getStatus(): AdsConsentStatus {
2020
return org.nativescript.firebase.admob.FirebaseAdmob.AdConsent.getStatus(Utils.android.getApplicationContext()) as any;
2121
}
2222
static requestInfoUpdate(): Promise<void> {
2323
return new Promise((resolve, reject) => {
2424
const info = {};
25-
if (this.#geography) {
26-
info['geography'] = this.#geography;
25+
if (this._geography) {
26+
info['geography'] = this._geography;
2727
}
2828

29-
if (this.#deviceIds) {
30-
info['deviceIds'] = this.#deviceIds;
29+
if (this._deviceIds) {
30+
info['deviceIds'] = this._deviceIds;
3131
}
3232

33-
if (typeof this.#tagForUnderAgeOfConsent === 'boolean') {
34-
info['tagForUnderAgeOfConsent'] = this.#tagForUnderAgeOfConsent;
33+
if (typeof this._tagForUnderAgeOfConsent === 'boolean') {
34+
info['tagForUnderAgeOfConsent'] = this._tagForUnderAgeOfConsent;
3535
}
3636

3737
org.nativescript.firebase.admob.FirebaseAdmob.AdConsent.requestInfoUpdate(
@@ -49,24 +49,24 @@ export class AdsConsent extends AdsConsentBase {
4949
});
5050
}
5151
static setDebugGeography(geography: AdsConsentDebugGeography) {
52-
this.#geography = geography;
52+
this._geography = geography;
5353
}
5454
static setTagForUnderAgeOfConsent(tag: boolean) {
55-
this.#tagForUnderAgeOfConsent = tag;
55+
this._tagForUnderAgeOfConsent = tag;
5656
}
5757

5858
static isConsentFormAvailable() {
59-
if (!this.#consentInfo) {
60-
this.#consentInfo = com.google.android.ump.UserMessagingPlatform.getConsentInformation(Utils.android.getApplicationContext());
59+
if (!this._consentInfo) {
60+
this._consentInfo = com.google.android.ump.UserMessagingPlatform.getConsentInformation(Utils.android.getApplicationContext());
6161
}
62-
return this.#consentInfo.isConsentFormAvailable();
62+
return this._consentInfo.isConsentFormAvailable();
6363
}
6464

6565
static showForm(): Promise<void> {
6666
return new Promise((resolve, reject) => {
6767
org.nativescript.firebase.admob.FirebaseAdmob.AdConsent.show(
6868
Application.android.foregroundActivity || Application.android.startActivity,
69-
this.#consentForm,
69+
this._consentForm,
7070
new org.nativescript.firebase.admob.FirebaseAdmob.Callback<java.lang.Void>({
7171
onSuccess(val) {
7272
resolve();
@@ -85,7 +85,7 @@ export class AdsConsent extends AdsConsentBase {
8585
Utils.android.getApplicationContext(),
8686
new org.nativescript.firebase.admob.FirebaseAdmob.Callback<com.google.android.ump.ConsentForm>({
8787
onSuccess(form) {
88-
AdsConsent.#consentForm = form;
88+
AdsConsent._consentForm = form;
8989
resolve();
9090
},
9191
onError(error) {

‎packages/firebase-admob/adsconsent/index.ios.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { AdsConsentBase, AdsConsentDebugGeography, AdsConsentStatus } from './co
55
export { AdsConsentStatus, AdsConsentDebugGeography };
66

77
export class AdsConsent extends AdsConsentBase {
8-
static #geography: AdsConsentDebugGeography;
9-
static #deviceIds: string[];
10-
static #tagForUnderAgeOfConsent: boolean;
11-
static #consentForm: UMPConsentForm;
8+
static _geography: AdsConsentDebugGeography;
9+
static _deviceIds: string[];
10+
static _tagForUnderAgeOfConsent: boolean;
11+
static _consentForm: UMPConsentForm;
1212
static reset() {
1313
UMPConsentInformation.sharedInstance.reset();
1414
}
1515
static addTestDevices(deviceIds: string[]) {
16-
this.#deviceIds = deviceIds;
16+
this._deviceIds = deviceIds;
1717
}
1818
static getStatus(): AdsConsentStatus {
1919
switch (UMPConsentInformation.sharedInstance.consentStatus) {
@@ -30,7 +30,7 @@ export class AdsConsent extends AdsConsentBase {
3030
static requestInfoUpdate(): Promise<void> {
3131
return new Promise((resolve, reject) => {
3232
const request = UMPRequestParameters.new();
33-
switch (this.#geography) {
33+
switch (this._geography) {
3434
case AdsConsentDebugGeography.DISABLED:
3535
request.debugSettings.geography = UMPDebugGeography.Disabled;
3636
break;
@@ -42,10 +42,10 @@ export class AdsConsent extends AdsConsentBase {
4242
break;
4343
}
4444

45-
if (Array.isArray(this.#deviceIds)) {
46-
request.debugSettings.testDeviceIdentifiers = this.#deviceIds.map((item) => {
45+
if (Array.isArray(this._deviceIds)) {
46+
request.debugSettings.testDeviceIdentifiers = this._deviceIds.map((item) => {
4747
if (item === 'EMULATOR') {
48-
if(typeof GADSimulatorID){
48+
if (typeof GADSimulatorID) {
4949
return GADSimulatorID;
5050
}
5151
return '';
@@ -54,8 +54,8 @@ export class AdsConsent extends AdsConsentBase {
5454
}) as any;
5555
}
5656

57-
if (typeof this.#tagForUnderAgeOfConsent === 'boolean') {
58-
request.tagForUnderAgeOfConsent = this.#tagForUnderAgeOfConsent;
57+
if (typeof this._tagForUnderAgeOfConsent === 'boolean') {
58+
request.tagForUnderAgeOfConsent = this._tagForUnderAgeOfConsent;
5959
}
6060

6161
UMPConsentInformation.sharedInstance.requestConsentInfoUpdateWithParametersCompletionHandler(request, (error) => {
@@ -68,10 +68,10 @@ export class AdsConsent extends AdsConsentBase {
6868
});
6969
}
7070
static setDebugGeography(geography: AdsConsentDebugGeography) {
71-
this.#geography = geography;
71+
this._geography = geography;
7272
}
7373
static setTagForUnderAgeOfConsent(tag: boolean) {
74-
this.#tagForUnderAgeOfConsent = tag;
74+
this._tagForUnderAgeOfConsent = tag;
7575
}
7676

7777
static isConsentFormAvailable() {
@@ -85,7 +85,7 @@ export class AdsConsent extends AdsConsentBase {
8585

8686
static showForm(): Promise<void> {
8787
return new Promise((resolve, reject) => {
88-
this.#consentForm.presentFromViewControllerCompletionHandler(topViewController(), (error) => {
88+
this._consentForm.presentFromViewControllerCompletionHandler(topViewController(), (error) => {
8989
if (error) {
9090
reject(FirebaseError.fromNative(error));
9191
} else {
@@ -100,7 +100,7 @@ export class AdsConsent extends AdsConsentBase {
100100
if (error) {
101101
reject(FirebaseError.fromNative(error));
102102
} else {
103-
AdsConsent.#consentForm = form;
103+
AdsConsent._consentForm = form;
104104
resolve();
105105
}
106106
});

0 commit comments

Comments
 (0)