[Architecture] split all feature modules to api/impl

app/build.gradle.kts

@@ -26,8 +26,8 @@ plugins {
     id("io.element.android-compose-application")
     alias(libs.plugins.stem)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.ksp)
     alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.kapt)
     id("com.google.firebase.appdistribution") version "3.0.2"
     id("org.jetbrains.kotlinx.knit") version "0.4.0"

app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt

@@ -18,7 +18,7 @@ package io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
-import io.element.android.features.rageshake.crash.VectorUncaughtExceptionHandler
+import io.element.android.features.rageshake.impl.crash.VectorUncaughtExceptionHandler
 
 class CrashInitializer : Initializer<Unit> {
 

app/src/main/kotlin/io/element/android/x/initializer/TimberInitializer.kt

@@ -18,7 +18,7 @@ package io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
-import io.element.android.features.rageshake.logs.VectorFileLogger
+import io.element.android.features.rageshake.impl.logs.VectorFileLogger
 import io.element.android.x.BuildConfig
 import timber.log.Timber
 

appnav/build.gradle.kts

@@ -37,12 +37,12 @@ dependencies {
     kapt(libs.dagger.compiler)
 
     implementation(projects.features.messages.api)
-    implementation(projects.features.roomlist)
+    implementation(projects.features.roomlist.api)
-    implementation(projects.features.rageshake)
+    implementation(projects.features.rageshake.api)
-    implementation(projects.features.login)
+    implementation(projects.features.login.api)
-    implementation(projects.features.preferences)
+    implementation(projects.features.preferences.api)
-    implementation(projects.features.logout)
+    implementation(projects.features.logout.api)
-    implementation(projects.features.onboarding)
+    implementation(projects.features.onboarding.api)
 
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
@@ -58,4 +58,6 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.features.rageshake.test)
+    testImplementation(projects.features.rageshake.impl)
 }

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -17,7 +17,6 @@
 package io.element.android.appnav
 
 import android.app.Activity
-import android.content.Context
 import android.os.Parcelable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -42,13 +41,12 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.di.MatrixClientsHolder
 import io.element.android.appnav.root.RootPresenter
 import io.element.android.appnav.root.RootView
