Apply ktlint format
This commit is contained in:
parent
b286b8bf9d
commit
1919058aac
28 changed files with 17 additions and 39 deletions
|
|
@ -25,7 +25,7 @@ import io.element.android.x.matrix.MatrixClient
|
||||||
|
|
||||||
@SingleIn(SessionScope::class)
|
@SingleIn(SessionScope::class)
|
||||||
@MergeSubcomponent(SessionScope::class)
|
@MergeSubcomponent(SessionScope::class)
|
||||||
interface SessionComponent: NodeFactoriesBindings, RoomComponent.ParentBindings {
|
interface SessionComponent : NodeFactoriesBindings, RoomComponent.ParentBindings {
|
||||||
|
|
||||||
fun matrixClient(): MatrixClient
|
fun matrixClient(): MatrixClient
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,5 +33,4 @@ class MatrixInitializer : Initializer<Unit> {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun dependencies(): List<Class<out Initializer<*>>> = listOf(TimberInitializer::class.java)
|
override fun dependencies(): List<Class<out Initializer<*>>> = listOf(TimberInitializer::class.java)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ plugins {
|
||||||
alias(libs.plugins.dependencygraph)
|
alias(libs.plugins.dependencygraph)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
tasks.register<Delete>("clean").configure {
|
tasks.register<Delete>("clean").configure {
|
||||||
delete(rootProject.buildDir)
|
delete(rootProject.buildDir)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,5 +18,5 @@ package io.element.android.x.features.login.changeserver
|
||||||
|
|
||||||
sealed interface ChangeServerEvents {
|
sealed interface ChangeServerEvents {
|
||||||
data class SetServer(val server: String) : ChangeServerEvents
|
data class SetServer(val server: String) : ChangeServerEvents
|
||||||
object Submit: ChangeServerEvents
|
object Submit : ChangeServerEvents
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.R
|
||||||
import io.element.android.x.features.login.error.changeServerError
|
import io.element.android.x.features.login.error.changeServerError
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ChangeServerView(
|
fun ChangeServerView(
|
||||||
state: ChangeServerState,
|
state: ChangeServerState,
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import com.bumble.appyx.core.lifecycle.subscribe
|
|
||||||
import com.bumble.appyx.core.modality.BuildContext
|
import com.bumble.appyx.core.modality.BuildContext
|
||||||
import com.bumble.appyx.core.node.Node
|
import com.bumble.appyx.core.node.Node
|
||||||
import com.bumble.appyx.core.plugin.Plugin
|
import com.bumble.appyx.core.plugin.Plugin
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
package io.element.android.x.features.login.root
|
package io.element.android.x.features.login.root
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
|
||||||
import androidx.compose.runtime.MutableState
|
import androidx.compose.runtime.MutableState
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
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.architecture.Presenter
|
||||||
import io.element.android.x.matrix.Matrix
|
import io.element.android.x.matrix.Matrix
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.flow.Flow
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
|
@ -45,7 +43,7 @@ class LoginRootPresenter @Inject constructor(private val matrix: Matrix) : Prese
|
||||||
mutableStateOf(LoginFormState.Default)
|
mutableStateOf(LoginFormState.Default)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun handleEvents(event: LoginRootEvents){
|
fun handleEvents(event: LoginRootEvents) {
|
||||||
when (event) {
|
when (event) {
|
||||||
LoginRootEvents.RefreshHomeServer -> refreshHomeServer(homeserver)
|
LoginRootEvents.RefreshHomeServer -> refreshHomeServer(homeserver)
|
||||||
is LoginRootEvents.SetLogin -> updateFormState(formState) {
|
is LoginRootEvents.SetLogin -> updateFormState(formState) {
|
||||||
|
|
|
||||||
|
|
@ -17,5 +17,5 @@
|
||||||
package io.element.android.x.features.logout
|
package io.element.android.x.features.logout
|
||||||
|
|
||||||
sealed interface LogoutPreferenceEvents {
|
sealed interface LogoutPreferenceEvents {
|
||||||
object Logout: LogoutPreferenceEvents
|
object Logout : LogoutPreferenceEvents
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,6 @@ fun MessagesView(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
onBackPressed: () -> Unit,
|
onBackPressed: () -> Unit,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
LogCompositions(tag = "MessagesScreen", msg = "Root")
|
LogCompositions(tag = "MessagesScreen", msg = "Root")
|
||||||
val itemActionsBottomSheetState = rememberModalBottomSheetState(
|
val itemActionsBottomSheetState = rememberModalBottomSheetState(
|
||||||
initialValue = ModalBottomSheetValue.Hidden,
|
initialValue = ModalBottomSheetValue.Hidden,
|
||||||
|
|
@ -163,7 +162,6 @@ fun MessagesViewContent(
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.wrapContentHeight(Alignment.Bottom)
|
.wrapContentHeight(Alignment.Bottom)
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,6 @@ class ActionListPresenter @Inject constructor() : Presenter<ActionListState> {
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun present(): ActionListState {
|
override fun present(): ActionListState {
|
||||||
|
|
||||||
val localCoroutineScope = rememberCoroutineScope()
|
val localCoroutineScope = rememberCoroutineScope()
|
||||||
|
|
||||||
val target: MutableState<ActionListState.Target> = remember {
|
val target: MutableState<ActionListState.Target> = remember {
|
||||||
|
|
|
||||||
|
|
@ -130,4 +130,3 @@ private fun SheetContent(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ fun MessageComposerView(
|
||||||
state: MessageComposerState,
|
state: MessageComposerState,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
fun onFullscreenToggle() {
|
fun onFullscreenToggle() {
|
||||||
state.eventSink(MessageComposerEvents.ToggleFullScreenState)
|
state.eventSink(MessageComposerEvents.ToggleFullScreenState)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,5 +20,5 @@ import io.element.android.x.matrix.core.EventId
|
||||||
|
|
||||||
sealed interface TimelineEvents {
|
sealed interface TimelineEvents {
|
||||||
object LoadMore : TimelineEvents
|
object LoadMore : TimelineEvents
|
||||||
data class SetHighlightedEvent(val eventId: EventId?): TimelineEvents
|
data class SetHighlightedEvent(val eventId: EventId?) : TimelineEvents
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,6 @@ class TimelinePresenter @Inject constructor(
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun present(): TimelineState {
|
override fun present(): TimelineState {
|
||||||
|
|
||||||
val localCoroutineScope = rememberCoroutineScope()
|
val localCoroutineScope = rememberCoroutineScope()
|
||||||
val hasMoreToLoad = rememberSaveable {
|
val hasMoreToLoad = rememberSaveable {
|
||||||
mutableStateOf(timeline.hasMoreToLoad)
|
mutableStateOf(timeline.hasMoreToLoad)
|
||||||
|
|
|
||||||
|
|
@ -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.LogoutPreferenceState
|
||||||
import io.element.android.x.features.logout.LogoutPreferenceView
|
import io.element.android.x.features.logout.LogoutPreferenceView
|
||||||
import io.element.android.x.features.preferences.user.UserPreferences
|
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.RageshakePreferencesState
|
||||||
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView
|
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,10 @@ package io.element.android.x.features.rageshake.bugreport
|
||||||
|
|
||||||
sealed interface BugReportEvents {
|
sealed interface BugReportEvents {
|
||||||
object SendBugReport : BugReportEvents
|
object SendBugReport : BugReportEvents
|
||||||
object ResetAll: BugReportEvents
|
object ResetAll : BugReportEvents
|
||||||
data class SetDescription(val description: String): BugReportEvents
|
data class SetDescription(val description: String) : BugReportEvents
|
||||||
data class SetSendLog(val sendLog: Boolean): BugReportEvents
|
data class SetSendLog(val sendLog: Boolean) : BugReportEvents
|
||||||
data class SetSendCrashLog(val sendCrashlog: Boolean): BugReportEvents
|
data class SetSendCrashLog(val sendCrashlog: Boolean) : BugReportEvents
|
||||||
data class SetCanContact(val canContact: Boolean): BugReportEvents
|
data class SetCanContact(val canContact: Boolean) : BugReportEvents
|
||||||
data class SetSendScreenshot(val sendScreenshot: Boolean) : BugReportEvents
|
data class SetSendScreenshot(val sendScreenshot: Boolean) : BugReportEvents
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,4 +57,3 @@ class BugReportNode @AssistedInject constructor(
|
||||||
plugins<Callback>().forEach { it.onBugReportSent() }
|
plugins<Callback>().forEach { it.onBugReportSent() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
package io.element.android.x.features.rageshake.bugreport
|
package io.element.android.x.features.rageshake.bugreport
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ fun CrashDetectionView(
|
||||||
) {
|
) {
|
||||||
LogCompositions(tag = "Crash", msg = "CrashDetectionScreen")
|
LogCompositions(tag = "Crash", msg = "CrashDetectionScreen")
|
||||||
|
|
||||||
fun onPopupDismissed(){
|
fun onPopupDismissed() {
|
||||||
state.eventSink(CrashDetectionEvents.ResetAllCrashData)
|
state.eventSink(CrashDetectionEvents.ResetAllCrashData)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ package io.element.android.x.features.rageshake.detection
|
||||||
import io.element.android.x.core.screenshot.ImageResult
|
import io.element.android.x.core.screenshot.ImageResult
|
||||||
|
|
||||||
sealed interface RageshakeDetectionEvents {
|
sealed interface RageshakeDetectionEvents {
|
||||||
object Dismiss: RageshakeDetectionEvents
|
object Dismiss : RageshakeDetectionEvents
|
||||||
object Disable : RageshakeDetectionEvents
|
object Disable : RageshakeDetectionEvents
|
||||||
object StartDetection : RageshakeDetectionEvents
|
object StartDetection : RageshakeDetectionEvents
|
||||||
object StopDetection : RageshakeDetectionEvents
|
object StopDetection : RageshakeDetectionEvents
|
||||||
|
|
|
||||||
|
|
@ -35,12 +35,11 @@ fun RageshakePreferencesView(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
onOpenRageshake: () -> Unit = {},
|
onOpenRageshake: () -> Unit = {},
|
||||||
) {
|
) {
|
||||||
|
fun onSensitivityChanged(sensitivity: Float) {
|
||||||
fun onSensitivityChanged(sensitivity: Float){
|
|
||||||
state.eventSink(RageshakePreferencesEvents.SetSensitivity(sensitivity = sensitivity))
|
state.eventSink(RageshakePreferencesEvents.SetSensitivity(sensitivity = sensitivity))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onEnabledChanged(isEnabled: Boolean){
|
fun onEnabledChanged(isEnabled: Boolean) {
|
||||||
state.eventSink(RageshakePreferencesEvents.SetIsEnabled(isEnabled = isEnabled))
|
state.eventSink(RageshakePreferencesEvents.SetIsEnabled(isEnabled = isEnabled))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ import dagger.assisted.AssistedInject
|
||||||
import io.element.android.x.anvilannotations.ContributesNode
|
import io.element.android.x.anvilannotations.ContributesNode
|
||||||
import io.element.android.x.architecture.presenterConnector
|
import io.element.android.x.architecture.presenterConnector
|
||||||
import io.element.android.x.di.SessionScope
|
import io.element.android.x.di.SessionScope
|
||||||
import io.element.android.x.features.roomlist.model.RoomListEvents
|
|
||||||
import io.element.android.x.matrix.core.RoomId
|
import io.element.android.x.matrix.core.RoomId
|
||||||
|
|
||||||
@ContributesNode(SessionScope::class)
|
@ContributesNode(SessionScope::class)
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import io.element.android.x.architecture.Presenter
|
import io.element.android.x.architecture.Presenter
|
||||||
|
|
|
||||||
|
|
@ -57,12 +57,11 @@ fun RoomListView(
|
||||||
onRoomClicked: (RoomId) -> Unit = {},
|
onRoomClicked: (RoomId) -> Unit = {},
|
||||||
onOpenSettings: () -> Unit = {},
|
onOpenSettings: () -> Unit = {},
|
||||||
) {
|
) {
|
||||||
|
fun onFilterChanged(filter: String) {
|
||||||
fun onFilterChanged(filter: String){
|
|
||||||
state.eventSink(RoomListEvents.UpdateFilter(filter))
|
state.eventSink(RoomListEvents.UpdateFilter(filter))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onVisibleRangedChanged(range: IntRange){
|
fun onVisibleRangedChanged(range: IntRange) {
|
||||||
state.eventSink(RoomListEvents.UpdateVisibleRange(range))
|
state.eventSink(RoomListEvents.UpdateVisibleRange(range))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,5 +18,5 @@ package io.element.android.x.features.roomlist.model
|
||||||
|
|
||||||
sealed interface RoomListEvents {
|
sealed interface RoomListEvents {
|
||||||
data class UpdateFilter(val newFilter: String) : RoomListEvents
|
data class UpdateFilter(val newFilter: String) : RoomListEvents
|
||||||
data class UpdateVisibleRange(val range: IntRange): RoomListEvents
|
data class UpdateVisibleRange(val range: IntRange) : RoomListEvents
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
package io.element.android.x.architecture
|
package io.element.android.x.architecture
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import kotlinx.coroutines.flow.Flow
|
|
||||||
|
|
||||||
interface Presenter<State> {
|
interface Presenter<State> {
|
||||||
@Composable
|
@Composable
|
||||||
|
|
|
||||||
|
|
@ -47,4 +47,3 @@ class NotLoggedInImageLoaderFactory @Inject constructor(
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@
|
||||||
package io.element.android.x.matrix.ui.model
|
package io.element.android.x.matrix.ui.model
|
||||||
|
|
||||||
import androidx.compose.runtime.Immutable
|
import androidx.compose.runtime.Immutable
|
||||||
import androidx.compose.runtime.Stable
|
|
||||||
import io.element.android.x.designsystem.components.avatar.AvatarData
|
import io.element.android.x.designsystem.components.avatar.AvatarData
|
||||||
import io.element.android.x.matrix.core.UserId
|
import io.element.android.x.matrix.core.UserId
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue