[Architecture] split all feature modules to api/impl

features/preferences/.gitignore

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

features/preferences/api/build.gradle.kts

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.preferences.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+}

features/preferences/impl/build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.preferences"
+    namespace = "io.element.android.features.preferences.impl"
 }
 
 anvil {
@@ -34,16 +34,20 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
-    implementation(projects.libraries.matrixui)
-    implementation(projects.features.rageshake)
-    implementation(projects.features.logout)
+    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)
+    implementation(projects.features.rageshake.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.features.logout.api)
     implementation(libs.datetime)
     implementation(libs.accompanist.placeholder)
+    api(projects.features.preferences.api)
+    ksp(libs.showkase.processor)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
@@ -51,7 +55,9 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.features.rageshake.test)
+    testImplementation(projects.features.rageshake.impl)
+    testImplementation(projects.features.logout.impl)
 
     androidTestImplementation(libs.test.junitext)
-    ksp(libs.showkase.processor)
 }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt

@@ -30,13 +30,14 @@ class DefaultPreferencesEntryPoint @Inject constructor() : PreferencesEntryPoint
     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): PreferencesEntryPoint.NodeBuilder {
         return object : PreferencesEntryPoint.NodeBuilder {
             val plugins = ArrayList<Plugin>()
+
             override fun callback(callback: PreferencesEntryPoint.Callback): PreferencesEntryPoint.NodeBuilder {
                 plugins += callback
                 return this
             }
 
             override fun build(): Node {
-                return parentNode.createNode<PreferencesFlowNode>(buildContext)
+                return parentNode.createNode<PreferencesFlowNode>(buildContext, plugins)
             }
         }
     }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt

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

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt

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

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt

@@ -16,8 +16,8 @@
 
 package io.element.android.features.preferences.impl.root
 
-import io.element.android.features.logout.aLogoutPreferenceState
-import io.element.android.features.rageshake.preferences.aRageshakePreferencesState
+import io.element.android.features.logout.api.aLogoutPreferenceState
+import io.element.android.features.rageshake.api.preferences.aRageshakePreferencesState
 import io.element.android.libraries.architecture.Async
 
 fun aPreferencesRootState() = PreferencesRootState(

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt

@@ -21,9 +21,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import io.element.android.features.logout.LogoutPreferenceView
+import io.element.android.features.logout.api.LogoutPreferenceView
 import io.element.android.features.preferences.impl.user.UserPreferences
-import io.element.android.features.rageshake.preferences.RageshakePreferencesView
+import io.element.android.features.rageshake.api.preferences.RageshakePreferencesView
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.preferences.PreferenceView
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt

@@ -16,15 +16,16 @@
 
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package io.element.android.features.preferences.root
+package io.element.android.features.preferences.impl.root
 
 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.LogoutPreferencePresenter
-import io.element.android.features.preferences.impl.root.PreferencesRootPresenter
-import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter
+import io.element.android.features.logout.impl.DefaultLogoutPreferencePresenter
+import io.element.android.features.rageshake.impl.preferences.DefaultRageshakePreferencesPresenter
+import io.element.android.features.rageshake.test.rageshake.FakeRageShake
+import io.element.android.features.rageshake.test.rageshake.FakeRageshakeDataStore
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -34,8 +35,8 @@ import org.junit.Test
 class PreferencesRootPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
-        val logoutPresenter = LogoutPreferencePresenter(FakeMatrixClient())
-        val rageshakePresenter = RageshakePreferencesPresenter(FakeRageShake(), FakeRageshakeDataStore())
+        val logoutPresenter = DefaultLogoutPreferencePresenter(FakeMatrixClient())
+        val rageshakePresenter = DefaultRageshakePreferencesPresenter(FakeRageShake(), FakeRageshakeDataStore())
         val presenter = PreferencesRootPresenter(
             logoutPresenter, rageshakePresenter
         )

features/preferences/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.
-#
-# 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/preferences/src/androidTest/kotlin/io/element/android/features/preferences/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.preferences
-
-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.preferences.test", appContext.packageName)
-    }
-}

features/preferences/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/preferences/src/test/kotlin/io/element/android/features/preferences/root/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.features.preferences.root
-
-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()
-}

features/preferences/src/test/kotlin/io/element/android/features/preferences/root/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.features.preferences.root
-
-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
-}