From 55d6ca566f8edf95a9721f64f0db5ca09bec6a21 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 13 Jan 2023 18:37:28 +0100 Subject: [PATCH] Apply ktlint format --- .../java/io/element/android/x/di/SessionComponent.kt | 2 +- .../element/android/x/initializer/MatrixInitializer.kt | 1 - build.gradle.kts | 1 - .../features/login/changeserver/ChangeServerEvents.kt | 2 +- .../x/features/login/changeserver/ChangeServerView.kt | 1 - .../android/x/features/login/root/LoginRootNode.kt | 1 - .../x/features/login/root/LoginRootPresenter.kt | 4 +--- .../x/features/logout/LogoutPreferenceEvents.kt | 2 +- .../android/x/features/messages/MessagesView.kt | 2 -- .../messages/actionlist/ActionListPresenter.kt | 1 - .../x/features/messages/actionlist/ActionListView.kt | 1 - .../messages/textcomposer/MessageComposerView.kt | 1 - .../x/features/messages/timeline/TimelineEvents.kt | 2 +- .../x/features/messages/timeline/TimelinePresenter.kt | 1 - .../x/features/preferences/root/PreferencesRootView.kt | 1 - .../x/features/rageshake/bugreport/BugReportEvents.kt | 10 +++++----- .../x/features/rageshake/bugreport/BugReportNode.kt | 1 - .../x/features/rageshake/bugreport/BugReportView.kt | 1 - .../rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../rageshake/detection/RageshakeDetectionEvents.kt | 2 +- .../rageshake/preferences/RageshakePreferencesView.kt | 5 ++--- .../android/x/features/roomlist/RoomListNode.kt | 1 - .../android/x/features/roomlist/RoomListPresenter.kt | 1 - .../android/x/features/roomlist/RoomListView.kt | 5 ++--- .../x/features/roomlist/model/RoomListEvents.kt | 2 +- .../io/element/android/x/architecture/Presenter.kt | 1 - .../android/x/matrix/ui/media/ImageLoaderFactories.kt | 1 - .../io/element/android/x/matrix/ui/model/MatrixUser.kt | 1 - 28 files changed, 17 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/io/element/android/x/di/SessionComponent.kt b/app/src/main/java/io/element/android/x/di/SessionComponent.kt index 298c97e66c..a9716e57c1 100644 --- a/app/src/main/java/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/java/io/element/android/x/di/SessionComponent.kt @@ -25,7 +25,7 @@ import io.element.android.x.matrix.MatrixClient @SingleIn(SessionScope::class) @MergeSubcomponent(SessionScope::class) -interface SessionComponent: NodeFactoriesBindings, RoomComponent.ParentBindings { +interface SessionComponent : NodeFactoriesBindings, RoomComponent.ParentBindings { fun matrixClient(): MatrixClient diff --git a/app/src/main/java/io/element/android/x/initializer/MatrixInitializer.kt b/app/src/main/java/io/element/android/x/initializer/MatrixInitializer.kt index f071893d19..bfcdaea612 100644 --- a/app/src/main/java/io/element/android/x/initializer/MatrixInitializer.kt +++ b/app/src/main/java/io/element/android/x/initializer/MatrixInitializer.kt @@ -33,5 +33,4 @@ class MatrixInitializer : Initializer { } override fun dependencies(): List>> = listOf(TimberInitializer::class.java) - } diff --git a/build.gradle.kts b/build.gradle.kts index 5199a030ea..230878d587 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,6 @@ plugins { alias(libs.plugins.dependencygraph) } - tasks.register("clean").configure { delete(rootProject.buildDir) } diff --git a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt index f1c3fa78bd..78e4e64ffd 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerEvents.kt @@ -18,5 +18,5 @@ package io.element.android.x.features.login.changeserver sealed interface ChangeServerEvents { data class SetServer(val server: String) : ChangeServerEvents - object Submit: ChangeServerEvents + object Submit : ChangeServerEvents } diff --git a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerView.kt index e08fb73e52..80dc4f2e0b 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -59,7 +59,6 @@ import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError - @Composable fun ChangeServerView( state: ChangeServerState, diff --git a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootNode.kt b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootNode.kt index aa7698089f..eb1f1d304b 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootNode.kt @@ -21,7 +21,6 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.lifecycle.Lifecycle -import com.bumble.appyx.core.lifecycle.subscribe import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin diff --git a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootPresenter.kt b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootPresenter.kt index 3c14632de6..ef6b2eab7b 100644 --- a/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootPresenter.kt +++ b/features/login/src/main/java/io/element/android/x/features/login/root/LoginRootPresenter.kt @@ -17,7 +17,6 @@ package io.element.android.x.features.login.root import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -26,7 +25,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import io.element.android.x.architecture.Presenter import io.element.android.x.matrix.Matrix import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch import javax.inject.Inject @@ -45,7 +43,7 @@ class LoginRootPresenter @Inject constructor(private val matrix: Matrix) : Prese mutableStateOf(LoginFormState.Default) } - fun handleEvents(event: LoginRootEvents){ + fun handleEvents(event: LoginRootEvents) { when (event) { LoginRootEvents.RefreshHomeServer -> refreshHomeServer(homeserver) is LoginRootEvents.SetLogin -> updateFormState(formState) { diff --git a/features/logout/src/main/java/io/element/android/x/features/logout/LogoutPreferenceEvents.kt b/features/logout/src/main/java/io/element/android/x/features/logout/LogoutPreferenceEvents.kt index 587fc2a9d8..83aa2fe14f 100644 --- a/features/logout/src/main/java/io/element/android/x/features/logout/LogoutPreferenceEvents.kt +++ b/features/logout/src/main/java/io/element/android/x/features/logout/LogoutPreferenceEvents.kt @@ -17,5 +17,5 @@ package io.element.android.x.features.logout sealed interface LogoutPreferenceEvents { - object Logout: LogoutPreferenceEvents + object Logout : LogoutPreferenceEvents } diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesView.kt index 36ebf90e35..7711233699 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesView.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesView.kt @@ -74,7 +74,6 @@ fun MessagesView( modifier: Modifier = Modifier, onBackPressed: () -> Unit, ) { - LogCompositions(tag = "MessagesScreen", msg = "Root") val itemActionsBottomSheetState = rememberModalBottomSheetState( initialValue = ModalBottomSheetValue.Hidden, @@ -163,7 +162,6 @@ fun MessagesViewContent( .fillMaxWidth() .wrapContentHeight(Alignment.Bottom) ) - } } diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt b/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt index c2c201dc88..cc894931c6 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt @@ -34,7 +34,6 @@ class ActionListPresenter @Inject constructor() : Presenter { @Composable override fun present(): ActionListState { - val localCoroutineScope = rememberCoroutineScope() val target: MutableState = remember { diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListView.kt index de6a40e3f9..7984577de4 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListView.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/actionlist/ActionListView.kt @@ -130,4 +130,3 @@ private fun SheetContent( } } } - diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt index 061518d3c7..b5592ecceb 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt @@ -25,7 +25,6 @@ fun MessageComposerView( state: MessageComposerState, modifier: Modifier = Modifier, ) { - fun onFullscreenToggle() { state.eventSink(MessageComposerEvents.ToggleFullScreenState) } diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelineEvents.kt b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelineEvents.kt index e2354891ea..733a082d73 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelineEvents.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelineEvents.kt @@ -20,5 +20,5 @@ import io.element.android.x.matrix.core.EventId sealed interface TimelineEvents { object LoadMore : TimelineEvents - data class SetHighlightedEvent(val eventId: EventId?): TimelineEvents + data class SetHighlightedEvent(val eventId: EventId?) : TimelineEvents } diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index e4204b5c14..271c830c28 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -62,7 +62,6 @@ class TimelinePresenter @Inject constructor( @Composable override fun present(): TimelineState { - val localCoroutineScope = rememberCoroutineScope() val hasMoreToLoad = rememberSaveable { mutableStateOf(timeline.hasMoreToLoad) diff --git a/features/preferences/src/main/java/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/java/io/element/android/x/features/preferences/root/PreferencesRootView.kt index 185287b67b..95049803a3 100644 --- a/features/preferences/src/main/java/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/java/io/element/android/x/features/preferences/root/PreferencesRootView.kt @@ -26,7 +26,6 @@ import io.element.android.x.element.resources.R import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.preferences.user.UserPreferences -import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt index 65183ad09c..c8bbfe2741 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportEvents.kt @@ -18,10 +18,10 @@ package io.element.android.x.features.rageshake.bugreport sealed interface BugReportEvents { object SendBugReport : BugReportEvents - object ResetAll: BugReportEvents - data class SetDescription(val description: String): BugReportEvents - data class SetSendLog(val sendLog: Boolean): BugReportEvents - data class SetSendCrashLog(val sendCrashlog: Boolean): BugReportEvents - data class SetCanContact(val canContact: Boolean): BugReportEvents + object ResetAll : BugReportEvents + data class SetDescription(val description: String) : BugReportEvents + data class SetSendLog(val sendLog: Boolean) : BugReportEvents + data class SetSendCrashLog(val sendCrashlog: Boolean) : BugReportEvents + data class SetCanContact(val canContact: Boolean) : BugReportEvents data class SetSendScreenshot(val sendScreenshot: Boolean) : BugReportEvents } diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt index 9a944e262e..c01f153ddd 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt @@ -57,4 +57,3 @@ class BugReportNode @AssistedInject constructor( plugins().forEach { it.onBugReportSent() } } } - diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index 06fa9dd539..394cf69a5b 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -14,7 +14,6 @@ * limitations under the License. */ - package io.element.android.x.features.rageshake.bugreport import androidx.compose.foundation.layout.Box diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index a0d764a286..7c1e855455 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -31,7 +31,7 @@ fun CrashDetectionView( ) { LogCompositions(tag = "Crash", msg = "CrashDetectionScreen") - fun onPopupDismissed(){ + fun onPopupDismissed() { state.eventSink(CrashDetectionEvents.ResetAllCrashData) } diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt index 7bbb9088b8..0ba2a26bae 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionEvents.kt @@ -19,7 +19,7 @@ package io.element.android.x.features.rageshake.detection import io.element.android.x.core.screenshot.ImageResult sealed interface RageshakeDetectionEvents { - object Dismiss: RageshakeDetectionEvents + object Dismiss : RageshakeDetectionEvents object Disable : RageshakeDetectionEvents object StartDetection : RageshakeDetectionEvents object StopDetection : RageshakeDetectionEvents diff --git a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt index ac7b2478fc..e9142a2c2e 100644 --- a/features/rageshake/src/main/java/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/java/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt @@ -35,12 +35,11 @@ fun RageshakePreferencesView( modifier: Modifier = Modifier, onOpenRageshake: () -> Unit = {}, ) { - - fun onSensitivityChanged(sensitivity: Float){ + fun onSensitivityChanged(sensitivity: Float) { state.eventSink(RageshakePreferencesEvents.SetSensitivity(sensitivity = sensitivity)) } - fun onEnabledChanged(isEnabled: Boolean){ + fun onEnabledChanged(isEnabled: Boolean) { state.eventSink(RageshakePreferencesEvents.SetIsEnabled(isEnabled = isEnabled)) } diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListNode.kt index 9e6f11b2b9..246545588f 100644 --- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListNode.kt @@ -29,7 +29,6 @@ import dagger.assisted.AssistedInject import io.element.android.x.anvilannotations.ContributesNode import io.element.android.x.architecture.presenterConnector import io.element.android.x.di.SessionScope -import io.element.android.x.features.roomlist.model.RoomListEvents import io.element.android.x.matrix.core.RoomId @ContributesNode(SessionScope::class) diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt index 107543877c..991239ba59 100644 --- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt +++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt @@ -23,7 +23,6 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import io.element.android.x.architecture.Presenter diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListView.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListView.kt index 4eb09e52b2..97d849415c 100644 --- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListView.kt +++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListView.kt @@ -57,12 +57,11 @@ fun RoomListView( onRoomClicked: (RoomId) -> Unit = {}, onOpenSettings: () -> Unit = {}, ) { - - fun onFilterChanged(filter: String){ + fun onFilterChanged(filter: String) { state.eventSink(RoomListEvents.UpdateFilter(filter)) } - fun onVisibleRangedChanged(range: IntRange){ + fun onVisibleRangedChanged(range: IntRange) { state.eventSink(RoomListEvents.UpdateVisibleRange(range)) } diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListEvents.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListEvents.kt index 8bcb3f3362..e4cbf4430b 100644 --- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListEvents.kt +++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListEvents.kt @@ -18,5 +18,5 @@ package io.element.android.x.features.roomlist.model sealed interface RoomListEvents { data class UpdateFilter(val newFilter: String) : RoomListEvents - data class UpdateVisibleRange(val range: IntRange): RoomListEvents + data class UpdateVisibleRange(val range: IntRange) : RoomListEvents } diff --git a/libraries/architecture/src/main/java/io/element/android/x/architecture/Presenter.kt b/libraries/architecture/src/main/java/io/element/android/x/architecture/Presenter.kt index 0ffae8ef2c..6d5e7de444 100644 --- a/libraries/architecture/src/main/java/io/element/android/x/architecture/Presenter.kt +++ b/libraries/architecture/src/main/java/io/element/android/x/architecture/Presenter.kt @@ -17,7 +17,6 @@ package io.element.android.x.architecture import androidx.compose.runtime.Composable -import kotlinx.coroutines.flow.Flow interface Presenter { @Composable diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt index 584ed28ef3..eecb25f9f2 100644 --- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt +++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/media/ImageLoaderFactories.kt @@ -47,4 +47,3 @@ class NotLoggedInImageLoaderFactory @Inject constructor( .build() } } - diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt index 3dfebaf16b..835ea35a7a 100644 --- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt +++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt @@ -17,7 +17,6 @@ package io.element.android.x.matrix.ui.model import androidx.compose.runtime.Immutable -import androidx.compose.runtime.Stable import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.matrix.core.UserId