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

Rename architecture module

Browse source
This commit is contained in:
ganfra 2023-01-20 16:26:43 +01:00
parent ae0c4e7542
commit 528c01199d
49 changed files with 63 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
View file

@ -148,7 +148,7 @@ class ContributesNodeCodeGenerator : CodeGenerator {
} }
companion object { companion object {
private val assistedNodeFactoryFqName = FqName("io.element.android.x.architecture.AssistedNodeFactory") private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory")
private val nodeKeyFqName = FqName("io.element.android.x.architecture.NodeKey") private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey")
} }
} }

2
app/src/main/kotlin/io/element/android/x/MainActivity.kt
View file

@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integration.NodeHost
import com.bumble.appyx.core.integrationpoint.NodeComponentActivity import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
import io.element.android.x.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.DaggerComponentOwner
import io.element.android.x.designsystem.ElementXTheme import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.di.AppBindings import io.element.android.x.di.AppBindings

2
app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
View file

@ -20,7 +20,7 @@ import android.content.Context
import com.squareup.anvil.annotations.MergeComponent import com.squareup.anvil.annotations.MergeComponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import io.element.android.x.architecture.NodeFactoriesBindings import io.element.android.libraries.architecture.NodeFactoriesBindings
@SingleIn(AppScope::class) @SingleIn(AppScope::class)
@MergeComponent(AppScope::class) @MergeComponent(AppScope::class)

2
app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
View file

@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo
import com.squareup.anvil.annotations.MergeSubcomponent import com.squareup.anvil.annotations.MergeSubcomponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Subcomponent import dagger.Subcomponent
import io.element.android.x.architecture.NodeFactoriesBindings import io.element.android.libraries.architecture.NodeFactoriesBindings
import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.matrix.room.MatrixRoom
@SingleIn(RoomScope::class) @SingleIn(RoomScope::class)

2
app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
View file

@ -20,7 +20,7 @@ import com.squareup.anvil.annotations.ContributesTo
import com.squareup.anvil.annotations.MergeSubcomponent import com.squareup.anvil.annotations.MergeSubcomponent
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Subcomponent import dagger.Subcomponent
import io.element.android.x.architecture.NodeFactoriesBindings import io.element.android.libraries.architecture.NodeFactoriesBindings
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
@SingleIn(SessionScope::class) @SingleIn(SessionScope::class)

4
app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt
View file

@ -32,8 +32,8 @@ import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.core.node.node import com.bumble.appyx.core.node.node
import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.push
import io.element.android.x.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.x.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.DaggerComponentOwner
import io.element.android.x.di.SessionComponent import io.element.android.x.di.SessionComponent
import io.element.android.x.features.preferences.PreferencesFlowNode import io.element.android.x.features.preferences.PreferencesFlowNode

4
app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt
View file

@ -25,8 +25,8 @@ 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.node.ParentNode import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.BackStack
import io.element.android.x.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.x.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.DaggerComponentOwner
import io.element.android.x.di.RoomComponent import io.element.android.x.di.RoomComponent
import io.element.android.x.features.messages.MessagesNode import io.element.android.x.features.messages.MessagesNode

4
app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt
View file

@ -36,8 +36,8 @@ import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.newRoot import com.bumble.appyx.navmodel.backstack.operation.newRoot
import com.bumble.appyx.navmodel.backstack.operation.pop import com.bumble.appyx.navmodel.backstack.operation.pop
import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.push
import io.element.android.x.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.x.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.di.DaggerComponentOwner import io.element.android.x.di.DaggerComponentOwner
import io.element.android.x.features.rageshake.bugreport.BugReportNode import io.element.android.x.features.rageshake.bugreport.BugReportNode
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient

2
app/src/main/kotlin/io/element/android/x/root/RootPresenter.kt
View file

@ -19,7 +19,7 @@ package io.element.android.x.root
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.rageshake.bugreport.BugReportPresenter import io.element.android.x.features.rageshake.bugreport.BugReportPresenter
import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter import io.element.android.x.features.rageshake.crash.ui.CrashDetectionPresenter
import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter import io.element.android.x.features.rageshake.detection.RageshakeDetectionPresenter

2
features/login/src/main/kotlin/io/element/android/x/features/login/LoginFlowNode.kt
View file

@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.BackStack
import com.bumble.appyx.navmodel.backstack.operation.push import com.bumble.appyx.navmodel.backstack.operation.push
import io.element.android.x.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.x.features.login.changeserver.ChangeServerNode import io.element.android.x.features.login.changeserver.ChangeServerNode
import io.element.android.x.features.login.root.LoginRootNode import io.element.android.x.features.login.root.LoginRootNode
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.di.AppScope import io.element.android.x.di.AppScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)

6
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerPresenter.kt
View file

