Skip to content

Commit a3d313a

Browse files
MichaelVerdonMichaelVerdon
committed
chore: kotlin format
1 parent 8be2cee commit a3d313a

File tree

12 files changed

+882
-822
lines changed

12 files changed

+882
-822
lines changed

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/ChildEventsProxy.kt‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,44 @@ import com.google.firebase.database.DataSnapshot
1313
import com.google.firebase.database.DatabaseError
1414
import io.flutter.plugin.common.EventChannel.EventSink
1515

16-
class ChildEventsProxy @JvmOverloads constructor(
16+
class ChildEventsProxy
17+
@JvmOverloads
18+
constructor(
1719
@NonNull eventSink: EventSink,
18-
@NonNull eventType: String
19-
) : EventsProxy(eventSink, eventType), ChildEventListener {
20-
21-
override fun onChildAdded(@NonNull snapshot: DataSnapshot, @Nullable previousChildName: String?) {
22-
sendEvent(Constants.EVENT_TYPE_CHILD_ADDED, snapshot, previousChildName)
20+
@NonNull eventType: String,
21+
) : EventsProxy(eventSink, eventType),
22+
ChildEventListener {
23+
override fun onChildAdded(
24+
@NonNull snapshot: DataSnapshot,
25+
@Nullable previousChildName: String?,
26+
) {
27+
sendEvent(Constants.EVENT_TYPE_CHILD_ADDED, snapshot, previousChildName)
2328
}
2429

25-
override fun onChildChanged(@NonNull snapshot: DataSnapshot, @Nullable previousChildName: String?) {
26-
sendEvent(Constants.EVENT_TYPE_CHILD_CHANGED, snapshot, previousChildName)
30+
override fun onChildChanged(
31+
@NonNull snapshot: DataSnapshot,
32+
@Nullable previousChildName: String?,
33+
) {
34+
sendEvent(Constants.EVENT_TYPE_CHILD_CHANGED, snapshot, previousChildName)
2735
}
2836

29-
override fun onChildRemoved(@NonNull snapshot: DataSnapshot) {
30-
sendEvent(Constants.EVENT_TYPE_CHILD_REMOVED, snapshot, null)
37+
override fun onChildRemoved(
38+
@NonNull snapshot: DataSnapshot,
39+
) {
40+
sendEvent(Constants.EVENT_TYPE_CHILD_REMOVED, snapshot, null)
3141
}
3242

33-
override fun onChildMoved(@NonNull snapshot: DataSnapshot, @Nullable previousChildName: String?) {
34-
sendEvent(Constants.EVENT_TYPE_CHILD_MOVED, snapshot, previousChildName)
43+
override fun onChildMoved(
44+
@NonNull snapshot: DataSnapshot,
45+
@Nullable previousChildName: String?,
46+
) {
47+
sendEvent(Constants.EVENT_TYPE_CHILD_MOVED, snapshot, previousChildName)
3548
}
3649

37-
override fun onCancelled(@NonNull error: DatabaseError) {
38-
val e = FlutterFirebaseDatabaseException.fromDatabaseError(error)
39-
eventSink.error(e.code, e.message, e.additionalData)
50+
override fun onCancelled(
51+
@NonNull error: DatabaseError,
52+
) {
53+
val e = FlutterFirebaseDatabaseException.fromDatabaseError(error)
54+
eventSink.error(e.code, e.message, e.additionalData)
4055
}
41-
}
56+
}

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/Constants.kt‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,54 @@
77
package io.flutter.plugins.firebase.database
88

99
object Constants {
10-
const val APP_NAME = "appName"
11-
12-
// FirebaseDatabase instance options.
13-
const val DATABASE_URL = "databaseURL"
14-
const val DATABASE_LOGGING_ENABLED = "loggingEnabled"
15-
const val DATABASE_PERSISTENCE_ENABLED = "persistenceEnabled"
16-
const val DATABASE_EMULATOR_HOST = "emulatorHost"
17-
const val DATABASE_EMULATOR_PORT = "emulatorPort"
18-
const val DATABASE_CACHE_SIZE_BYTES = "cacheSizeBytes"
19-
20-
const val EVENT_CHANNEL_NAME_PREFIX = "eventChannelNamePrefix"
21-
22-
const val PATH = "path"
23-
const val KEY = "key"
24-
const val VALUE = "value"
25-
const val PRIORITY = "priority"
26-
const val SNAPSHOT = "snapshot"
27-
28-
const val COMMITTED = "committed"
29-
30-
const val MODIFIERS = "modifiers"
31-
const val ORDER_BY = "orderBy"
32-
const val CURSOR = "cursor"
33-
const val LIMIT = "limit"
34-
const val START_AT = "startAt"
35-
const val START_AFTER = "startAfter"
36-
const val END_AT = "endAt"
37-
const val END_BEFORE = "endBefore"
38-
const val LIMIT_TO_FIRST = "limitToFirst"
39-
const val LIMIT_TO_LAST = "limitToLast"
40-
41-
const val EVENT_TYPE = "eventType"
42-
43-
const val EVENT_TYPE_CHILD_ADDED = "childAdded"
44-
const val EVENT_TYPE_CHILD_REMOVED = "childRemoved"
45-
const val EVENT_TYPE_CHILD_CHANGED = "childChanged"
46-
const val EVENT_TYPE_CHILD_MOVED = "childMoved"
47-
const val EVENT_TYPE_VALUE = "value"
48-
49-
const val CHILD_KEYS = "childKeys"
50-
const val PREVIOUS_CHILD_NAME = "previousChildKey"
51-
52-
const val METHOD_CALL_TRANSACTION_HANDLER =
53-
"FirebaseDatabase#callTransactionHandler"
54-
const val TRANSACTION_KEY = "transactionKey"
55-
const val TRANSACTION_APPLY_LOCALLY = "transactionApplyLocally"
56-
57-
const val ERROR_CODE = "code"
58-
const val ERROR_MESSAGE = "message"
59-
const val ERROR_DETAILS = "details"
10+
const val APP_NAME = "appName"
11+
12+
// FirebaseDatabase instance options.
13+
const val DATABASE_URL = "databaseURL"
14+
const val DATABASE_LOGGING_ENABLED = "loggingEnabled"
15+
const val DATABASE_PERSISTENCE_ENABLED = "persistenceEnabled"
16+
const val DATABASE_EMULATOR_HOST = "emulatorHost"
17+
const val DATABASE_EMULATOR_PORT = "emulatorPort"
18+
const val DATABASE_CACHE_SIZE_BYTES = "cacheSizeBytes"
19+
20+
const val EVENT_CHANNEL_NAME_PREFIX = "eventChannelNamePrefix"
21+
22+
const val PATH = "path"
23+
const val KEY = "key"
24+
const val VALUE = "value"
25+
const val PRIORITY = "priority"
26+
const val SNAPSHOT = "snapshot"
27+
28+
const val COMMITTED = "committed"
29+
30+
const val MODIFIERS = "modifiers"
31+
const val ORDER_BY = "orderBy"
32+
const val CURSOR = "cursor"
33+
const val LIMIT = "limit"
34+
const val START_AT = "startAt"
35+
const val START_AFTER = "startAfter"
36+
const val END_AT = "endAt"
37+
const val END_BEFORE = "endBefore"
38+
const val LIMIT_TO_FIRST = "limitToFirst"
39+
const val LIMIT_TO_LAST = "limitToLast"
40+
41+
const val EVENT_TYPE = "eventType"
42+
43+
const val EVENT_TYPE_CHILD_ADDED = "childAdded"
44+
const val EVENT_TYPE_CHILD_REMOVED = "childRemoved"
45+
const val EVENT_TYPE_CHILD_CHANGED = "childChanged"
46+
const val EVENT_TYPE_CHILD_MOVED = "childMoved"
47+
const val EVENT_TYPE_VALUE = "value"
48+
49+
const val CHILD_KEYS = "childKeys"
50+
const val PREVIOUS_CHILD_NAME = "previousChildKey"
51+
52+
const val METHOD_CALL_TRANSACTION_HANDLER =
53+
"FirebaseDatabase#callTransactionHandler"
54+
const val TRANSACTION_KEY = "transactionKey"
55+
const val TRANSACTION_APPLY_LOCALLY = "transactionApplyLocally"
56+
57+
const val ERROR_CODE = "code"
58+
const val ERROR_MESSAGE = "message"
59+
const val ERROR_DETAILS = "details"
6060
}

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/EventStreamHandler.kt‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,50 @@ import io.flutter.plugin.common.EventChannel.StreamHandler
1414
import java.util.*
1515

1616
interface OnDispose {
17-
fun run()
17+
fun run()
1818
}
1919

20-
class EventStreamHandler @JvmOverloads constructor(
20+
class EventStreamHandler
21+
@JvmOverloads
22+
constructor(
2123
private val query: Query,
22-
private val onDispose: OnDispose
23-
) : StreamHandler {
24-
24+
private val onDispose: OnDispose,
25+
) : StreamHandler {
2526
private var valueEventListener: ValueEventListener? = null
2627
private var childEventListener: ChildEventListener? = null
2728

2829
@Suppress("UNCHECKED_CAST")
29-
override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
30-
val args = arguments as Map<String, Any>
31-
val eventType = args[Constants.EVENT_TYPE] as String
32-
33-
if (Constants.EVENT_TYPE_VALUE == eventType) {
34-
events?.let { eventSink ->
35-
valueEventListener = ValueEventsProxy(eventSink)
36-
query.addValueEventListener(valueEventListener!!)
37-
}
38-
} else {
39-
events?.let { eventSink ->
40-
childEventListener = ChildEventsProxy(eventSink, eventType)
41-
query.addChildEventListener(childEventListener!!)
42-
}
30+
override fun onListen(
31+
arguments: Any?,
32+
events: EventChannel.EventSink?,
33+
) {
34+
val args = arguments as Map<String, Any>
35+
val eventType = args[Constants.EVENT_TYPE] as String
36+
37+
if (Constants.EVENT_TYPE_VALUE == eventType) {
38+
events?.let { eventSink ->
39+
valueEventListener = ValueEventsProxy(eventSink)
40+
query.addValueEventListener(valueEventListener!!)
4341
}
42+
} else {
43+
events?.let { eventSink ->
44+
childEventListener = ChildEventsProxy(eventSink, eventType)
45+
query.addChildEventListener(childEventListener!!)
46+
}
47+
}
4448
}
4549

4650
override fun onCancel(arguments: Any?) {
47-
onDispose.run()
51+
onDispose.run()
4852

49-
valueEventListener?.let {
50-
query.removeEventListener(it)
51-
valueEventListener = null
52-
}
53+
valueEventListener?.let {
54+
query.removeEventListener(it)
55+
valueEventListener = null
56+
}
5357

54-
childEventListener?.let {
55-
query.removeEventListener(it)
56-
childEventListener = null
57-
}
58+
childEventListener?.let {
59+
query.removeEventListener(it)
60+
childEventListener = null
61+
}
5862
}
59-
}
63+
}

‎packages/firebase_database/firebase_database/android/src/main/kotlin/io/flutter/plugins/firebase/database/EventsProxy.kt‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,36 @@ import io.flutter.plugin.common.EventChannel
1414
import java.util.*
1515

1616
@RestrictTo(RestrictTo.Scope.LIBRARY)
17-
abstract class EventsProxy @JvmOverloads constructor(
17+
abstract class EventsProxy
18+
@JvmOverloads
19+
constructor(
1820
protected val eventSink: EventChannel.EventSink,
19-
private val eventType: String
20-
) {
21-
21+
private val eventType: String,
22+
) {
2223
fun buildAdditionalParams(
23-
@NonNull eventType: String,
24-
@Nullable previousChildName: String?
24+
@NonNull eventType: String,
25+
@Nullable previousChildName: String?,
2526
): Map<String, Any?> {
26-
val params = mutableMapOf<String, Any?>()
27-
params[Constants.EVENT_TYPE] = eventType
27+
val params = mutableMapOf<String, Any?>()
28+
params[Constants.EVENT_TYPE] = eventType
2829

29-
if (previousChildName != null) {
30-
params[Constants.PREVIOUS_CHILD_NAME] = previousChildName
31-
}
30+
if (previousChildName != null) {
31+
params[Constants.PREVIOUS_CHILD_NAME] = previousChildName
32+
}
3233

33-
return params
34+
return params
3435
}
3536

3637
protected fun sendEvent(
37-
@NonNull eventType: String,
38-
snapshot: DataSnapshot,
39-
@Nullable previousChildName: String?
38+
@NonNull eventType: String,
39+
snapshot: DataSnapshot,
40+
@Nullable previousChildName: String?,
4041
) {
41-
if (this.eventType != eventType) return
42+
if (this.eventType != eventType) return
4243

43-
val payload = FlutterDataSnapshotPayload(snapshot)
44-
val additionalParams = buildAdditionalParams(eventType, previousChildName)
44+
val payload = FlutterDataSnapshotPayload(snapshot)
45+
val additionalParams = buildAdditionalParams(eventType, previousChildName)
4546

46-
eventSink.success(payload.withAdditionalParams(additionalParams).toMap())
47+
eventSink.success(payload.withAdditionalParams(additionalParams).toMap())
4748
}
48-
}
49+
}

0 commit comments

Comments
 (0)