[Architecture] split all feature modules to api/impl

features/roomlist/.gitignore

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

features/roomlist/api/build.gradle.kts

@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package io.element.android.features.roomlist
-
-import io.element.android.libraries.dateformatter.api.LastMessageFormatter
-
-class FakeLastMessageFormatter : LastMessageFormatter {
-    private var format = ""
-    fun givenFormat(format: String) {
-        this.format = format
-    }
-
-    override fun format(timestamp: Long?): String {
-        return format
-    }
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.roomlist.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
 }

features/roomlist/impl/build.gradle.kts

@@ -20,10 +20,11 @@ plugins {
     id("io.element.android-compose-library")
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
+    id("kotlin-parcelize")
 }
 
 android {
-    namespace = "io.element.android.features.roomlist"
+    namespace = "io.element.android.features.roomlist.impl"
 }
 
 anvil {
@@ -31,18 +32,20 @@ anvil {
 }
 
 dependencies {
-    anvil(projects.anvilcodegen)
     implementation(projects.anvilannotations)
-
+    anvil(projects.anvilcodegen)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
+    implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.dateformatter.api)
     implementation(libs.accompanist.placeholder)
+    api(projects.features.roomlist.api)
+    ksp(libs.showkase.processor)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
@@ -50,9 +53,7 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
-    implementation(projects.libraries.dateformatter.test)
+    testImplementation(projects.libraries.dateformatter.test)
 
     androidTestImplementation(libs.test.junitext)
-
-    ksp(libs.showkase.processor)
 }

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -14,31 +14,19 @@
  * limitations under the License.
  */
 
-@file:OptIn(ExperimentalCoroutinesApi::class)
-
-package io.element.android.features.roomlist
+package io.element.android.features.roomlist.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.roomlist.impl.RoomListEvents
-import io.element.android.features.roomlist.impl.RoomListPresenter
+import com.google.common.truth.Truth
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.dateformatter.api.LastMessageFormatter
+import io.element.android.libraries.dateformatter.test.FakeLastMessageFormatter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.matrix.test.AN_AVATAR_URL
-import io.element.android.libraries.matrix.test.AN_EXCEPTION
-import io.element.android.libraries.matrix.test.A_MESSAGE
-import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
-import io.element.android.libraries.matrix.test.A_SESSION_ID
-import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.A_USER_NAME
-import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.*
 import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
 import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -54,13 +42,13 @@ class RoomListPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(initialState.matrixUser).isNull()
+            Truth.assertThat(initialState.matrixUser).isNull()
             val withUserState = awaitItem()
-            assertThat(withUserState.matrixUser).isNotNull()
-            assertThat(withUserState.matrixUser!!.id).isEqualTo(A_USER_ID)
-            assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_NAME)
-            assertThat(withUserState.matrixUser!!.avatarData.name).isEqualTo(A_USER_NAME)
-            assertThat(withUserState.matrixUser!!.avatarData.url).isEqualTo(AN_AVATAR_URL)
+            Truth.assertThat(withUserState.matrixUser).isNotNull()
+            Truth.assertThat(withUserState.matrixUser!!.id).isEqualTo(A_USER_ID)
+            Truth.assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_NAME)
+            Truth.assertThat(withUserState.matrixUser!!.avatarData.name).isEqualTo(A_USER_NAME)
+            Truth.assertThat(withUserState.matrixUser!!.avatarData.url).isEqualTo(AN_AVATAR_URL)
         }
     }
 
@@ -78,11 +66,11 @@ class RoomListPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(initialState.matrixUser).isNull()
+            Truth.assertThat(initialState.matrixUser).isNull()
             val withUserState = awaitItem()
-            assertThat(withUserState.matrixUser).isNotNull()
+            Truth.assertThat(withUserState.matrixUser).isNotNull()
             // username fallback to user id value
-            assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_ID.value)
+            Truth.assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_ID.value)
         }
     }
 
