Skip to content

Commit 62571b5

Browse files
ReedyukReedyuk
committed
Added more extensions for other classes.
1 parent 9bb7ea9 commit 62571b5

File tree

22 files changed

+132
-76
lines changed
  • firebase-app/src
  • firebase-auth/src
    • androidMain/kotlin/dev/gitlive/firebase/auth
    • iosMain/kotlin/dev/gitlive/firebase/auth
  • firebase-config/src
  • firebase-crashlytics/src
  • firebase-database/src
    • androidMain/kotlin/dev/gitlive/firebase/database
    • iosMain/kotlin/dev/gitlive/firebase/database
  • firebase-firestore/src
  • firebase-functions/src
  • firebase-installations/src
  • firebase-messaging/src
  • firebase-perf/src
  • firebase-storage/src
    • androidMain/kotlin/dev/gitlive/firebase/storage
    • iosMain/kotlin/dev/gitlive/firebase/storage

22 files changed

+132
-76
lines changed

‎firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public actual typealias FirebaseTooManyRequestsException = com.google.firebase.F
1414

1515
public actual typealias FirebaseApiNotAvailableException = com.google.firebase.FirebaseApiNotAvailableException
1616

17-
public val FirebaseApp.android: com.google.firebase.FirebaseApp get() = com.google.firebase.FirebaseApp.getInstance()
17+
public val FirebaseApp.publicAndroid: com.google.firebase.FirebaseApp get() = com.google.firebase.FirebaseApp.getInstance()
1818

1919
public actual val Firebase.app: FirebaseApp
2020
get() = FirebaseApp(com.google.firebase.FirebaseApp.getInstance())
@@ -31,7 +31,7 @@ public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, n
3131
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
3232
FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
3333

