Skip to content

Commit 245bd6e

Browse files
committed
Replace getValue by operator get
1 parent 176fbe3 commit 245bd6e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ actual class FirebaseRemoteConfig internal constructor(val android: AndroidFireb
5353
actual fun getKeysByPrefix(prefix: String): Set<String> = android.getKeysByPrefix(prefix)
5454
actual fun getLong(key: String) = android.getLong(key)
5555
actual fun getString(key: String) = android.getString(key)
56-
actual fun getValue(key: String) = FirebaseRemoteConfigValue(android.getValue(key))
56+
actual operator fun get(key: String) = FirebaseRemoteConfigValue(android.getValue(key))
5757
actual suspend fun reset() = android.reset().await().let { }
5858

5959
private fun AndroidFirebaseRemoteConfigSettings.asCommon(): FirebaseRemoteConfigSettings {

firebase-remoteconfig/src/commonMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ expect class FirebaseRemoteConfig {
2121
fun getKeysByPrefix(prefix: String): Set<String>
2222
fun getLong(key: String): Long
2323
fun getString(key: String): String
24-
fun getValue(key: String): FirebaseRemoteConfigValue
24+
operator fun get(key: String): FirebaseRemoteConfigValue
2525
suspend fun reset()
2626
suspend fun settings(build: FirebaseRemoteConfigSettings.() -> Unit)
2727
suspend fun setDefaults(vararg defaults: Pair<String, Any?>)

firebase-remoteconfig/src/commonTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class FirebaseRemoteConfigTest {
6060
assertEquals("Hello World", remoteConfig.getString("test_default_string"))
6161
assertEquals("Hello World", remoteConfig.getString("test_default_string"))
6262

63-
val value = remoteConfig.getValue("test_default_string")
63+
val value = remoteConfig["test_default_string"]
6464
assertEquals("Hello World", value.asString())
6565
assertEquals(ValueSource.Default, value.getSource())
6666
assertEquals("Hello World", value.asByteArray().decodeToString())
@@ -129,7 +129,7 @@ class FirebaseRemoteConfigTest {
129129
remoteConfig.fetch()
130130
remoteConfig.activate()
131131

132-
val value = remoteConfig.getValue("test_remote_string")
132+
val value = remoteConfig["test_remote_string"]
133133
assertEquals("Hello from remote!", value.asString())
134134
assertEquals(ValueSource.Remote, value.getSource())
135135
}
@@ -144,7 +144,7 @@ class FirebaseRemoteConfigTest {
144144

145145
remoteConfig.fetchAndActivate()
146146

147-
val value = remoteConfig.getValue("test_remote_string")
147+
val value = remoteConfig["test_remote_string"]
148148
assertEquals("Hello from remote!", value.asString())
149149
assertEquals(ValueSource.Remote, value.getSource())
150150
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ actual class FirebaseRemoteConfig internal constructor(val ios: FIRRemoteConfig)
7878
actual fun getKeysByPrefix(prefix: String): Set<String> =
7979
all.keys.filter { it.startsWith(prefix) }.toSet()
8080

81-
actual fun getValue(key: String): FirebaseRemoteConfigValue =
81+
actual operator fun get(key: String): FirebaseRemoteConfigValue =
8282
FirebaseRemoteConfigValue(ios.configValueForKey(key))
8383

8484
actual suspend fun reset() {

firebase-remoteconfig/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = rethr
2020

2121
actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteConfig.RemoteConfig) {
2222
actual val all: Map<String, FirebaseRemoteConfigValue>
23-
get() = rethrow { getAllKeys().map { it to getValue(it) }.toMap() }
23+
get() = rethrow { getAllKeys().map { Pair(it, this[it]) }.toMap() }
2424

2525
actual val info: FirebaseRemoteConfigInfo
2626
get() = rethrow {
@@ -43,7 +43,7 @@ actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteCo
4343
actual fun getLong(key: String): Long = rethrow { js.getNumber(key).toLong() }
4444
actual fun getString(key: String): String = rethrow { js.getString(key) ?: "" }
4545

46-
actual fun getValue(key: String): FirebaseRemoteConfigValue = rethrow {
46+
actual operator fun get(key: String): FirebaseRemoteConfigValue = rethrow {
4747
FirebaseRemoteConfigValue(js.getValue(key))
4848
}
4949

@@ -60,8 +60,8 @@ actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteCo
6060
// not implemented for JS target
6161
}
6262

63-
actual suspend fun settings(build: FirebaseRemoteConfigSettings.() -> Unit) {
64-
val settings = FirebaseRemoteConfigSettings().apply(build)
63+
actual suspend fun configSettings(init: FirebaseRemoteConfigSettings.() -> Unit) {
64+
val settings = FirebaseRemoteConfigSettings().apply(init)
6565
js.settings.apply {
6666
fetchTimeoutMillis = settings.fetchTimeoutInSeconds * 1000
6767
minimumFetchIntervalMillis = settings.minimumFetchIntervalInSeconds * 1000

0 commit comments

Comments
 (0)