@@ -97,10 +85,10 @@ class RoomListPresenterTests {
         }.test {
             skipItems(1)
             val withUserState = awaitItem()
-            assertThat(withUserState.filter).isEqualTo("")
+            Truth.assertThat(withUserState.filter).isEqualTo("")
             withUserState.eventSink.invoke(RoomListEvents.UpdateFilter("t"))
             val withFilterState = awaitItem()
-            assertThat(withFilterState.filter).isEqualTo("t")
+            Truth.assertThat(withFilterState.filter).isEqualTo("t")
         }
     }
 
@@ -120,13 +108,14 @@ class RoomListPresenterTests {
             skipItems(1)
             val withUserState = awaitItem()
             // Room list is loaded with 16 placeholders
-            assertThat(withUserState.roomList.size).isEqualTo(16)
-            assertThat(withUserState.roomList.all { it.isPlaceholder }).isTrue()
+            Truth.assertThat(withUserState.roomList.size).isEqualTo(16)
+            Truth.assertThat(withUserState.roomList.all { it.isPlaceholder }).isTrue()
             roomSummaryDataSource.postRoomSummary(listOf(aRoomSummaryFilled()))
             skipItems(1)
             val withRoomState = awaitItem()
-            assertThat(withRoomState.roomList.size).isEqualTo(1)
-            assertThat(withRoomState.roomList.first()).isEqualTo(aRoomListRoomSummary)
+            Truth.assertThat(withRoomState.roomList.size).isEqualTo(1)
+            Truth.assertThat(withRoomState.roomList.first())
+                .isEqualTo(aRoomListRoomSummary)
         }
     }
 
@@ -149,15 +138,16 @@ class RoomListPresenterTests {
             // Test filtering with result
             loadedState.eventSink.invoke(RoomListEvents.UpdateFilter(A_ROOM_NAME.substring(0, 3)))
             val withNotFilteredRoomState = awaitItem()
-            assertThat(withNotFilteredRoomState.filter).isEqualTo(A_ROOM_NAME.substring(0, 3))
-            assertThat(withNotFilteredRoomState.roomList.size).isEqualTo(1)
-            assertThat(withNotFilteredRoomState.roomList.first()).isEqualTo(aRoomListRoomSummary)
+            Truth.assertThat(withNotFilteredRoomState.filter).isEqualTo(A_ROOM_NAME.substring(0, 3))
+            Truth.assertThat(withNotFilteredRoomState.roomList.size).isEqualTo(1)
+            Truth.assertThat(withNotFilteredRoomState.roomList.first())
+                .isEqualTo(aRoomListRoomSummary)
             // Test filtering without result
             withNotFilteredRoomState.eventSink.invoke(RoomListEvents.UpdateFilter("tada"))
             skipItems(1) // Filter update
             val withFilteredRoomState = awaitItem()
-            assertThat(withFilteredRoomState.filter).isEqualTo("tada")
-            assertThat(withFilteredRoomState.roomList).isEmpty()
+            Truth.assertThat(withFilteredRoomState.filter).isEqualTo("tada")
+            Truth.assertThat(withFilteredRoomState.roomList).isEmpty()
         }
     }
 
@@ -178,23 +168,29 @@ class RoomListPresenterTests {
             skipItems(3)
             val loadedState = awaitItem()
             // check initial value
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isNull()
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange).isNull()
             // Test empty range
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(1, 0)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isNull()
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange).isNull()
             // Update visible range and check that range is transmitted to the SDK after computation
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(0, 0)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(0, 20))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(0, 20))
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(0, 1)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(0, 21))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(0, 21))
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(19, 29)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(0, 49))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(0, 49))
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(49, 59)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(29, 79))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(29, 79))
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(149, 159)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(129, 179))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(129, 179))
             loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(149, 259)))
-            assertThat(roomSummaryDataSource.latestSlidingSyncRange).isEqualTo(IntRange(129, 279))
+            Truth.assertThat(roomSummaryDataSource.latestSlidingSyncRange)
+                .isEqualTo(IntRange(129, 279))
         }
     }
 
@@ -217,3 +213,4 @@ private val aRoomListRoomSummary = RoomListRoomSummary(
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME),
     isPlaceholder = false,
 )
+

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

features/roomlist/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>