-import io.element.android.features.rageshake.bugreport.BugReportEntryPoint
+import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
@@ -63,7 +61,6 @@ import timber.log.Timber
 class RootFlowNode @AssistedInject constructor(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    @ApplicationContext private val appContext: Context,
     private val authenticationService: MatrixAuthenticationService,
     private val matrixClientsHolder: MatrixClientsHolder,
     private val presenter: RootPresenter,

appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt

@@ -19,8 +19,8 @@ package io.element.android.appnav.root
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter
+import io.element.android.features.rageshake.api.crash.CrashDetectionPresenter
-import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter
+import io.element.android.features.rageshake.api.detection.RageshakeDetectionPresenter
 import io.element.android.libraries.architecture.Presenter
 import javax.inject.Inject
 

appnav/src/main/kotlin/io/element/android/appnav/root/RootState.kt

@@ -16,12 +16,11 @@
 
 package io.element.android.appnav.root
 
-import androidx.compose.runtime.Stable
+import androidx.compose.runtime.Immutable
-import io.element.android.appnav.root.RootEvents
+import io.element.android.features.rageshake.api.crash.CrashDetectionState
-import io.element.android.features.rageshake.crash.ui.CrashDetectionState
+import io.element.android.features.rageshake.api.detection.RageshakeDetectionState
-import io.element.android.features.rageshake.detection.RageshakeDetectionState
 
-@Stable
+@Immutable
 data class RootState(
     val isShowkaseButtonVisible: Boolean,
     val rageshakeDetectionState: RageshakeDetectionState,

appnav/src/main/kotlin/io/element/android/appnav/root/RootStateProvider.kt

@@ -17,8 +17,8 @@
 package io.element.android.appnav.root
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.rageshake.crash.ui.aCrashDetectionState
+import io.element.android.features.rageshake.api.crash.aCrashDetectionState
-import io.element.android.features.rageshake.detection.aRageshakeDetectionState
+import io.element.android.features.rageshake.api.detection.aRageshakeDetectionState
 
 open class RootStateProvider : PreviewParameterProvider<RootState> {
     override val values: Sequence<RootState>

appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt

@@ -24,10 +24,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import io.element.android.features.rageshake.crash.ui.CrashDetectionEvents
+import io.element.android.features.rageshake.api.crash.CrashDetectionEvents
-import io.element.android.features.rageshake.crash.ui.CrashDetectionView
+import io.element.android.features.rageshake.api.crash.CrashDetectionView
-import io.element.android.features.rageshake.detection.RageshakeDetectionEvents
+import io.element.android.features.rageshake.api.detection.RageshakeDetectionEvents
-import io.element.android.features.rageshake.detection.RageshakeDetectionView
+import io.element.android.features.rageshake.api.detection.RageshakeDetectionView
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Text

appnav/src/test/kotlin/io/element/android/appnav/FakeBugReporter.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.appnav
-
-import io.element.android.features.rageshake.reporter.BugReporter
-import io.element.android.features.rageshake.reporter.BugReporterListener
-import io.element.android.features.rageshake.reporter.ReportType
-import io.element.android.libraries.matrix.test.A_FAILURE_REASON
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-// TODO Remove this duplicated class when we will rework modules.
-class FakeBugReporter(val mode: FakeBugReporterMode = FakeBugReporterMode.Success) : BugReporter {
-    override fun sendBugReport(
-        coroutineScope: CoroutineScope,
-        reportType: ReportType,
-        withDevicesLogs: Boolean,
-        withCrashLogs: Boolean,
-        withKeyRequestHistory: Boolean,
-        withScreenshot: Boolean,
-        theBugDescription: String,
-        serverVersion: String,
-        canContact: Boolean,
-        customFields: Map<String, String>?,
-        listener: BugReporterListener?,
-    ) {
-        coroutineScope.launch {
-            delay(100)
-            listener?.onProgress(0)
-            delay(100)
-            listener?.onProgress(50)
-            delay(100)
-            when (mode) {
-                FakeBugReporterMode.Success -> Unit
-                FakeBugReporterMode.Failure -> {
-                    listener?.onUploadFailed(A_FAILURE_REASON)
-                    return@launch
-                }
-                FakeBugReporterMode.Cancel -> {
-                    listener?.onUploadCancelled()
-                    return@launch
-                }
-            }
-            listener?.onProgress(100)
-            delay(100)
-            listener?.onUploadSucceed(null)
-        }
-    }
-}
-
-enum class FakeBugReporterMode {
-    Success,
-    Failure,
-    Cancel
-}

appnav/src/test/kotlin/io/element/android/appnav/FakeCrashDataStore.kt

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.appnav
-
-import io.element.android.features.rageshake.crash.CrashDataStore
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-const val A_CRASH_DATA = "Some crash data"
-
-// TODO Remove this duplicated class when we will rework modules.
-
-class FakeCrashDataStore(
-    crashData: String = "",
-    appHasCrashed: Boolean = false,
-) : CrashDataStore {
-    private val appHasCrashedFlow = MutableStateFlow(appHasCrashed)
-    private val crashDataFlow = MutableStateFlow(crashData)
-
-    override fun setCrashData(crashData: String) {
-        crashDataFlow.value = crashData
-    }
-
-    override suspend fun resetAppHasCrashed() {
-        appHasCrashedFlow.value = false
-    }
-
-    override fun appHasCrashed(): Flow<Boolean> = appHasCrashedFlow
-
-    override fun crashInfo(): Flow<String> = crashDataFlow
-
-    override suspend fun reset() {
-        appHasCrashedFlow.value = false
-        crashDataFlow.value = ""
-    }
-}

appnav/src/test/kotlin/io/element/android/appnav/FakeRageShake.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.appnav
-
-import io.element.android.features.rageshake.rageshake.RageShake
-
-// TODO Remove this duplicated class when we will rework modules.
-class FakeRageShake(
-    private var isAvailableValue: Boolean = true
-) : RageShake {
-
-    private var interceptor: (() -> Unit)? = null
-
-    override fun isAvailable() = isAvailableValue
-
-    override fun start(sensitivity: Float) {
-    }
-
-    override fun stop() {
-    }
-
-    override fun setSensitivity(sensitivity: Float) {
-    }
-
-    override fun setInterceptor(interceptor: (() -> Unit)?) {
-        this.interceptor = interceptor
-    }
-
-    fun triggerPhoneRageshake() = interceptor?.invoke()
-}

appnav/src/test/kotlin/io/element/android/appnav/FakeRageshakeDataStore.kt

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.appnav
-
-import io.element.android.features.rageshake.rageshake.RageshakeDataStore
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-const val A_SENSITIVITY = 1f
-
-// TODO Remove this duplicated class when we will rework modules.
-class FakeRageshakeDataStore(
-    isEnabled: Boolean = true,
-    sensitivity: Float = A_SENSITIVITY,
-) : RageshakeDataStore {
-
-    private val isEnabledFlow = MutableStateFlow(isEnabled)
-    override fun isEnabled(): Flow<Boolean> = isEnabledFlow
-
-    override suspend fun setIsEnabled(isEnabled: Boolean) {
-        isEnabledFlow.value = isEnabled
-    }
-
-    private val sensitivityFlow = MutableStateFlow(sensitivity)
-    override fun sensitivity(): Flow<Float> = sensitivityFlow
-
-    override suspend fun setSensitivity(sensitivity: Float) {
-        sensitivityFlow.value = sensitivity
-    }
-
-    override suspend fun reset() = Unit
-}

appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt

@@ -24,9 +24,13 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appnav.root.RootEvents
 import io.element.android.appnav.root.RootPresenter
-import io.element.android.features.rageshake.crash.ui.CrashDetectionPresenter
+import io.element.android.features.rageshake.impl.crash.DefaultCrashDetectionPresenter
-import io.element.android.features.rageshake.detection.RageshakeDetectionPresenter
+import io.element.android.features.rageshake.impl.detection.DefaultRageshakeDetectionPresenter
-import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter
+import io.element.android.features.rageshake.impl.preferences.DefaultRageshakePreferencesPresenter
+import io.element.android.features.rageshake.test.crash.FakeCrashDataStore
+import io.element.android.features.rageshake.test.rageshake.FakeRageShake
+import io.element.android.features.rageshake.test.rageshake.FakeRageshakeDataStore
+import io.element.android.features.rageshake.test.screenshot.FakeScreenshotHolder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -63,13 +67,13 @@ class RootPresenterTest {
         val rageshakeDataStore = FakeRageshakeDataStore()
         val rageshake = FakeRageShake()
         val screenshotHolder = FakeScreenshotHolder()
-        val crashDetectionPresenter = CrashDetectionPresenter(
+        val crashDetectionPresenter = DefaultCrashDetectionPresenter(
             crashDataStore = crashDataStore
         )
-        val rageshakeDetectionPresenter = RageshakeDetectionPresenter(
+        val rageshakeDetectionPresenter = DefaultRageshakeDetectionPresenter(
             screenshotHolder = screenshotHolder,
             rageShake = rageshake,
-            preferencesPresenter = RageshakePreferencesPresenter(
+            preferencesPresenter = DefaultRageshakePreferencesPresenter(
                 rageshake = rageshake,
                 rageshakeDataStore = rageshakeDataStore,
             )

features/login/.gitignore

@@ -1 +0,0 @@
-/build

features/login/api/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.login
+plugins {
-
+    id("io.element.android-library")
-import org.junit.Assert.assertEquals
+}
-import org.junit.Test
+
-
+android {
-/**
+    namespace = "io.element.android.features.login.api"
- * Example local unit test, which will execute on the development machine (host).
+}
- *
+
- * See [testing documentation](http://d.android.com/tools/testing).
+dependencies {
- */
+    implementation(projects.libraries.architecture)
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
 }

features/login/impl/build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.login"
+    namespace = "io.element.android.features.login.impl"
 }
 
 anvil {
@@ -41,6 +41,7 @@ dependencies {
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
+    api(projects.features.login.api)
     ksp(libs.showkase.processor)
 
     testImplementation(libs.test.junit)

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerNode.kt

@@ -28,7 +28,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.login.util.LoginConstants
+import io.element.android.features.login.impl.util.LoginConstants
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.di.AppScope
 

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt

@@ -22,7 +22,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.features.login.util.LoginConstants
+import io.element.android.features.login.impl.util.LoginConstants
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.execute

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt

@@ -50,7 +50,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.login.R
+import io.element.android.features.login.impl.R
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootPresenter.kt

@@ -23,14 +23,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.features.login.util.LoginConstants
+import io.element.android.features.login.impl.util.LoginConstants
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -87,5 +85,4 @@ class LoginRootPresenter @Inject constructor(private val authenticationService:
     private fun updateFormState(formState: MutableState<LoginFormState>, updateLambda: LoginFormState.() -> LoginFormState) {
         formState.value = updateLambda(formState.value)
     }
-
 }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/LoginConstants.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.login.util
+package io.element.android.features.login.impl.util
 
 object LoginConstants {
 

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt

@@ -16,7 +16,7 @@
 
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package io.element.android.features.login.changeserver
+package io.element.android.features.login.impl.changeserver
 
 import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/root/LoginRootPresenterTest.kt

@@ -16,7 +16,7 @@
 
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package io.element.android.features.login.root
+package io.element.android.features.login.impl.root
 
 import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow

features/login/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.login
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.features.login.test", appContext.packageName)
-    }
-}

features/login/src/main/AndroidManifest.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2022 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest>
-
-</manifest>

features/logout/.gitignore

@@ -1 +0,0 @@
-/build

features/logout/api/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,16 @@
  * limitations under the License.
  */
 
-package io.element.android.features.login
+plugins {
-
+    id("io.element.android-compose-library")
-import org.junit.Assert.assertEquals
+}
-import org.junit.Test
+
-
+android {
-/**
+    namespace = "io.element.android.features.logout.api"
- * Example local unit test, which will execute on the development machine (host).
+}
- *
+
- * See [testing documentation](http://d.android.com/tools/testing).
+dependencies {
- */
+    implementation(projects.libraries.architecture)
-class ExampleUnitTest {
+    implementation(projects.libraries.designsystem)
-    @Test
+    implementation(projects.libraries.uiStrings)
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
 }

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceEvents.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+package io.element.android.features.logout.api
 
 sealed interface LogoutPreferenceEvents {
     object Logout : LogoutPreferenceEvents

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferencePresenter.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.logout.api
+
+import io.element.android.libraries.architecture.Presenter
+
+interface LogoutPreferencePresenter : Presenter<LogoutPreferenceState>

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceScreen.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+package io.element.android.features.logout.api
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Logout

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceState.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+package io.element.android.features.logout.api
 
 import io.element.android.libraries.architecture.Async
 

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceStateProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+package io.element.android.features.logout.api
 
 import io.element.android.libraries.architecture.Async
 

features/logout/impl/build.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.logout"
+    namespace = "io.element.android.features.logout.impl"
 }
 
 anvil {
@@ -33,12 +33,14 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
+    implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
+    api(projects.features.logout.api)
     ksp(libs.showkase.processor)
 
     testImplementation(libs.test.junit)

features/logout/impl/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2022 New Vector Ltd
+  ~ Copyright (c) 2023 New Vector Ltd
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,6 +15,6 @@
   ~ limitations under the License.
   -->
 
-<manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutPreferencePresenter.kt

@@ -14,23 +14,28 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+package io.element.android.features.logout.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.logout.api.LogoutPreferenceEvents
+import io.element.android.features.logout.api.LogoutPreferencePresenter
+import io.element.android.features.logout.api.LogoutPreferenceState
 import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.execute
+import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class LogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) :
+@ContributesBinding(SessionScope::class)
-    Presenter<LogoutPreferenceState> {
+class DefaultLogoutPreferencePresenter @Inject constructor(private val matrixClient: MatrixClient) :
+    LogoutPreferencePresenter {
 
     @Composable
     override fun present(): LogoutPreferenceState {

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPreferencePresenterTest.kt

@@ -16,12 +16,14 @@
 
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package io.element.android.features.logout
+package io.element.android.features.logout.impl
 
 import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.logout.api.LogoutPreferenceEvents
+import io.element.android.features.logout.api.LogoutPreferenceState
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
@@ -33,7 +35,7 @@ import org.junit.Test
 class LogoutPreferencePresenterTest {
     @Test
     fun `present - initial state`() = runTest {
-        val presenter = LogoutPreferencePresenter(
+        val presenter = DefaultLogoutPreferencePresenter(
             FakeMatrixClient(A_SESSION_ID),
         )
         moleculeFlow(RecompositionClock.Immediate) {
@@ -46,7 +48,7 @@ class LogoutPreferencePresenterTest {
 
     @Test
     fun `present - logout`() = runTest {
-        val presenter = LogoutPreferencePresenter(
+        val presenter = DefaultLogoutPreferencePresenter(
             FakeMatrixClient(A_SESSION_ID),
         )
         moleculeFlow(RecompositionClock.Immediate) {
@@ -64,7 +66,7 @@ class LogoutPreferencePresenterTest {
     @Test
     fun `present - logout with error`() = runTest {
         val matrixClient = FakeMatrixClient(A_SESSION_ID)
-        val presenter = LogoutPreferencePresenter(
+        val presenter = DefaultLogoutPreferencePresenter(
             matrixClient,
         )
         moleculeFlow(RecompositionClock.Immediate) {

features/logout/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.logout
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.features.login.test", appContext.packageName)
-    }
-}

features/logout/src/main/AndroidManifest.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2022 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest>
-
-</manifest>

features/messages/api/build.gradle.kts

@@ -17,7 +17,7 @@
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id("io.element.android-compose-library")
+    id("io.element.android-library")
 }
 
 android {

features/onboarding/.gitignore

@@ -1 +0,0 @@
-/build

features/onboarding/api/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,14 @@
  * limitations under the License.
  */
 
-package io.element.android.features.logout
+plugins {
-
+    id("io.element.android-library")
-import org.junit.Assert.assertEquals
+}
-import org.junit.Test
+
-
+android {
-/**
+    namespace = "io.element.android.features.onboarding.api"
- * Example local unit test, which will execute on the development machine (host).
+}
- *
+
- * See [testing documentation](http://d.android.com/tools/testing).
+dependencies {
- */
+    implementation(projects.libraries.architecture)
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
 }

features/onboarding/build.gradle.kts

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
-plugins {
-    id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "io.element.android.features.onboarding"
-}
-
-anvil {
-    generateDaggerFactories.set(true)
-}
-
-dependencies {
-    implementation(projects.libraries.core)
-    implementation(projects.libraries.elementresources)
-    implementation(projects.anvilannotations)
-    anvil(projects.anvilcodegen)
-    implementation(projects.libraries.uiStrings)
-    implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.architecture)
-    implementation(projects.libraries.testtags)
-    implementation(projects.libraries.androidutils)
-    implementation(libs.accompanist.pager)
-    implementation(libs.accompanist.pagerindicator)
-    testImplementation(libs.test.junit)
-    androidTestImplementation(libs.test.junitext)
-    ksp(libs.showkase.processor)
-}

features/onboarding/impl/build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.preferences"
+    namespace = "io.element.android.features.onboarding.impl"
 }
 
 anvil {
@@ -34,16 +34,17 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
-    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.architecture)
-    implementation(projects.features.rageshake)
+    implementation(projects.libraries.matrix.api)
-    implementation(projects.features.logout)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
+    implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
-    implementation(libs.datetime)
+    implementation(libs.accompanist.pager)
-    implementation(libs.accompanist.placeholder)
+    implementation(libs.accompanist.pagerindicator)
+    api(projects.features.onboarding.api)
+    ksp(libs.showkase.processor)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
@@ -53,5 +54,4 @@ dependencies {
     testImplementation(projects.libraries.matrix.test)
 
     androidTestImplementation(libs.test.junitext)
-    ksp(libs.showkase.processor)
 }

features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/SplashCarouselDataFactory.kt

@@ -17,7 +17,6 @@
 package io.element.android.features.onboarding.impl
 
 import androidx.annotation.DrawableRes
-import io.element.android.features.onboarding.R
 import io.element.android.libraries.ui.strings.R as StringR
 
 class SplashCarouselDataFactory {