diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt index 1ef1d8825..97d2cf937 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BottomSheetItem.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Camera +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Camera import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt index 4b2e4dca8..f39c25c20 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/BrandTobAppBar.kt @@ -28,9 +28,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.illu.LogoInfomaniak -import com.infomaniak.swisstransfer.ui.icons.illu.LogoSwissTransfer +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus +import com.infomaniak.swisstransfer.ui.images.illus.LogoInfomaniak +import com.infomaniak.swisstransfer.ui.images.illus.LogoSwissTransfer import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewMobile @@ -46,11 +46,11 @@ fun BrandTobAppBar() { ), title = { Row(verticalAlignment = Alignment.CenterVertically) { - Image(imageVector = AppIcons.Illu.LogoInfomaniak, contentDescription = null) + Image(imageVector = AppIllus.LogoInfomaniak, contentDescription = null) Spacer(modifier = Modifier.width(Margin.Medium)) VerticalDivider(modifier = Modifier.height(Margin.Large), color = SwissTransferTheme.colors.toolbarTextColor) Spacer(modifier = Modifier.width(Margin.Medium)) - Image(imageVector = AppIcons.Illu.LogoSwissTransfer, contentDescription = null) + Image(imageVector = AppIllus.LogoSwissTransfer, contentDescription = null) Spacer(modifier = Modifier.width(Margin.Small)) Text(text = stringResource(id = R.string.appName), color = SwissTransferTheme.colors.toolbarTextColor) } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt index 47ae442c4..0afd43465 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt @@ -30,8 +30,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.Shapes import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt index c4a5b84b7..85ce4a0e2 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.illu.ArrowCurvedDownright +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus +import com.infomaniak.swisstransfer.ui.images.illus.ArrowCurvedDownright import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @@ -115,7 +115,7 @@ private fun BottomSheetDefaultsPreview() { SwissTransferTheme { Surface { BottomSheetContent( - imageVector = AppIcons.Illu.ArrowCurvedDownright, + imageVector = AppIllus.ArrowCurvedDownright, titleRes = R.string.appName, descriptionRes = R.string.sentEmptyTitle, content = { diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferFab.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferFab.kt index 640a7b983..c04aee1b0 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferFab.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferFab.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.Shapes import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt index b68724218..228e47bad 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferTobAppBar.kt @@ -24,10 +24,10 @@ import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add -import com.infomaniak.swisstransfer.ui.icons.app.ArrowLeft -import com.infomaniak.swisstransfer.ui.icons.app.Cross +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add +import com.infomaniak.swisstransfer.ui.images.icons.ArrowLeft +import com.infomaniak.swisstransfer.ui.images.icons.Cross import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewMobile import com.infomaniak.swisstransfer.ui.utils.PreviewTablet diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/AppIcons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/AppImages.kt similarity index 88% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/AppIcons.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/AppImages.kt index c7177cf56..13c182f29 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/AppIcons.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/AppImages.kt @@ -15,12 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.icons +package com.infomaniak.swisstransfer.ui.images import androidx.compose.ui.unit.dp -object AppIcons { - object Illu +object AppImages { + object AppIcons + object AppIllus val previewSize = 250.dp } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Add.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Add.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Add.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Add.kt index cceaa9fbc..4ab332f7d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Add.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Add.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -16,7 +16,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.Add: ImageVector get() { @@ -59,7 +60,7 @@ private fun Preview() { Image( imageVector = AppIcons.Add, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowDownCircle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowDownCircle.kt similarity index 93% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowDownCircle.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowDownCircle.kt index 74c2e55df..1aeafde5f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowDownCircle.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowDownCircle.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -34,7 +34,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.ArrowDownCircle: ImageVector get() { @@ -93,7 +94,7 @@ private fun Preview() { Image( imageVector = AppIcons.ArrowDownCircle, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowLeft.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowLeft.kt similarity index 88% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowLeft.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowLeft.kt index bdd2d452e..79e8df659 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowLeft.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowLeft.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,7 +15,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.ArrowLeft: ImageVector get() { @@ -58,7 +59,7 @@ private fun Preview() { Image( imageVector = AppIcons.ArrowLeft, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowUpCircle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowUpCircle.kt similarity index 93% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowUpCircle.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowUpCircle.kt index 9b3dcfea9..e5d5b5479 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ArrowUpCircle.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ArrowUpCircle.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -34,7 +34,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.ArrowUpCircle: ImageVector get() { @@ -93,7 +94,7 @@ private fun Preview() { Image( imageVector = AppIcons.ArrowUpCircle, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Bell.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Bell.kt similarity index 91% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Bell.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Bell.kt index 9c6a695ff..9b6ec689f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Bell.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Bell.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,7 +13,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -66,7 +67,7 @@ private fun Preview() { Image( imageVector = AppIcons.Bell, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackAndWhiteCircle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackAndWhiteCircle.kt similarity index 94% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackAndWhiteCircle.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackAndWhiteCircle.kt index 2bb168051..73997abae 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackAndWhiteCircle.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackAndWhiteCircle.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -17,7 +17,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.BlackAndWhiteCircle: ImageVector get() { @@ -100,7 +101,7 @@ private fun Preview() { Image( imageVector = AppIcons.BlackAndWhiteCircle, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackCircle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackCircle.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackCircle.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackCircle.kt index dd723def1..6432de696 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/BlackCircle.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/BlackCircle.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,7 +15,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.BlackCircle: ImageVector get() { @@ -60,7 +61,7 @@ private fun Preview() { Image( imageVector = AppIcons.BlackCircle, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Camera.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Camera.kt similarity index 95% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Camera.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Camera.kt index 4b56f89e3..5c89edc5c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Camera.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Camera.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,7 +15,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.Camera: ImageVector get() { @@ -116,7 +117,7 @@ private fun Preview() { Image( imageVector = AppIcons.Camera, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Checkmark.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Checkmark.kt similarity index 88% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Checkmark.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Checkmark.kt index 3c3224553..2097980f9 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Checkmark.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Checkmark.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,7 +13,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -56,7 +57,7 @@ private fun Preview() { Image( imageVector = AppIcons.Checkmark, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ChevronRightSmall.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ChevronRightSmall.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ChevronRightSmall.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ChevronRightSmall.kt index db0d681dc..dee0fa083 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/ChevronRightSmall.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/ChevronRightSmall.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,7 +13,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -58,7 +59,7 @@ private fun Preview() { Image( imageVector = AppIcons.ChevronRightSmall, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Clock.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Clock.kt similarity index 90% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Clock.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Clock.kt index 701aef606..fe0892145 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Clock.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Clock.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -63,7 +64,7 @@ private fun Preview() { Image( imageVector = AppIcons.Clock, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Cross.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Cross.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Cross.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Cross.kt index 28f509637..287ce2c7c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Cross.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Cross.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -60,7 +61,7 @@ private fun Preview() { Image( imageVector = AppIcons.Cross, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/FileBadgeArrowDown.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/FileBadgeArrowDown.kt similarity index 93% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/FileBadgeArrowDown.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/FileBadgeArrowDown.kt index 9c316aa20..d9095cc42 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/FileBadgeArrowDown.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/FileBadgeArrowDown.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -85,7 +86,7 @@ private fun Preview() { Image( imageVector = AppIcons.FileBadgeArrowDown, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Folder.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Folder.kt similarity index 90% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Folder.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Folder.kt index 5bb27a9ca..2318f1a72 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Folder.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Folder.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,7 +15,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.Folder: ImageVector get() { @@ -65,7 +66,7 @@ private fun Preview() { Image( imageVector = AppIcons.Folder, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/OpenOutside.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/OpenOutside.kt similarity index 91% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/OpenOutside.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/OpenOutside.kt index c767a100f..97d76c237 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/OpenOutside.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/OpenOutside.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -69,7 +70,7 @@ private fun Preview() { Image( imageVector = AppIcons.OpenOutside, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PaintbrushPalette.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PaintbrushPalette.kt similarity index 93% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PaintbrushPalette.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PaintbrushPalette.kt index a3574b57b..ea81b1c01 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PaintbrushPalette.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PaintbrushPalette.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -92,7 +93,7 @@ private fun Preview() { Image( imageVector = AppIcons.PaintbrushPalette, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PolaroidLandscape.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PolaroidLandscape.kt similarity index 93% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PolaroidLandscape.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PolaroidLandscape.kt index d1336169e..c14cc6aa2 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/PolaroidLandscape.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/PolaroidLandscape.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -16,7 +16,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.PolaroidLandscape: ImageVector get() { @@ -89,7 +90,7 @@ private fun Preview() { Image( imageVector = AppIcons.PolaroidLandscape, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Settings.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Settings.kt similarity index 95% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Settings.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Settings.kt index 66c0612e6..26020a8ec 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/Settings.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Settings.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -33,7 +33,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.Settings: ImageVector get() { @@ -115,7 +116,7 @@ private fun Preview() { Image( imageVector = AppIcons.Settings, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/SpeechBubble.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/SpeechBubble.kt similarity index 92% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/SpeechBubble.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/SpeechBubble.kt index 5484eedae..e7d822ec0 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/SpeechBubble.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/SpeechBubble.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -14,7 +14,8 @@ import androidx.compose.ui.graphics.vector.group import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound @@ -72,7 +73,7 @@ private fun Preview() { Image( imageVector = AppIcons.SpeechBubble, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/WhiteCircle.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/WhiteCircle.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/WhiteCircle.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/WhiteCircle.kt index 609183f25..b455f2b8a 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/app/WhiteCircle.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/WhiteCircle.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.app +package com.infomaniak.swisstransfer.ui.images.icons import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,7 +15,8 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons val AppIcons.WhiteCircle: ImageVector get() { @@ -59,7 +60,7 @@ private fun Preview() { Image( imageVector = AppIcons.WhiteCircle, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ArrowCurvedDownright.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowCurvedDownright.kt similarity index 92% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ArrowCurvedDownright.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowCurvedDownright.kt index 25f40cf02..5b4f9a135 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ArrowCurvedDownright.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowCurvedDownright.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -33,10 +33,10 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.AppIcons.previewSize +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus +import com.infomaniak.swisstransfer.ui.images.AppImages.previewSize -val AppIcons.Illu.ArrowCurvedDownright: ImageVector +val AppIllus.ArrowCurvedDownright: ImageVector get() { if (_arrowcurveddownright != null) return _arrowcurveddownright!! @@ -82,7 +82,7 @@ private var _arrowcurveddownright: ImageVector? = null private fun Preview() { Box(modifier = Modifier.background(Color.White)) { Image( - imageVector = AppIcons.Illu.ArrowCurvedDownright, + imageVector = AppIllus.ArrowCurvedDownright, contentDescription = null, modifier = Modifier.size(previewSize), ) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ChainTilted.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ChainTilted.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ChainTilted.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ChainTilted.kt index af0aad374..9a2514ab9 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ChainTilted.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ChainTilted.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,11 +13,12 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound -val AppIcons.Illu.ChainTilted: ImageVector +val AppIllus.ChainTilted: ImageVector get() { if (_chainTilted != null) return _chainTilted!! @@ -71,9 +72,9 @@ private var _chainTilted: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.ChainTilted, + imageVector = AppIllus.ChainTilted, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnvelopeTilted.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/EnvelopeTilted.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnvelopeTilted.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/EnvelopeTilted.kt index 082efd0ab..d9f843d8f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnvelopeTilted.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/EnvelopeTilted.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,11 +13,12 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound -val AppIcons.Illu.EnvelopeTilted: ImageVector +val AppIllus.EnvelopeTilted: ImageVector get() { if (_envelopeTilted != null) return _envelopeTilted!! @@ -73,9 +74,9 @@ private var _envelopeTilted: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.EnvelopeTilted, + imageVector = AppIllus.EnvelopeTilted, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoInfomaniak.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt similarity index 97% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoInfomaniak.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt index a1cb485bb..a24a99eaf 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoInfomaniak.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,9 +15,10 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus -val AppIcons.Illu.LogoInfomaniak: ImageVector +val AppIllus.LogoInfomaniak: ImageVector get() { if (_logoInfomaniak != null) return _logoInfomaniak!! @@ -268,9 +269,9 @@ private var _logoInfomaniak: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.LogoInfomaniak, + imageVector = AppIllus.LogoInfomaniak, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoSwissTransfer.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoSwissTransfer.kt similarity index 94% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoSwissTransfer.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoSwissTransfer.kt index 11d991b42..6fdbe6b0c 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/LogoSwissTransfer.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoSwissTransfer.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -16,9 +16,10 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus -val AppIcons.Illu.LogoSwissTransfer: ImageVector +val AppIllus.LogoSwissTransfer: ImageVector get() { if (_logoSwissTransfer != null) return _logoSwissTransfer!! @@ -149,9 +150,9 @@ private var _logoSwissTransfer: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.LogoSwissTransfer, + imageVector = AppIllus.LogoSwissTransfer, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/QrCodeTilted.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/QrCodeTilted.kt similarity index 89% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/QrCodeTilted.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/QrCodeTilted.kt index 11485d03c..4a70607d9 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/QrCodeTilted.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/QrCodeTilted.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,11 +13,12 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound -val AppIcons.Illu.QrCodeTilted: ImageVector +val AppIllus.QrCodeTilted: ImageVector get() { if (_qrCodeTilted != null) return _qrCodeTilted!! @@ -76,9 +77,9 @@ private var _qrCodeTilted: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.QrCodeTilted, + imageVector = AppIllus.QrCodeTilted, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/WaveSignalTilted.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/WaveSignalTilted.kt similarity index 86% rename from app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/WaveSignalTilted.kt rename to app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/WaveSignalTilted.kt index 716252b1f..bb7b667a7 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/WaveSignalTilted.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/WaveSignalTilted.kt @@ -1,4 +1,4 @@ -package com.infomaniak.swisstransfer.ui.icons.illu +package com.infomaniak.swisstransfer.ui.images.illus import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -13,11 +13,12 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.infomaniak.swisstransfer.ui.icons.AppIcons +import com.infomaniak.swisstransfer.ui.images.AppImages +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound -val AppIcons.Illu.WaveSignalTilted: ImageVector +val AppIllus.WaveSignalTilted: ImageVector get() { if (_waveSignalTilted != null) return _waveSignalTilted!! @@ -57,9 +58,9 @@ private var _waveSignalTilted: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIcons.Illu.WaveSignalTilted, + imageVector = AppIllus.WaveSignalTilted, contentDescription = null, - modifier = Modifier.size(AppIcons.previewSize), + modifier = Modifier.size(AppImages.previewSize), ) } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationItem.kt index 6bd53d3e0..c3b9358ac 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationItem.kt @@ -22,10 +22,10 @@ import androidx.compose.material3.BottomAppBar import androidx.compose.material3.NavigationRail import androidx.compose.ui.graphics.vector.ImageVector import com.infomaniak.swisstransfer.R -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.ArrowDownCircle -import com.infomaniak.swisstransfer.ui.icons.app.ArrowUpCircle -import com.infomaniak.swisstransfer.ui.icons.app.Settings +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.ArrowDownCircle +import com.infomaniak.swisstransfer.ui.images.icons.ArrowUpCircle +import com.infomaniak.swisstransfer.ui.images.icons.Settings import com.infomaniak.swisstransfer.ui.navigation.MainNavigation.* /** diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt index 6d060cc06..d2f3d0f4f 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/sent/SentScreen.kt @@ -36,8 +36,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.NewTransferFab import com.infomaniak.swisstransfer.ui.components.NewTransferFabType -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.illu.ArrowCurvedDownright +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus +import com.infomaniak.swisstransfer.ui.images.illus.ArrowCurvedDownright import com.infomaniak.swisstransfer.ui.screen.main.LocalNavType import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @@ -97,7 +97,7 @@ fun EmptyScreen() { top.linkTo(parent.top) end.linkTo(fab.start, Margin.Small) }, - imageVector = AppIcons.Illu.ArrowCurvedDownright, + imageVector = AppIllus.ArrowCurvedDownright, contentDescription = null, ) NewTransferFab( diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt index e667a153f..456b4f317 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt @@ -32,8 +32,8 @@ import androidx.compose.ui.res.stringResource import com.infomaniak.swisstransfer.BuildConfig import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.* +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.* import com.infomaniak.swisstransfer.ui.screen.main.settings.SettingsOptionScreens.* import com.infomaniak.swisstransfer.ui.screen.main.settings.components.EndIconType.CHEVRON import com.infomaniak.swisstransfer.ui.screen.main.settings.components.EndIconType.OPEN_OUTSIDE diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt index 2a22419d9..eec38592d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt @@ -34,10 +34,10 @@ import androidx.compose.ui.res.stringResource import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar import com.infomaniak.swisstransfer.ui.components.TopAppBarButton -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.BlackAndWhiteCircle -import com.infomaniak.swisstransfer.ui.icons.app.BlackCircle -import com.infomaniak.swisstransfer.ui.icons.app.WhiteCircle +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.BlackAndWhiteCircle +import com.infomaniak.swisstransfer.ui.images.icons.BlackCircle +import com.infomaniak.swisstransfer.ui.images.icons.WhiteCircle import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingOption import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SettingTitle import com.infomaniak.swisstransfer.ui.screen.main.settings.components.SingleSelectOptions diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt index 47c0c5d41..033ce2b72 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt @@ -33,11 +33,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.SharpRippleButton -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add -import com.infomaniak.swisstransfer.ui.icons.app.ChevronRightSmall -import com.infomaniak.swisstransfer.ui.icons.app.Folder -import com.infomaniak.swisstransfer.ui.icons.app.OpenOutside +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add +import com.infomaniak.swisstransfer.ui.images.icons.ChevronRightSmall +import com.infomaniak.swisstransfer.ui.images.icons.Folder +import com.infomaniak.swisstransfer.ui.images.icons.OpenOutside import com.infomaniak.swisstransfer.ui.theme.Dimens import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SingleSelectOptions.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SingleSelectOptions.kt index b8f14637b..27548b433 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SingleSelectOptions.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SingleSelectOptions.kt @@ -38,9 +38,9 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.SharpRippleButton -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add -import com.infomaniak.swisstransfer.ui.icons.app.Checkmark +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add +import com.infomaniak.swisstransfer.ui.images.icons.Checkmark import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt index 3ac03bb17..a98b662f7 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt @@ -29,11 +29,11 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.* -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.app.Add -import com.infomaniak.swisstransfer.ui.icons.app.Camera -import com.infomaniak.swisstransfer.ui.icons.app.Folder -import com.infomaniak.swisstransfer.ui.icons.app.PolaroidLandscape +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons +import com.infomaniak.swisstransfer.ui.images.icons.Add +import com.infomaniak.swisstransfer.ui.images.icons.Camera +import com.infomaniak.swisstransfer.ui.images.icons.Folder +import com.infomaniak.swisstransfer.ui.images.icons.PolaroidLandscape import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme import com.infomaniak.swisstransfer.ui.utils.PreviewMobile diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt index b15c438b4..5fd8ac757 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt @@ -32,11 +32,11 @@ import androidx.compose.ui.text.style.TextAlign import com.infomaniak.swisstransfer.R import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar import com.infomaniak.swisstransfer.ui.components.TopAppBarButton -import com.infomaniak.swisstransfer.ui.icons.AppIcons -import com.infomaniak.swisstransfer.ui.icons.illu.ChainTilted -import com.infomaniak.swisstransfer.ui.icons.illu.EnvelopeTilted -import com.infomaniak.swisstransfer.ui.icons.illu.QrCodeTilted -import com.infomaniak.swisstransfer.ui.icons.illu.WaveSignalTilted +import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus +import com.infomaniak.swisstransfer.ui.images.illus.ChainTilted +import com.infomaniak.swisstransfer.ui.images.illus.EnvelopeTilted +import com.infomaniak.swisstransfer.ui.images.illus.QrCodeTilted +import com.infomaniak.swisstransfer.ui.images.illus.WaveSignalTilted import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferTypeButtons import com.infomaniak.swisstransfer.ui.theme.Margin import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme @@ -81,25 +81,25 @@ enum class TransferType( R.string.transferTypeLink, { SwissTransferTheme.colors.transferTypeLinkContainer }, { SwissTransferTheme.colors.transferTypeLinkOnContainer }, - AppIcons.Illu.ChainTilted + AppIllus.ChainTilted ), EMAIL( R.string.transferTypeEmail, { SwissTransferTheme.colors.transferTypeEmailContainer }, { SwissTransferTheme.colors.transferTypeEmailOnContainer }, - AppIcons.Illu.EnvelopeTilted + AppIllus.EnvelopeTilted ), QR_CODE( R.string.transferTypeQrCode, { SwissTransferTheme.colors.transferTypeQrContainer }, { SwissTransferTheme.colors.transferTypeQrOnContainer }, - AppIcons.Illu.QrCodeTilted + AppIllus.QrCodeTilted ), PROXIMITY( R.string.transferTypeProximity, { SwissTransferTheme.colors.transferTypeProximityContainer }, { SwissTransferTheme.colors.transferTypeProximityOnContainer }, - AppIcons.Illu.WaveSignalTilted + AppIllus.WaveSignalTilted ), }