Simplification of Images usage

Infomaniak · Sep 3, 2024 · bad2679 · bad2679
1 parent f58452c
commit bad2679
Show file tree

Hide file tree

Showing 42 changed files with 178 additions and 151 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...maniak/swisstransfer/ui/icons/AppIcons.kt → ...niak/swisstransfer/ui/images/AppImages.kt b/...maniak/swisstransfer/ui/icons/AppIcons.kt → ...niak/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 <http://www.gnu.org/licenses/>.
  */
-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/...omaniak/swisstransfer/ui/icons/app/Add.kt → ...niak/swisstransfer/ui/images/icons/Add.kt b/...omaniak/swisstransfer/ui/icons/app/Add.kt → ...niak/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/...stransfer/ui/icons/app/ArrowDownCircle.kt → ...ansfer/ui/images/icons/ArrowDownCircle.kt b/...stransfer/ui/icons/app/ArrowDownCircle.kt → ...ansfer/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 <http://www.gnu.org/licenses/>.
  */
-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/...k/swisstransfer/ui/icons/app/ArrowLeft.kt → ...wisstransfer/ui/images/icons/ArrowLeft.kt b/...k/swisstransfer/ui/icons/app/ArrowLeft.kt → ...wisstransfer/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/...isstransfer/ui/icons/app/ArrowUpCircle.kt → ...transfer/ui/images/icons/ArrowUpCircle.kt b/...isstransfer/ui/icons/app/ArrowUpCircle.kt → ...transfer/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 <http://www.gnu.org/licenses/>.
  */
-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/...maniak/swisstransfer/ui/icons/app/Bell.kt → ...iak/swisstransfer/ui/images/icons/Bell.kt b/...maniak/swisstransfer/ui/icons/app/Bell.kt → ...iak/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/...nsfer/ui/icons/app/BlackAndWhiteCircle.kt → ...er/ui/images/icons/BlackAndWhiteCircle.kt b/...nsfer/ui/icons/app/BlackAndWhiteCircle.kt → ...er/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/...swisstransfer/ui/icons/app/BlackCircle.kt → ...sstransfer/ui/images/icons/BlackCircle.kt b/...swisstransfer/ui/icons/app/BlackCircle.kt → ...sstransfer/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/...niak/swisstransfer/ui/icons/app/Camera.kt → ...k/swisstransfer/ui/images/icons/Camera.kt b/...niak/swisstransfer/ui/icons/app/Camera.kt → ...k/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/...k/swisstransfer/ui/icons/app/Checkmark.kt → ...wisstransfer/ui/images/icons/Checkmark.kt b/...k/swisstransfer/ui/icons/app/Checkmark.kt → ...wisstransfer/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/...ransfer/ui/icons/app/ChevronRightSmall.kt → ...sfer/ui/images/icons/ChevronRightSmall.kt b/...ransfer/ui/icons/app/ChevronRightSmall.kt → ...sfer/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/...aniak/swisstransfer/ui/icons/app/Clock.kt → ...ak/swisstransfer/ui/images/icons/Clock.kt b/...aniak/swisstransfer/ui/icons/app/Clock.kt → ...ak/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),
         )
     }
 }