mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Update plugin ktlint to v12.1.0 (#2200)
* Update plugin ktlint to v12.1.0 * Run `./gradlew ktlintFormat` and fix some issues manually. * Fix other issues reproted by Ktlint * Limit false positives, KtLint removes unnecessary curly brace in String templates. * Remove useless Unit * Minor improvements over ktlint changes * Restore `AlertDialogContent` behaviour * Update screenshots --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Benoit Marty <benoit@matrix.org> Co-authored-by: Jorge Martín <jorgem@element.io> Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
+1
-1
@@ -21,7 +21,7 @@ import io.element.android.services.analyticsproviders.api.trackers.AnalyticsTrac
|
||||
import io.element.android.services.analyticsproviders.api.trackers.ErrorTracker
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface AnalyticsService: AnalyticsTracker, ErrorTracker {
|
||||
interface AnalyticsService : AnalyticsTracker, ErrorTracker {
|
||||
/**
|
||||
* Get the available analytics providers.
|
||||
*/
|
||||
|
||||
+4
-4
@@ -34,9 +34,9 @@ fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
|
||||
|
||||
fun MatrixRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
|
||||
return JoinedRoom(
|
||||
isDM = this.isDirect.orFalse(),
|
||||
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
|
||||
roomSize = this.joinedMemberCount.toAnalyticsRoomSize(),
|
||||
trigger = trigger
|
||||
isDM = this.isDirect.orFalse(),
|
||||
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
|
||||
roomSize = this.joinedMemberCount.toAnalyticsRoomSize(),
|
||||
trigger = trigger
|
||||
)
|
||||
}
|
||||
|
||||
+5
-5
@@ -25,11 +25,11 @@ fun MatrixRoom.toAnalyticsViewRoom(trigger: ViewRoom.Trigger? = null, selectedSp
|
||||
val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
|
||||
|
||||
return ViewRoom(
|
||||
isDM = this.isDirect.orFalse(),
|
||||
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
|
||||
trigger = trigger,
|
||||
activeSpace = activeSpace,
|
||||
viaKeyboard = viaKeyboard
|
||||
isDM = this.isDirect.orFalse(),
|
||||
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
|
||||
trigger = trigger,
|
||||
activeSpace = activeSpace,
|
||||
viaKeyboard = viaKeyboard
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user