Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Update plugin ktlint to v12.1.0 (#2200)

Browse source 
* 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:
renovate[bot] 2024-01-10 16:22:24 +01:00 • committed by GitHub
parent 675cc525cf
commit 7e9cda3aa9
442 changed files with 1091 additions and 1081 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
View file

@ -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.
*/

8
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/JoinedRoomExt.kt
View file

@ -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
)
}

10
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/ViewRoomExt.kt
View file

@ -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
)
}