Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit c5d07c8

Browse files
SoarcSoarc
committed
Merge remote-tracking branch 'upstream/master' into feature/ml-kit-camera-app-lifecycle
2 parents 537e36d + bcf645a commit c5d07c8

34 files changed

+2353
-1756
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ src/platforms/android/include.gradle
1717
!src/references.d.ts
1818
!src/analytics/analytics.d.ts
1919
!src/storage/storage.d.ts
20+
!src/messaging/messaging.d.ts
2021
!src/mlkit/*/index.d.ts
2122
!src/mlkit/mlkit-cameraview.d.ts
2223
!src/platforms/web/typings/firebase-webapi.d.ts

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
[Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
44
[Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
55

6+
## 6.7.0 (2018, September X)
7+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/67?closed=1)
8+
9+
610
## 6.6.0 (2018, August 28)
711
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/66?closed=1)
812

‎demo-ng/app/tabs/firestore/firestore.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ListView>
2323
<Button text="Listen to changes in SF" (tap)="firestoreListen()" class="button"></Button>
2424
<Button text="Stop listening" (tap)="firestoreStopListening()" class="button"></Button>
25-
<Button text="Where" (tap)="firestoreWhere()" class="button"></Button>
25+
<Button text="Where (by reference)" (tap)="firestoreWhere()" class="button"></Button>
2626
<Button text="Where, Order, Limit" (tap)="firestoreWhereOrderLimit()" class="button"></Button>
2727
<Button text="Where array_contains" (tap)="firestoreWhereCityHasALake()" class="button"></Button>
2828
<Button text="Start at 'LA'" (tap)="firestoreStartAt()" class="button"></Button>

‎demo-ng/app/tabs/firestore/firestore.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,10 @@ export class FirestoreComponent {
247247
}
248248

249249
public firestoreWhere(): void {
250-
const query: firestore.Query = firebase.firestore().collection("cities")
251-
.where("state", "==", "CA")
252-
.where("population", "<", 550000);
250+
const cityDocRef = firebase.firestore().collection("cities").doc("SF");
253251

254-
query
252+
firebase.firestore().collection("dogs")
253+
.where("city", "==", cityDocRef)
255254
.get()
256255
.then((querySnapshot: firestore.QuerySnapshot) => {
257256
querySnapshot.forEach(doc => {
@@ -264,6 +263,7 @@ export class FirestoreComponent {
264263
public firestoreWhereOrderLimit(): void {
265264
const query: firestore.Query = firebase.firestore().collection("cities")
266265
.where("state", "==", "CA")
266+
.where("population", "<", 99999999)
267267
.orderBy("population", "desc")
268268
.limit(2);
269269

‎demo-ng/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"nativescript-angular": "^6.1.0",
2626
"nativescript-camera": "^4.0.2",
2727
"nativescript-imagepicker": "^6.0.1",
28-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.5.0.tgz",
28+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.7.0.tgz",
2929
"nativescript-theme-core": "~1.0.4",
3030
"reflect-metadata": "~0.1.10",
3131
"rxjs": "~6.0.0 || >=6.1.0",
@@ -43,4 +43,4 @@
4343
"nativescript-dev-webpack": "^0.15.1",
4444
"typescript": "~2.7.2"
4545
}
46-
}
46+
}

‎demo/app/main-page.xml‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<TabViewItem.view>
8282
<ScrollView>
8383
<GridLayout columns="*, *"
84-
rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
84+
rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
8585
horizontalAlignment="stretch"
8686
class="tab-content">
8787

@@ -169,41 +169,48 @@
169169

170170
<Label row="30" colSpan="2" text="Analytics" class="subtitle"/>
171171

172-
<Button row="31" col="0" text="log event" tap="{{ doLogAnalyticsEvent }}" class="button button-analytics"/>
173-
<Button row="31" col="1" text="set user property" tap="{{ doSetAnalyticsUserProperty }}" class="button button-analytics"/>
172+
<Button row="31" col="0" text="collection on" tap="{{ doEnableAnalytics }}" class="button button-analytics"/>
173+
<Button row="31" col="1" text="collection off" tap="{{ doDisableAnalytics }}" class="button button-analytics"/>
174174

175-
<Button row="32" col="0" text="set Screen A" tap="{{ doSetScreenNameA }}" class="button button-analytics"/>
176-
<Button row="32" col="1" text="set Screen B" tap="{{ doSetScreenNameB }}" class="button button-analytics"/>
175+
<Button row="32" col="0" text="log event" tap="{{ doLogAnalyticsEvent }}" class="button button-analytics"/>
176+
<Button row="32" col="1" text="set user property" tap="{{ doSetAnalyticsUserProperty }}" class="button button-analytics"/>
177177

178-
<Label row="33" colSpan="2" text="AdMob" class="subtitle"/>
178+
<Button row="33" col="0" text="set Screen A" tap="{{ doSetScreenNameA }}" class="button button-analytics"/>
179+
<Button row="33" col="1" text="set Screen B" tap="{{ doSetScreenNameB }}" class="button button-analytics"/>
179180

180-
<Button row="34" col="0" text="show banner" tap="{{ doShowAdMobBanner }}" class="button button-admob"/>
181-
<Button row="34" col="1" text="show interstitial" tap="{{ doShowAdMobInterstitial }}" class="button button-admob"/>
181+
<Label row="34" colSpan="2" text="AdMob" class="subtitle"/>
182182

183-
<Button row="35" colSpan="2" text="hide banner" tap="{{ doHideAdMobBanner }}" class="button button-admob"/>
183+
<Button row="35" col="0" text="show banner" tap="{{ doShowAdMobBanner }}" class="button button-admob"/>
184+
<Button row="35" col="1" text="show interstitial" tap="{{ doShowAdMobInterstitial }}" class="button button-admob"/>
184185

185-
<Label row="36" colSpan="2" text="Firebase Cloud Messaging" class="subtitle"/>
186+
<Button row="36" colSpan="2" text="hide banner" tap="{{ doHideAdMobBanner }}" class="button button-admob"/>
186187

187-
<Button row="37" col="0" text="add push handlers" tap="{{ doRegisterPushHandlers }}" class="button button-messaging"/>
188-
<Button row="37" col="1" text="get current token" tap="{{ doGetCurrentPushToken }}" class="button button-messaging"/>
188+
<Label row="37" colSpan="2" text="Firebase Cloud Messaging" class="subtitle"/>
189189

190-
<Button row="38" col="0" text="topic subscribe" tap="{{ doSubscribeToTopic }}" class="button button-messaging"/>
191-
<Button row="38" col="1" text="topic unsubscribe" tap="{{ doUnsubscribeFromTopic }}" class="button button-messaging"/>
190+
<Button row="38" col="0" text="add push handlers" tap="{{ messaging.doRegisterPushHandlers }}" class="button button-messaging"/>
191+
<Button row="38" col="1" text="get current token" tap="{{ messaging.doGetCurrentPushToken }}" class="button button-messaging"/>
192192

193-
<Label row="39" colSpan="2" text="Firebase Crash Reporing / Crashlytics" class="subtitle"/>
193+
<Button row="39" col="0" text="topic subscribe" tap="{{ messaging.doSubscribeToTopic }}" class="button button-messaging"/>
194+
<Button row="39" col="1" text="topic unsubscribe" tap="{{ messaging.doUnsubscribeFromTopic }}" class="button button-messaging"/>
195+
<iOS>
196+
<Button row="40" colSpan="2" text="register interactive push" tap="{{ messaging.doRegisterForInteractivePush }}" class="button button-messaging"/>
197+
</iOS>
198+
<Button row="41" colSpan="2" text="are notifications enabled" tap="{{ messaging.doGetAreNotificationsEnabled }}" class="button button-messaging"/>
199+
<!-- <Button row="39" col="1" text="topic unsubscribe" tap="{{ doUnsubscribeFromTopic }}" class="button button-messaging"/> -->
194200

195-
<Button row="40" col="0" text="log message" tap="{{ doLogMessage }}" class="button button-crash"/>
201+
<Label row="42" colSpan="2" text="Firebase Crash Reporing / Crashlytics" class="subtitle"/>
202+
203+
<Button row="43" col="0" text="log message" tap="{{ doLogMessage }}" class="button button-crash"/>
196204
<iOS>
197-
<Button row="40" col="1" text="force crash :)" tap="{{ doForceCrashIOS }}" class="button button-crash"/>
205+
<Button row="43" col="1" text="force crash :)" tap="{{ doForceCrashIOS }}" class="button button-crash"/>
198206
</iOS>
199207
<Android>
200-
<Button row="40" col="1" text="force crash :)" tap="{{ doForceCrashAndroid }}" class="button button-crash"/>
208+
<Button row="43" col="1" text="force crash :)" tap="{{ doForceCrashAndroid }}" class="button button-crash"/>
201209
</Android>
202210

203-
<Label row="41" colSpan="2" text="Firebase Invites" class="subtitle"/>
204-
205-
<Button row="42" col="0" text="send invitation" tap="{{ sendInvitation }}" class="button button-invites"/>
206-
<Button row="42" col="1" text="get invitation" tap="{{ getInvitation }}" class="button button-invites"/>
211+
<Label row="44" colSpan="2" text="Firebase Invites" class="subtitle"/>
212+
<Button row="45" col="0" text="send invitation" tap="{{ sendInvitation }}" class="button button-invites"/>
213+
<Button row="45" col="1" text="get invitation" tap="{{ getInvitation }}" class="button button-invites"/>
207214
</GridLayout>
208215

209216
</ScrollView>

0 commit comments

Comments
 (0)