@ -22,9 +22,9 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.architecture.execute import io.element.android.libraries.architecture.execute
import io.element.android.x.matrix.auth.MatrixAuthenticationService import io.element.android.x.matrix.auth.MatrixAuthenticationService
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerState.kt
View file

@ -16,7 +16,7 @@
package io.element.android.x.features.login.changeserver package io.element.android.x.features.login.changeserver
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
data class ChangeServerState( data class ChangeServerState(
val homeserver: String = "", val homeserver: String = "",

2
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
View file

@ -52,7 +52,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.core.compose.textFieldState import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.components.VectorIcon import io.element.android.x.designsystem.components.VectorIcon
import io.element.android.x.features.login.R import io.element.android.x.features.login.R

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootNode.kt
View file

@ -28,7 +28,7 @@ import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.core.compose.OnLifecycleEvent import io.element.android.x.core.compose.OnLifecycleEvent
import io.element.android.x.di.AppScope import io.element.android.x.di.AppScope

2
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootPresenter.kt
View file

@ -22,7 +22,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.matrix.auth.MatrixAuthenticationService import io.element.android.x.matrix.auth.MatrixAuthenticationService
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

9
features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferencePresenter.kt
View file

@ -21,15 +21,16 @@ 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
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.architecture.execute import io.element.android.libraries.architecture.execute
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) : Presenter<LogoutPreferenceState> { class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) :
Presenter<LogoutPreferenceState> {
@Composable @Composable
override fun present(): LogoutPreferenceState { override fun present(): LogoutPreferenceState {

2
features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
View file

@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.designsystem.components.ProgressDialog import io.element.android.x.designsystem.components.ProgressDialog
import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
import io.element.android.x.designsystem.components.preferences.PreferenceCategory import io.element.android.x.designsystem.components.preferences.PreferenceCategory

2
features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceState.kt
View file

@ -16,7 +16,7 @@
package io.element.android.x.features.logout package io.element.android.x.features.logout
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
data class LogoutPreferenceState( data class LogoutPreferenceState(
val logoutAction: Async<Unit> = Async.Uninitialized, val logoutAction: Async<Unit> = Async.Uninitialized,

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.di.RoomScope import io.element.android.x.di.RoomScope
@ContributesNode(RoomScope::class) @ContributesNode(RoomScope::class)

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/MessagesPresenter.kt
View file

@ -24,7 +24,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.x.designsystem.components.avatar.AvatarSize
import io.element.android.x.features.messages.actionlist.ActionListPresenter import io.element.android.x.features.messages.actionlist.ActionListPresenter

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/actionlist/ActionListPresenter.kt
View file

@ -21,7 +21,7 @@ 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
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.messages.actionlist.model.TimelineItemAction import io.element.android.x.features.messages.actionlist.model.TimelineItemAction
import io.element.android.x.features.messages.timeline.model.TimelineItem import io.element.android.x.features.messages.timeline.model.TimelineItem
import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent import io.element.android.x.features.messages.timeline.model.content.TimelineItemRedactedContent

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
View file

@ -21,7 +21,7 @@ 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.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.core.data.StableCharSequence import io.element.android.x.core.data.StableCharSequence
import io.element.android.x.core.data.toStableCharSequence import io.element.android.x.core.data.toStableCharSequence
import io.element.android.x.matrix.room.MatrixRoom import io.element.android.x.matrix.room.MatrixRoom

2
features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
View file

@ -24,7 +24,7 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.core.coroutine.CoroutineDispatchers import io.element.android.x.core.coroutine.CoroutineDispatchers
import io.element.android.x.matrix.MatrixClient import io.element.android.x.matrix.MatrixClient
import io.element.android.x.matrix.core.EventId import io.element.android.x.matrix.core.EventId

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/PreferencesFlowNode.kt
View file

@ -24,7 +24,7 @@ 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.node.ParentNode import com.bumble.appyx.core.node.ParentNode
import com.bumble.appyx.navmodel.backstack.BackStack import com.bumble.appyx.navmodel.backstack.BackStack
import io.element.android.x.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.x.features.preferences.root.PreferencesRootNode import io.element.android.x.features.preferences.root.PreferencesRootNode
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootNode.kt
View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.di.SessionScope import io.element.android.x.di.SessionScope
@ContributesNode(SessionScope::class) @ContributesNode(SessionScope::class)

4
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootPresenter.kt
View file

@ -17,8 +17,8 @@
package io.element.android.x.features.preferences.root package io.element.android.x.features.preferences.root
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.logout.LogoutPreferencePresenter import io.element.android.x.features.logout.LogoutPreferencePresenter
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter
import javax.inject.Inject import javax.inject.Inject

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootState.kt
View file

@ -16,7 +16,7 @@
package io.element.android.x.features.preferences.root package io.element.android.x.features.preferences.root
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.features.logout.LogoutPreferenceState import io.element.android.x.features.logout.LogoutPreferenceState
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState
import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.matrix.ui.model.MatrixUser

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt
View file

@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.designsystem.components.preferences.PreferenceView import io.element.android.x.designsystem.components.preferences.PreferenceView
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

2
features/preferences/src/main/kotlin/io/element/android/x/features/preferences/user/UserPreferences.kt
View file

@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.matrix.ui.components.MatrixUserHeader import io.element.android.x.matrix.ui.components.MatrixUserHeader
import io.element.android.x.matrix.ui.model.MatrixUser import io.element.android.x.matrix.ui.model.MatrixUser

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportNode.kt
View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.di.AppScope import io.element.android.x.di.AppScope
@ContributesNode(AppScope::class) @ContributesNode(AppScope::class)

4
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportPresenter.kt
View file

@ -24,8 +24,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.core.net.toUri import androidx.core.net.toUri
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.rageshake.crash.CrashDataStore import io.element.android.x.features.rageshake.crash.CrashDataStore
import io.element.android.x.features.rageshake.logs.VectorFileLogger import io.element.android.x.features.rageshake.logs.VectorFileLogger
import io.element.android.x.features.rageshake.reporter.BugReporter import io.element.android.x.features.rageshake.reporter.BugReporter

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportState.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.rageshake.bugreport package io.element.android.x.features.rageshake.bugreport
import android.os.Parcelable import android.os.Parcelable
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
data class BugReportState( data class BugReportState(

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
View file

@ -50,7 +50,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import coil.request.ImageRequest import coil.request.ImageRequest
import io.element.android.x.architecture.Async import io.element.android.libraries.architecture.Async
import io.element.android.x.core.compose.LogCompositions import io.element.android.x.core.compose.LogCompositions
import io.element.android.x.core.compose.textFieldState import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.components.LabelledCheckbox import io.element.android.x.designsystem.components.LabelledCheckbox

5
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionPresenter.kt
View file

@ -19,13 +19,14 @@ package io.element.android.x.features.rageshake.crash.ui
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.rageshake.crash.CrashDataStore import io.element.android.x.features.rageshake.crash.CrashDataStore
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) : Presenter<CrashDetectionState> { class CrashDetectionPresenter @Inject constructor(private val crashDataStore: CrashDataStore) :
Presenter<CrashDetectionState> {
@Composable @Composable
override fun present(): CrashDetectionState { override fun present(): CrashDetectionState {

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionPresenter.kt
View file

@ -23,7 +23,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.core.screenshot.ImageResult import io.element.android.x.core.screenshot.ImageResult
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents import io.element.android.x.features.rageshake.preferences.RageshakePreferencesEvents
import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.x.features.rageshake.preferences.RageshakePreferencesPresenter

2
features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesPresenter.kt
View file

@ -22,7 +22,7 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.x.features.rageshake.rageshake.RageShake import io.element.android.x.features.rageshake.rageshake.RageShake
import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListNode.kt
View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject 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.libraries.architecture.presenterConnector
import io.element.android.x.di.SessionScope import io.element.android.x.di.SessionScope
import io.element.android.x.matrix.core.RoomId import io.element.android.x.matrix.core.RoomId

2
features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListPresenter.kt
View file

@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
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.libraries.architecture.Presenter
import io.element.android.x.core.coroutine.parallelMap import io.element.android.x.core.coroutine.parallelMap
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.x.designsystem.components.avatar.AvatarSize

2
features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
View file

@ -25,8 +25,8 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.libraries.architecture.presenterConnector
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.di.AppScope import io.element.android.x.di.AppScope
// TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope

2
features/template/src/main/kotlin/io/element/android/x/features/template/TemplatePresenter.kt
View file

@ -17,7 +17,7 @@
package io.element.android.x.features.template package io.element.android.x.features.template
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import io.element.android.x.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import javax.inject.Inject import javax.inject.Inject
class TemplatePresenter @Inject constructor() : Presenter<TemplateState> { class TemplatePresenter @Inject constructor() : Presenter<TemplateState> {

2
libraries/architecture/build.gradle.kts
View file

@ -21,7 +21,7 @@ plugins {
} }
android { android {
namespace = "io.element.android.x.libraries.architecture" namespace = "io.element.android.libraries.architecture"
} }
dependencies { dependencies {

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/AssistedNodeFactory.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
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

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Async.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
import androidx.compose.runtime.MutableState import androidx.compose.runtime.MutableState
import androidx.compose.runtime.Stable import androidx.compose.runtime.Stable

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Bindings.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
import android.content.Context import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeFactories.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
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

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/NodeKey.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.Node
import dagger.MapKey import dagger.MapKey

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/Presenter.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
libraries/architecture/src/main/kotlin/io/element/android/x/architecture/PresenterConnector.kt → libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/PresenterConnector.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.architecture package io.element.android.libraries.architecture
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope