From eb331a4dc34c0d6b7ad8b92b9f7c2f33431307d6 Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Wed, 9 Oct 2024 15:32:26 +0200 Subject: [PATCH] Clean code --- FileTypes/build.gradle.kts | 3 --- FileTypes/src/main/AndroidManifest.xml | 4 ---- app/src/main/AndroidManifest.xml | 1 - .../swisstransfer/ui/screen/main/sent/SentListScreen.kt | 2 +- .../infomaniak/swisstransfer/ui/utils/FileUiItemExt.kt | 1 + gradle/libs.versions.toml | 8 +++++++- 6 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 FileTypes/src/main/AndroidManifest.xml diff --git a/FileTypes/build.gradle.kts b/FileTypes/build.gradle.kts index 04f540227..a5e855d04 100644 --- a/FileTypes/build.gradle.kts +++ b/FileTypes/build.gradle.kts @@ -42,10 +42,7 @@ dependencies { implementation(libs.androidx.ui.android) implementation(libs.androidx.foundation.android) implementation(libs.androidx.ui.tooling.preview.android) - // implementation(libs.androidx.appcompat) - // implementation(libs.material) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) debugImplementation(libs.androidx.ui.tooling) - // androidTestImplementation(libs.androidx.espresso.core) } diff --git a/FileTypes/src/main/AndroidManifest.xml b/FileTypes/src/main/AndroidManifest.xml deleted file mode 100644 index 8bdb7e14b..000000000 --- a/FileTypes/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 986f30184..9173a6796 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,6 @@ xmlns:tools="http://schemas.android.com/tools"> - ) { override val uid: String = fileName override val fileSizeInBytes: Long = 456782 override val mimeType: String? = null - override val uri: String = "httttttps://picsum.photos/200/300" + override val uri: String = "https://picsum.photos/200/300" } items(3) { diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/FileUiItemExt.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/FileUiItemExt.kt index 82c06ff86..e78f6ccb3 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/FileUiItemExt.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/FileUiItemExt.kt @@ -21,4 +21,5 @@ import com.infomaniak.library.filetypes.FileType import com.infomaniak.swisstransfer.ui.components.FileUiItem val FileUiItem.fileType: FileType get() = mimeType?.let { FileType.guessFromMimeType(it) } ?: FileType.guessFromFileName(fileName) + val FileUiItem.hasPreview: Boolean get() = fileType == FileType.IMAGE diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9c3eef4da..dde5b1b30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,9 @@ lifecycleRuntimeKtx = "2.8.6" navigation = "2.8.1" serialization = "1.7.1" swisstransfer = "0.1.1" -uiAndroid = "1.7.2" + +# FileType module +uiAndroid = "1.7.3" foundationAndroid = "1.7.3" uiToolingPreviewAndroid = "1.7.3" uiTooling = "1.7.3" @@ -47,6 +49,8 @@ swisstransfer-core = { module = "com.github.Infomaniak.multiplatform-SwissTransf # Tests androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } junit = { group = "junit", name = "junit", version.ref = "junit" } + +# FileType module androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" } androidx-foundation-android = { group = "androidx.compose.foundation", name = "foundation-android", version.ref = "foundationAndroid" } androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" } @@ -58,4 +62,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = " hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } + +# FileType module android-library = { id = "com.android.library", version.ref = "agp" }