Rename some Images

Infomaniak · Sep 3, 2024 · 4ddea77 · 4ddea77
1 parent f8c63c0
commit 4ddea77
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 55 deletions.
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
@@ -34,7 +34,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
-import com.infomaniak.swisstransfer.ui.images.illus.ArrowCurvedDownright
+import com.infomaniak.swisstransfer.ui.images.illus.ArrowDownRightCurved
 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 = AppIllus.ArrowCurvedDownright,
+                imageVector = AppIllus.ArrowDownRightCurved,
                 titleRes = R.string.appName,
                 descriptionRes = R.string.sentEmptyTitle,
                 content = {

diff --git a/...fer/ui/images/icons/FileBadgeArrowDown.kt → ...transfer/ui/images/icons/ArrowDownFile.kt b/...fer/ui/images/icons/FileBadgeArrowDown.kt → ...transfer/ui/images/icons/ArrowDownFile.kt
@@ -19,13 +19,13 @@ 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
 
-val AppIcons.FileBadgeArrowDown: ImageVector
+val AppIcons.ArrowDownFile: ImageVector
     get() {
 
-        if (_fileBadgeArrowDown != null) return _fileBadgeArrowDown!!
+        if (_arrowDownFile != null) return _arrowDownFile!!
 
-        _fileBadgeArrowDown = Builder(
-            name = "FileBadgeArrowDown",
+        _arrowDownFile = Builder(
+            name = "ArrowDownFile",
             defaultWidth = 24.0.dp,
             defaultHeight = 24.0.dp,
             viewportWidth = 24.0f,
@@ -74,17 +74,17 @@ val AppIcons.FileBadgeArrowDown: ImageVector
             }
         }.build()
 
-        return _fileBadgeArrowDown!!
+        return _arrowDownFile!!
     }
 
-private var _fileBadgeArrowDown: ImageVector? = null
+private var _arrowDownFile: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box {
         Image(
-            imageVector = AppIcons.FileBadgeArrowDown,
+            imageVector = AppIcons.ArrowDownFile,
             contentDescription = null,
             modifier = Modifier.size(AppImages.previewSize),
         )

diff --git a/...sstransfer/ui/images/icons/OpenOutside.kt → ...nsfer/ui/images/icons/ArrowOpenOutside.kt b/...sstransfer/ui/images/icons/OpenOutside.kt → ...nsfer/ui/images/icons/ArrowOpenOutside.kt
@@ -19,13 +19,13 @@ 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
 
-val AppIcons.OpenOutside: ImageVector
+val AppIcons.ArrowOpenOutside: ImageVector
     get() {
 
-        if (_openOutside != null) return _openOutside!!
+        if (_arrowOpenOutside != null) return _arrowOpenOutside!!
 
-        _openOutside = Builder(
-            name = "OpenOutside",
+        _arrowOpenOutside = Builder(
+            name = "ArrowOpenOutside",
             defaultWidth = 16.0.dp,
             defaultHeight = 16.0.dp,
             viewportWidth = 16.0f,
@@ -58,17 +58,17 @@ val AppIcons.OpenOutside: ImageVector
             }
         }.build()
 
-        return _openOutside!!
+        return _arrowOpenOutside!!
     }
 
-private var _openOutside: ImageVector? = null
+private var _arrowOpenOutside: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box {
         Image(
-            imageVector = AppIcons.OpenOutside,
+            imageVector = AppIcons.ArrowOpenOutside,
             contentDescription = null,
             modifier = Modifier.size(AppImages.previewSize),
         )

diff --git a/...sstransfer/ui/images/icons/BlackCircle.kt → ...sstransfer/ui/images/icons/CircleBlack.kt b/...sstransfer/ui/images/icons/BlackCircle.kt → ...sstransfer/ui/images/icons/CircleBlack.kt
@@ -18,13 +18,13 @@ import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.ui.images.AppImages
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 
-val AppIcons.BlackCircle: ImageVector
+val AppIcons.CircleBlack: ImageVector
     get() {
 
-        if (_blackCircle != null) return _blackCircle!!
+        if (_circleBlack != null) return _circleBlack!!
 
-        _blackCircle = Builder(
-            name = "BlackCircle",
+        _circleBlack = Builder(
+            name = "CircleBlack",
             defaultWidth = 24.0.dp,
             defaultHeight = 24.0.dp,
             viewportWidth = 24.0f,
@@ -49,17 +49,17 @@ val AppIcons.BlackCircle: ImageVector
         }
             .build()
 
-        return _blackCircle!!
+        return _circleBlack!!
     }
 
-private var _blackCircle: ImageVector? = null
+private var _circleBlack: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box {
         Image(
-            imageVector = AppIcons.BlackCircle,
+            imageVector = AppIcons.CircleBlack,
             contentDescription = null,
             modifier = Modifier.size(AppImages.previewSize),
         )

diff --git a/...er/ui/images/icons/BlackAndWhiteCircle.kt → ...er/ui/images/icons/CircleBlackAndWhite.kt b/...er/ui/images/icons/BlackAndWhiteCircle.kt → ...er/ui/images/icons/CircleBlackAndWhite.kt
@@ -20,13 +20,13 @@ import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.ui.images.AppImages
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 
-val AppIcons.BlackAndWhiteCircle: ImageVector
+val AppIcons.CircleBlackAndWhite: ImageVector
     get() {
 
-        if (_blackAndWhiteCircle != null) return _blackAndWhiteCircle!!
+        if (_circleBlackAndWhite != null) return _circleBlackAndWhite!!
 
-        _blackAndWhiteCircle = Builder(
-            name = "BlackAndWhiteCircle",
+        _circleBlackAndWhite = Builder(
+            name = "CircleBlackAndWhite",
             defaultWidth = 24.0.dp,
             defaultHeight = 24.0.dp,
             viewportWidth = 24.0f,
@@ -89,17 +89,17 @@ val AppIcons.BlackAndWhiteCircle: ImageVector
             }
         }.build()
 
-        return _blackAndWhiteCircle!!
+        return _circleBlackAndWhite!!
     }
 
-private var _blackAndWhiteCircle: ImageVector? = null
+private var _circleBlackAndWhite: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box {
         Image(
-            imageVector = AppIcons.BlackAndWhiteCircle,
+            imageVector = AppIcons.CircleBlackAndWhite,
             contentDescription = null,
             modifier = Modifier.size(AppImages.previewSize),
         )

diff --git a/...sstransfer/ui/images/icons/WhiteCircle.kt → ...sstransfer/ui/images/icons/CircleWhite.kt b/...sstransfer/ui/images/icons/WhiteCircle.kt → ...sstransfer/ui/images/icons/CircleWhite.kt
@@ -18,13 +18,13 @@ import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.ui.images.AppImages
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 
-val AppIcons.WhiteCircle: ImageVector
+val AppIcons.CircleWhite: ImageVector
     get() {
 
-        if (_whiteCircle != null) return _whiteCircle!!
+        if (_circleWhite != null) return _circleWhite!!
 
-        _whiteCircle = Builder(
-            name = "WhiteCircle",
+        _circleWhite = Builder(
+            name = "CircleWhite",
             defaultWidth = 24.0.dp,
             defaultHeight = 24.0.dp,
             viewportWidth = 24.0f,
@@ -48,17 +48,17 @@ val AppIcons.WhiteCircle: ImageVector
             }
         }.build()
 
-        return _whiteCircle!!
+        return _circleWhite!!
     }
 
-private var _whiteCircle: ImageVector? = null
+private var _circleWhite: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box {
         Image(
-            imageVector = AppIcons.WhiteCircle,
+            imageVector = AppIcons.CircleWhite,
             contentDescription = null,
             modifier = Modifier.size(AppImages.previewSize),
         )

diff --git a/...r/ui/images/illus/ArrowCurvedDownright.kt → ...r/ui/images/illus/ArrowDownRightCurved.kt b/...r/ui/images/illus/ArrowCurvedDownright.kt → ...r/ui/images/illus/ArrowDownRightCurved.kt
@@ -36,13 +36,13 @@ import androidx.compose.ui.unit.dp
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
 import com.infomaniak.swisstransfer.ui.images.AppImages.previewSize
 
-val AppIllus.ArrowCurvedDownright: ImageVector
+val AppIllus.ArrowDownRightCurved: ImageVector
     get() {
 
-        if (_arrowcurveddownright != null) return _arrowcurveddownright!!
+        if (_arrowDownRightCurved != null) return _arrowDownRightCurved!!
 
-        _arrowcurveddownright = Builder(
-            name = "Arrowcurveddownright",
+        _arrowDownRightCurved = Builder(
+            name = "ArrowDownRightCurved",
             defaultWidth = 37.0.dp,
             defaultHeight = 45.0.dp,
             viewportWidth = 37.0f,
@@ -72,17 +72,17 @@ val AppIllus.ArrowCurvedDownright: ImageVector
             }
         }.build()
 
-        return _arrowcurveddownright!!
+        return _arrowDownRightCurved!!
     }
 
-private var _arrowcurveddownright: ImageVector? = null
+private var _arrowDownRightCurved: ImageVector? = null
 
 @Preview
 @Composable
 private fun Preview() {
     Box(modifier = Modifier.background(Color.White)) {
         Image(
-            imageVector = AppIllus.ArrowCurvedDownright,
+            imageVector = AppIllus.ArrowDownRightCurved,
             contentDescription = null,
             modifier = Modifier.size(previewSize),
         )

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
@@ -37,7 +37,7 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.NewTransferFab
 import com.infomaniak.swisstransfer.ui.components.NewTransferFabType
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
-import com.infomaniak.swisstransfer.ui.images.illus.ArrowCurvedDownright
+import com.infomaniak.swisstransfer.ui.images.illus.ArrowDownRightCurved
 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 = AppIllus.ArrowCurvedDownright,
+                imageVector = AppIllus.ArrowDownRightCurved,
                 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
@@ -85,7 +85,7 @@ fun SettingsScreen(onItemClick: (SettingsOptionScreens) -> Unit, getSelectedSett
             SettingItem(
                 titleRes = R.string.settingsOptionValidityPeriod,
                 isSelected = { selectedSetting == VALIDITY_PERIOD },
-                icon = AppIcons.FileBadgeArrowDown,
+                icon = AppIcons.ArrowDownFile,
                 description = "TODO",
                 endIcon = CHEVRON,
                 onClick = { onItemClick(VALIDITY_PERIOD) },

diff --git a/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt b/...src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt
@@ -35,9 +35,9 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar
 import com.infomaniak.swisstransfer.ui.components.TopAppBarButton
 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.images.icons.CircleBlack
+import com.infomaniak.swisstransfer.ui.images.icons.CircleBlackAndWhite
+import com.infomaniak.swisstransfer.ui.images.icons.CircleWhite
 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
@@ -68,9 +68,9 @@ enum class ThemeOption(
     override val imageVector: ImageVector,
     override val imageVectorResId: Int? = null,
 ) : SettingOption {
-    SYSTEM({ stringResource(R.string.settingsOptionThemeSystem) }, AppIcons.BlackAndWhiteCircle),
-    LIGHT({ stringResource(R.string.settingsOptionThemeLight) }, AppIcons.WhiteCircle),
-    DARK({ stringResource(R.string.settingsOptionThemeDark) }, AppIcons.BlackCircle),
+    SYSTEM({ stringResource(R.string.settingsOptionThemeSystem) }, AppIcons.CircleBlackAndWhite),
+    LIGHT({ stringResource(R.string.settingsOptionThemeLight) }, AppIcons.CircleWhite),
+    DARK({ stringResource(R.string.settingsOptionThemeDark) }, AppIcons.CircleBlack),
 }
 
 @PreviewMobile

diff --git a/.../main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt b/.../main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt
@@ -37,7 +37,7 @@ 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.images.icons.ArrowOpenOutside
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
@@ -133,5 +133,5 @@ private fun SettingItemPreview() {
 
 enum class EndIconType(val icon: ImageVector) {
     CHEVRON(AppIcons.ChevronRightSmall),
-    OPEN_OUTSIDE(AppIcons.OpenOutside),
+    OPEN_OUTSIDE(AppIcons.ArrowOpenOutside),
 }