From a226580c8cf90ce37aed77f68e93ee5ebfa93b55 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2023 11:14:53 +0200 Subject: [PATCH] Move FileSizeFormatter to module :libraries:androidutils --- features/messages/impl/build.gradle.kts | 2 - .../media/local/AndroidLocalMediaFactory.kt | 2 +- .../TimelineItemContentMessageFactory.kt | 2 +- .../messages/fixtures/timelineItemsFactory.kt | 2 +- features/preferences/impl/build.gradle.kts | 1 - .../impl/tasks/ComputeCacheSizeUseCase.kt | 2 +- libraries/androidtools/api/build.gradle.kts | 23 ---------- libraries/androidtools/impl/build.gradle.kts | 42 ------------------- libraries/androidtools/test/build.gradle.kts | 27 ------------ .../filesize}/AndroidFileSizeFormatter.kt | 3 +- .../filesize}/FakeFileSizeFormatter.kt | 4 +- .../filesize}/FileSizeFormatter.kt | 2 +- .../kotlin/extension/DependencyHandleScope.kt | 1 - 13 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 libraries/androidtools/api/build.gradle.kts delete mode 100644 libraries/androidtools/impl/build.gradle.kts delete mode 100644 libraries/androidtools/test/build.gradle.kts rename libraries/{androidtools/impl/src/main/kotlin/io/element/android/libraries/androidtools/impl => androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize}/AndroidFileSizeFormatter.kt (93%) rename libraries/{androidtools/test/src/main/kotlin/io/element/android/libraries/androidtools/test => androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize}/FakeFileSizeFormatter.kt (85%) rename libraries/{androidtools/api/src/main/kotlin/io/element/android/libraries/androidtools/api => androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize}/FileSizeFormatter.kt (93%) diff --git a/features/messages/impl/build.gradle.kts b/features/messages/impl/build.gradle.kts index 882c226b6b..f8377733a6 100644 --- a/features/messages/impl/build.gradle.kts +++ b/features/messages/impl/build.gradle.kts @@ -34,7 +34,6 @@ dependencies { anvil(projects.anvilcodegen) api(projects.features.messages.api) implementation(projects.libraries.androidutils) - api(projects.libraries.androidtools.api) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix.api) @@ -65,7 +64,6 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.androidtools.test) testImplementation(projects.libraries.matrix.test) testImplementation(projects.libraries.dateformatter.test) testImplementation(projects.features.networkmonitor.test) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/AndroidLocalMediaFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/AndroidLocalMediaFactory.kt index c231825524..ff2f8aaeeb 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/AndroidLocalMediaFactory.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/local/AndroidLocalMediaFactory.kt @@ -21,7 +21,7 @@ import android.net.Uri import androidx.core.net.toUri import com.squareup.anvil.annotations.ContributesBinding import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractor -import io.element.android.libraries.androidtools.api.FileSizeFormatter +import io.element.android.libraries.androidutils.filesize.FileSizeFormatter import io.element.android.libraries.androidutils.file.getFileName import io.element.android.libraries.androidutils.file.getFileSize import io.element.android.libraries.androidutils.file.getMimeType diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt index db5ee8190e..d9a12cf615 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt @@ -26,7 +26,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractor import io.element.android.features.messages.impl.timeline.util.toHtmlDocument -import io.element.android.libraries.androidtools.api.FileSizeFormatter +import io.element.android.libraries.androidutils.filesize.FileSizeFormatter import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt index 6e2bf33477..41daff47fd 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt @@ -32,7 +32,7 @@ import io.element.android.features.messages.impl.timeline.factories.virtual.Time import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemVirtualFactory import io.element.android.features.messages.impl.timeline.groups.TimelineItemGrouper import io.element.android.features.messages.impl.timeline.util.FileExtensionExtractorWithoutValidation -import io.element.android.libraries.androidtools.test.FakeFileSizeFormatter +import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter import io.element.android.libraries.eventformatter.api.TimelineEventFormatter import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts index e8fa540f6c..1e76ee5c93 100644 --- a/features/preferences/impl/build.gradle.kts +++ b/features/preferences/impl/build.gradle.kts @@ -33,7 +33,6 @@ dependencies { implementation(projects.anvilannotations) anvil(projects.anvilcodegen) implementation(projects.libraries.androidutils) - api(projects.libraries.androidtools.api) implementation(projects.libraries.core) implementation(projects.libraries.architecture) implementation(projects.libraries.matrix.api) diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt index 038694201b..661f6493ec 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt @@ -18,7 +18,7 @@ package io.element.android.features.preferences.impl.tasks import android.content.Context import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.libraries.androidtools.api.FileSizeFormatter +import io.element.android.libraries.androidutils.filesize.FileSizeFormatter import io.element.android.libraries.androidutils.file.getSizeOfFiles import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.di.ApplicationContext diff --git a/libraries/androidtools/api/build.gradle.kts b/libraries/androidtools/api/build.gradle.kts deleted file mode 100644 index aeaec3ad30..0000000000 --- a/libraries/androidtools/api/build.gradle.kts +++ /dev/null @@ -1,23 +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. - */ - -plugins { - id("io.element.android-library") -} - -android { - namespace = "io.element.android.libraries.androidtools.api" -} diff --git a/libraries/androidtools/impl/build.gradle.kts b/libraries/androidtools/impl/build.gradle.kts deleted file mode 100644 index 5b3b85036f..0000000000 --- a/libraries/androidtools/impl/build.gradle.kts +++ /dev/null @@ -1,42 +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. - */ - -plugins { - id("io.element.android-library") - alias(libs.plugins.ksp) - alias(libs.plugins.anvil) -} - -anvil { - generateDaggerFactories.set(true) -} - -android { - namespace = "io.element.android.libraries.androidtools.impl" - - dependencies { - anvil(projects.anvilcodegen) - implementation(libs.dagger) - implementation(projects.libraries.di) - implementation(projects.anvilannotations) - - api(projects.libraries.androidtools.api) - - testImplementation(libs.test.junit) - testImplementation(libs.test.truth) - testImplementation(projects.libraries.androidtools.test) - } -} diff --git a/libraries/androidtools/test/build.gradle.kts b/libraries/androidtools/test/build.gradle.kts deleted file mode 100644 index 8e045d6e01..0000000000 --- a/libraries/androidtools/test/build.gradle.kts +++ /dev/null @@ -1,27 +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. - */ - -plugins { - id("io.element.android-library") -} - -android { - namespace = "io.element.android.libraries.androidtools.test" - - dependencies { - api(projects.libraries.androidtools.api) - } -} diff --git a/libraries/androidtools/impl/src/main/kotlin/io/element/android/libraries/androidtools/impl/AndroidFileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt similarity index 93% rename from libraries/androidtools/impl/src/main/kotlin/io/element/android/libraries/androidtools/impl/AndroidFileSizeFormatter.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt index f31151e15c..9cd70febcc 100644 --- a/libraries/androidtools/impl/src/main/kotlin/io/element/android/libraries/androidtools/impl/AndroidFileSizeFormatter.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt @@ -14,13 +14,12 @@ * limitations under the License. */ -package io.element.android.libraries.androidtools.impl +package io.element.android.libraries.androidutils.filesize import android.content.Context import android.os.Build import android.text.format.Formatter import com.squareup.anvil.annotations.ContributesBinding -import io.element.android.libraries.androidtools.api.FileSizeFormatter import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject diff --git a/libraries/androidtools/test/src/main/kotlin/io/element/android/libraries/androidtools/test/FakeFileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt similarity index 85% rename from libraries/androidtools/test/src/main/kotlin/io/element/android/libraries/androidtools/test/FakeFileSizeFormatter.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt index 183a78eaf1..32c0239428 100644 --- a/libraries/androidtools/test/src/main/kotlin/io/element/android/libraries/androidtools/test/FakeFileSizeFormatter.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt @@ -14,9 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.androidtools.test - -import io.element.android.libraries.androidtools.api.FileSizeFormatter +package io.element.android.libraries.androidutils.filesize class FakeFileSizeFormatter : FileSizeFormatter { override fun format(fileSize: Long, useShortFormat: Boolean): String { diff --git a/libraries/androidtools/api/src/main/kotlin/io/element/android/libraries/androidtools/api/FileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt similarity index 93% rename from libraries/androidtools/api/src/main/kotlin/io/element/android/libraries/androidtools/api/FileSizeFormatter.kt rename to libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt index 261b7cbecc..7be38bf9bd 100644 --- a/libraries/androidtools/api/src/main/kotlin/io/element/android/libraries/androidtools/api/FileSizeFormatter.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.androidtools.api +package io.element.android.libraries.androidutils.filesize interface FileSizeFormatter { /** diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index 47bdabcbcd..88f499b993 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -77,7 +77,6 @@ private fun DependencyHandlerScope.addImplementationProjects( fun DependencyHandlerScope.allLibrariesImpl() { implementation(project(":libraries:androidutils")) implementation(project(":libraries:deeplink")) - implementation(project(":libraries:androidtools:impl")) implementation(project(":libraries:designsystem")) implementation(project(":libraries:matrix:impl")) implementation(project(":libraries:matrixui"))