34-
public actual data class FirebaseApp internal constructor(val android: com.google.firebase.FirebaseApp) {
34+
public actual data class FirebaseApp internal constructor(internal val android: com.google.firebase.FirebaseApp) {
3535
actual val name: String
3636
get() = android.name
3737
actual val options: FirebaseOptions

‎firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public actual open class FirebaseNetworkException(message: String) : FirebaseExc
1212
public actual open class FirebaseTooManyRequestsException(message: String) : FirebaseException(message)
1313
public actual open class FirebaseApiNotAvailableException(message: String) : FirebaseException(message)
1414

15-
public val Firebase.ios: FIRApp get() = FIRApp.defaultApp()!!
15+
public val FirebaseApp.publicIos: FIRApp get() = ios
1616

1717
public actual val Firebase.app: FirebaseApp
1818
get() = FirebaseApp(FIRApp.defaultApp()!!)
@@ -29,7 +29,7 @@ public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, n
2929
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
3030
FIRApp.configureWithOptions(options.toIos()).let { app }
3131

32-
public actual data class FirebaseApp internal constructor(val ios: FIRApp) {
32+
public actual data class FirebaseApp internal constructor(internal val ios: FIRApp) {
3333
actual val name: String
3434
get() = ios.name
3535
actual val options: FirebaseOptions

‎firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.google.firebase.auth.ActionCodeResult.*
1212
import com.google.firebase.auth.FirebaseAuth.AuthStateListener
1313
import dev.gitlive.firebase.Firebase
1414
import dev.gitlive.firebase.FirebaseApp
15+
import dev.gitlive.firebase.publicAndroid
1516
import kotlinx.coroutines.channels.awaitClose
1617
import kotlinx.coroutines.flow.Flow
1718
import kotlinx.coroutines.flow.callbackFlow
@@ -23,9 +24,9 @@ public actual val Firebase.auth: FirebaseAuth
2324
get() = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance())
2425

2526
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth =
26-
FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.android))
27+
FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
2728

28-
public actual class FirebaseAuth internal constructor(public val android: com.google.firebase.auth.FirebaseAuth) {
29+
public actual class FirebaseAuth internal constructor(internal val android: com.google.firebase.auth.FirebaseAuth) {
2930
public actual val currentUser: FirebaseUser?
3031
get() = android.currentUser?.let { FirebaseUser(it) }
3132

@@ -115,12 +116,16 @@ public actual class FirebaseAuth internal constructor(public val android: com.go
115116
public actual fun useEmulator(host: String, port: Int): Unit = android.useEmulator(host, port)
116117
}
117118

118-
public actual class AuthResult internal constructor(public val android: com.google.firebase.auth.AuthResult) {
119+
public val AuthResult.android: com.google.firebase.auth.AuthResult get() = android
120+
121+
public actual class AuthResult internal constructor(internal val android: com.google.firebase.auth.AuthResult) {
119122
public actual val user: FirebaseUser?
120123
get() = android.user?.let { FirebaseUser(it) }
121124
}
122125

123-
public actual class AuthTokenResult(public val android: com.google.firebase.auth.GetTokenResult) {
126+
public val AuthTokenResult.android: com.google.firebase.auth.GetTokenResult get() = android
127+
128+
public actual class AuthTokenResult(internal val android: com.google.firebase.auth.GetTokenResult) {
124129
// actual val authTimestamp: Long
125130
// get() = android.authTimestamp
126131
public actual val claims: Map<String, Any>

‎firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import dev.gitlive.firebase.FirebaseApp
1010
import dev.gitlive.firebase.FirebaseException
1111
import dev.gitlive.firebase.FirebaseNetworkException
1212
import dev.gitlive.firebase.auth.ActionCodeResult.*
13+
import dev.gitlive.firebase.publicIos
1314
import kotlinx.cinterop.*
1415
import kotlinx.coroutines.CompletableDeferred
1516
import kotlinx.coroutines.channels.awaitClose
@@ -24,10 +25,10 @@ public actual val Firebase.auth: FirebaseAuth
2425
get() = FirebaseAuth(FIRAuth.auth())
2526

2627
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
27-
FIRAuth.authWithApp(app.ios as objcnames.classes.FIRApp),
28+
FIRAuth.authWithApp(app.publicIos as objcnames.classes.FIRApp),
2829
)
2930

30-
public actual class FirebaseAuth internal constructor(public val ios: FIRAuth) {
31+
public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth) {
3132

3233
public actual val currentUser: FirebaseUser?
3334
get() = ios.currentUser?.let { FirebaseUser(it) }
@@ -103,13 +104,15 @@ public actual class FirebaseAuth internal constructor(public val ios: FIRAuth) {
103104

104105
public actual fun useEmulator(host: String, port: Int): Unit = ios.useEmulatorWithHost(host, port.toLong())
105106
}
107+
public val AuthResult.ios: FIRAuthDataResult get() = ios
106108

107-
public actual class AuthResult internal constructor(public val ios: FIRAuthDataResult) {
109+
public actual class AuthResult internal constructor(internal val ios: FIRAuthDataResult) {
108110
public actual val user: FirebaseUser?
109111
get() = FirebaseUser(ios.user)
110112
}
111113

112-
public actual class AuthTokenResult(public val ios: FIRAuthTokenResult) {
114+
public val AuthTokenResult.ios: FIRAuthTokenResult get() = ios
115+
public actual class AuthTokenResult(internal val ios: FIRAuthTokenResult) {
113116
// actual val authTimestamp: Long
114117
// get() = ios.authDate
115118
public actual val claims: Map<String, Any>

‎firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledExcept
77
import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException
88
import dev.gitlive.firebase.Firebase
99
import dev.gitlive.firebase.FirebaseApp
10+
import dev.gitlive.firebase.publicAndroid
1011
import kotlinx.coroutines.tasks.await
1112
import kotlinx.datetime.Instant
1213
import kotlin.time.Duration
@@ -21,9 +22,9 @@ public actual val Firebase.remoteConfig: FirebaseRemoteConfig
2122
get() = FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance())
2223

2324
public actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig =
24-
FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance(app.android))
25+
FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance(app.publicAndroid))
2526

26-
public actual class FirebaseRemoteConfig internal constructor(public val android: AndroidFirebaseRemoteConfig) {
27+
public actual class FirebaseRemoteConfig internal constructor(internal val android: AndroidFirebaseRemoteConfig) {
2728
public actual val all: Map<String, FirebaseRemoteConfigValue>
2829
get() = android.all.mapValues { FirebaseRemoteConfigValue(it.value) }
2930

‎firebase-config/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import dev.gitlive.firebase.Firebase
1212
import dev.gitlive.firebase.FirebaseApp
1313
import dev.gitlive.firebase.FirebaseException
1414
import dev.gitlive.firebase.app
15+
import dev.gitlive.firebase.publicIos
1516
import kotlinx.coroutines.CompletableDeferred
1617
import kotlinx.datetime.Instant
1718
import kotlinx.datetime.toKotlinInstant
@@ -26,10 +27,10 @@ public actual val Firebase.remoteConfig: FirebaseRemoteConfig
2627
get() = FirebaseRemoteConfig(FIRRemoteConfig.remoteConfig())
2728

2829
public actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = FirebaseRemoteConfig(
29-
FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios as objcnames.classes.FIRApp),
30+
FIRRemoteConfig.remoteConfigWithApp(Firebase.app.publicIos as objcnames.classes.FIRApp),
3031
)
3132

32-
public actual class FirebaseRemoteConfig internal constructor(public val ios: FIRRemoteConfig) {
33+
public actual class FirebaseRemoteConfig internal constructor(internal val ios: FIRRemoteConfig) {
3334
@Suppress("UNCHECKED_CAST")
3435
public actual val all: Map<String, FirebaseRemoteConfigValue>
3536
get() {

‎firebase-crashlytics/src/androidMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ import com.google.firebase.FirebaseException
44
import com.google.firebase.crashlytics.CustomKeysAndValues.Builder
55
import dev.gitlive.firebase.Firebase
66
import dev.gitlive.firebase.FirebaseApp
7+
import dev.gitlive.firebase.publicAndroid
78

89
public val FirebaseCrashlytics.android: com.google.firebase.crashlytics.FirebaseCrashlytics get() = com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance()
910

1011
public actual val Firebase.crashlytics: FirebaseCrashlytics get() =
1112
FirebaseCrashlytics(com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance())
1213

1314
public actual fun Firebase.crashlytics(app: FirebaseApp): FirebaseCrashlytics =
14-
FirebaseCrashlytics(app.android.get(com.google.firebase.crashlytics.FirebaseCrashlytics::class.java))
15+
FirebaseCrashlytics(app.publicAndroid.get(com.google.firebase.crashlytics.FirebaseCrashlytics::class.java))
1516

16-
public actual class FirebaseCrashlytics internal constructor(public val android: com.google.firebase.crashlytics.FirebaseCrashlytics) {
17+
public actual class FirebaseCrashlytics internal constructor(internal val android: com.google.firebase.crashlytics.FirebaseCrashlytics) {
1718

1819
public actual fun recordException(exception: Throwable) {
1920
android.recordException(exception)

‎firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public actual val Firebase.crashlytics: FirebaseCrashlytics get() =
1515
public actual fun Firebase.crashlytics(app: FirebaseApp): FirebaseCrashlytics =
1616
FirebaseCrashlytics(FIRCrashlytics.crashlytics())
1717

18-
public actual class FirebaseCrashlytics internal constructor(public val ios: FIRCrashlytics) {
18+
public actual class FirebaseCrashlytics internal constructor(internal val ios: FIRCrashlytics) {
1919

2020
public actual fun recordException(exception: Throwable) {
2121
ios.recordError(exception.asNSError())

‎firebase-database/src/androidMain/kotlin/dev/gitlive/firebase/database/database.kt‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import dev.gitlive.firebase.database.ChildEvent.Type
2222
import dev.gitlive.firebase.internal.android
2323
import dev.gitlive.firebase.internal.decode
2424
import dev.gitlive.firebase.internal.reencodeTransformation
25+
import dev.gitlive.firebase.publicAndroid
2526
import kotlinx.coroutines.CompletableDeferred
2627
import kotlinx.coroutines.channels.awaitClose
2728
import kotlinx.coroutines.channels.trySendBlocking
@@ -61,12 +62,12 @@ public actual fun Firebase.database(url: String): FirebaseDatabase =
6162
FirebaseDatabase.getInstance(com.google.firebase.database.FirebaseDatabase.getInstance(url))
6263

6364
public actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase =
64-
FirebaseDatabase.getInstance(com.google.firebase.database.FirebaseDatabase.getInstance(app.android))
65+
FirebaseDatabase.getInstance(com.google.firebase.database.FirebaseDatabase.getInstance(app.publicAndroid))
6566

6667
public actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase =
67-
FirebaseDatabase.getInstance(com.google.firebase.database.FirebaseDatabase.getInstance(app.android, url))
68+
FirebaseDatabase.getInstance(com.google.firebase.database.FirebaseDatabase.getInstance(app.publicAndroid, url))
6869

69-
public actual class FirebaseDatabase internal constructor(public val android: com.google.firebase.database.FirebaseDatabase) {
70+
public actual class FirebaseDatabase internal constructor(internal val android: com.google.firebase.database.FirebaseDatabase) {
7071

7172
public companion object {
7273
private val instances = WeakHashMap<com.google.firebase.database.FirebaseDatabase, FirebaseDatabase>()
@@ -115,16 +116,18 @@ internal actual open class NativeQuery(
115116
val persistenceEnabled: Boolean,
116117
)
117118

119+
public val Query.android: com.google.firebase.database.Query get() = nativeQuery.android
120+
118121
public actual open class Query internal actual constructor(
119-
nativeQuery: NativeQuery,
122+
internal val nativeQuery: NativeQuery,
120123
) {
121124

122125
internal constructor(
123126
android: com.google.firebase.database.Query,
124127
persistenceEnabled: Boolean,
125128
) : this(NativeQuery(android, persistenceEnabled))
126129

127-
public open val android: com.google.firebase.database.Query = nativeQuery.android
130+
internal open val android: com.google.firebase.database.Query = nativeQuery.android
128131
public val persistenceEnabled: Boolean = nativeQuery.persistenceEnabled
129132

130133
public actual fun orderByKey(): Query = Query(android.orderByKey(), persistenceEnabled)
@@ -268,9 +271,10 @@ internal actual class NativeDatabaseReference internal constructor(
268271
}
269272

270273
public val DatabaseReference.android: com.google.firebase.database.DatabaseReference get() = nativeReference.android
274+
public val DataSnapshot.publicAndroid: com.google.firebase.database.DataSnapshot get() = android
271275

272276
public actual class DataSnapshot internal constructor(
273-
public val android: com.google.firebase.database.DataSnapshot,
277+
internal val android: com.google.firebase.database.DataSnapshot,
274278
private val persistenceEnabled: Boolean,
275279
) {
276280

@@ -283,10 +287,10 @@ public actual class DataSnapshot internal constructor(
283287
public actual val value: Any? get() = android.value
284288

285289
public actual inline fun <reified T> value(): T =
286-
decode<T>(value = android.value)
290+
decode<T>(value = publicAndroid.value)
287291

288292
public actual inline fun <T> value(strategy: DeserializationStrategy<T>, buildSettings: DecodeSettings.Builder.() -> Unit): T =
289-
decode(strategy, android.value, buildSettings)
293+
decode(strategy, publicAndroid.value, buildSettings)
290294

291295
public actual fun child(path: String): DataSnapshot = DataSnapshot(android.child(path), persistenceEnabled)
292296
public actual val hasChildren: Boolean get() = android.hasChildren()

‎firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import dev.gitlive.firebase.internal.EncodedObject
2828
import dev.gitlive.firebase.internal.decode
2929
import dev.gitlive.firebase.internal.ios
3030
import dev.gitlive.firebase.internal.reencodeTransformation
31+
import dev.gitlive.firebase.publicIos
3132
import kotlinx.coroutines.CompletableDeferred
3233
import kotlinx.coroutines.FlowPreview
3334
import kotlinx.coroutines.channels.awaitClose
@@ -51,14 +52,14 @@ public actual fun Firebase.database(url: String): FirebaseDatabase =
5152
FirebaseDatabase(FIRDatabase.databaseWithURL(url))
5253

5354
public actual fun Firebase.database(app: FirebaseApp): FirebaseDatabase = FirebaseDatabase(
54-
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp),
55+
FIRDatabase.databaseForApp(app.publicIos as objcnames.classes.FIRApp),
5556
)
5657

5758
public actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase = FirebaseDatabase(
58-
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp, url),
59+
FIRDatabase.databaseForApp(app.publicIos as objcnames.classes.FIRApp, url),
5960
)
6061

61-
public actual class FirebaseDatabase internal constructor(public val ios: FIRDatabase) {
62+
public actual class FirebaseDatabase internal constructor(internal val ios: FIRDatabase) {
6263

6364
public actual fun reference(path: String): DatabaseReference =
6465
DatabaseReference(NativeDatabaseReference(ios.referenceWithPath(path), ios.persistenceEnabled))
@@ -103,13 +104,15 @@ internal actual open class NativeQuery(
103104
val persistenceEnabled: Boolean,
104105
)
105106

107+
public val Query.ios: FIRDatabaseQuery get() = nativeQuery.ios
108+
106109
public actual open class Query internal actual constructor(
107-
nativeQuery: NativeQuery,
110+
internal val nativeQuery: NativeQuery,
108111
) {
109112

110113
internal constructor(ios: FIRDatabaseQuery, persistenceEnabled: Boolean) : this(NativeQuery(ios, persistenceEnabled))
111114

112-
public open val ios: FIRDatabaseQuery = nativeQuery.ios
115+
internal open val ios: FIRDatabaseQuery = nativeQuery.ios
113116
public val persistenceEnabled: Boolean = nativeQuery.persistenceEnabled
114117

115118
public actual fun orderByKey(): Query = Query(ios.queryOrderedByKey(), persistenceEnabled)
@@ -212,9 +215,10 @@ internal actual class NativeDatabaseReference internal constructor(
212215
}
213216

214217
public val DatabaseReference.ios: FIRDatabaseReference get() = nativeReference.ios
218+
public val DataSnapshot.publicIos: FIRDataSnapshot get() = ios
215219

216220
public actual class DataSnapshot internal constructor(
217-
public val ios: FIRDataSnapshot,
221+
internal val ios: FIRDataSnapshot,
218222
private val persistenceEnabled: Boolean,
219223
) {
220224

@@ -227,10 +231,10 @@ public actual class DataSnapshot internal constructor(
227231
public actual val value: Any? get() = ios.value
228232

229233
public actual inline fun <reified T> value(): T =
230-
decode<T>(value = ios.value)
234+
decode<T>(value = publicIos.value)
231235

232236
public actual inline fun <T> value(strategy: DeserializationStrategy<T>, buildSettings: DecodeSettings.Builder.() -> Unit): T =
233-
decode(strategy, ios.value, buildSettings)
237+
decode(strategy, publicIos.value, buildSettings)
234238

235239
public actual fun child(path: String): DataSnapshot = DataSnapshot(ios.childSnapshotForPath(path), persistenceEnabled)
236240
public actual val hasChildren: Boolean get() = ios.hasChildren()

0 commit comments

Comments
 (0)