From b7dff7567b510ee219083cbfdd97e6726801fb52 Mon Sep 17 00:00:00 2001 From: Gibran Chevalley Date: Wed, 9 Oct 2024 13:23:39 +0200 Subject: [PATCH] Fix infomaniak logo on low api Removed XML optimizations to prevent the logo from being broken on API 30 or 31 --- .../ui/images/illus/LogoInfomaniak.kt | 82 +++++++++---------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt index 94ebbe3dc..5c3242867 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/LogoInfomaniak.kt @@ -33,19 +33,18 @@ 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.images.AppImages -import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus -val AppIllus.LogoInfomaniak: ImageVector +val AppImages.AppIllus.LogoInfomaniak: ImageVector get() { - - if (_logoInfomaniak != null) return _logoInfomaniak!! - + if (_logoInfomaniak != null) { + return _logoInfomaniak!! + } _logoInfomaniak = Builder( name = "LogoInfomaniak", defaultWidth = 128.0.dp, defaultHeight = 16.0.dp, viewportWidth = 128.0f, - viewportHeight = 16.0f, + viewportHeight = 16.0f ).apply { path( fill = SolidColor(Color(0xFFFFFFFF)), @@ -54,46 +53,46 @@ val AppIllus.LogoInfomaniak: ImageVector strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero, + pathFillType = NonZero ) { moveTo(0.0f, 0.26f) horizontalLineToRelative(4.34f) verticalLineToRelative(2.92f) lineTo(0.0f, 3.19f) close() - moveToRelative(0.0f, 4.27f) + moveTo(0.0f, 4.53f) horizontalLineToRelative(4.34f) verticalLineToRelative(11.22f) - horizontalLineTo(0.0f) + lineTo(0.0f, 15.75f) close() - moveToRelative(6.84f, 0.0f) + moveTo(6.84f, 4.53f) horizontalLineToRelative(4.05f) verticalLineToRelative(1.83f) quadToRelative(0.91f, -1.12f, 1.84f, -1.6f) - reflectiveQuadToRelative(2.26f, -0.48f) + quadToRelative(0.93f, -0.48f, 2.26f, -0.48f) quadToRelative(1.8f, 0.0f, 2.82f, 1.06f) quadToRelative(1.02f, 1.06f, 1.02f, 3.28f) verticalLineToRelative(7.13f) horizontalLineToRelative(-4.37f) - verticalLineTo(9.58f) + lineTo(14.46f, 9.58f) quadToRelative(0.0f, -1.06f, -0.4f, -1.5f) quadToRelative(-0.39f, -0.44f, -1.11f, -0.44f) quadToRelative(-0.79f, 0.0f, -1.28f, 0.59f) - reflectiveQuadToRelative(-0.49f, 2.12f) + quadToRelative(-0.49f, 0.59f, -0.49f, 2.12f) verticalLineToRelative(5.39f) - lineToRelative(-4.34f, 0.01f) + lineTo(6.84f, 15.75f) close() - moveToRelative(19.13f, 0.0f) + moveTo(25.97f, 4.53f) horizontalLineToRelative(2.07f) verticalLineToRelative(3.15f) horizontalLineToRelative(-2.07f) verticalLineToRelative(8.07f) - horizontalLineToRelative(-4.36f) - verticalLineTo(7.68f) + lineTo(21.61f, 15.75f) + verticalLineToRelative(-8.07f) horizontalLineToRelative(-1.62f) - verticalLineTo(4.53f) + lineTo(19.99f, 4.53f) horizontalLineToRelative(1.62f) - verticalLineTo(4.02f) + verticalLineToRelative(-0.51f) quadToRelative(0.0f, -0.69f, 0.15f, -1.51f) quadToRelative(0.15f, -0.82f, 0.56f, -1.35f) quadToRelative(0.41f, -0.52f, 1.15f, -0.85f) @@ -120,10 +119,10 @@ val AppIllus.LogoInfomaniak: ImageVector quadToRelative(0.94f, 0.0f, 1.54f, -0.71f) reflectiveQuadToRelative(0.6f, -2.27f) quadToRelative(0.0f, -1.46f, -0.61f, -2.17f) - reflectiveQuadToRelative(-1.51f, -0.71f) + quadToRelative(-0.61f, -0.71f, -1.51f, -0.71f) quadToRelative(-0.95f, 0.0f, -1.57f, 0.72f) quadToRelative(-0.62f, 0.72f, -0.62f, 2.2f) - moveTo(43.3f, 4.53f) + moveToRelative(10.51f, -5.63f) horizontalLineToRelative(4.06f) verticalLineToRelative(1.64f) quadToRelative(0.88f, -1.02f, 1.77f, -1.46f) @@ -133,26 +132,26 @@ val AppIllus.LogoInfomaniak: ImageVector quadToRelative(1.02f, -1.1f, 1.87f, -1.5f) quadToRelative(0.84f, -0.4f, 2.08f, -0.4f) quadToRelative(1.83f, 0.0f, 2.85f, 1.07f) - reflectiveQuadToRelative(1.02f, 3.35f) + quadToRelative(1.02f, 1.07f, 1.02f, 3.35f) verticalLineToRelative(7.04f) horizontalLineToRelative(-4.36f) - lineToRelative(0.01f, -6.37f) + lineTo(58.19f, 9.36f) quadToRelative(0.0f, -0.76f, -0.3f, -1.13f) quadToRelative(-0.44f, -0.58f, -1.09f, -0.58f) quadToRelative(-0.77f, 0.0f, -1.24f, 0.55f) - reflectiveQuadToRelative(-0.47f, 1.76f) + quadToRelative(-0.47f, 0.55f, -0.47f, 1.76f) verticalLineToRelative(5.79f) horizontalLineToRelative(-4.36f) - lineToRelative(0.01f, -6.18f) + lineTo(50.74f, 9.57f) quadToRelative(0.0f, -0.74f, -0.09f, -1.0f) arcToRelative(1.37f, 1.37f, 0.0f, false, false, -0.48f, -0.68f) arcToRelative(1.3f, 1.3f, 0.0f, false, false, -0.8f, -0.26f) quadToRelative(-0.75f, 0.0f, -1.23f, 0.56f) reflectiveQuadToRelative(-0.48f, 1.84f) verticalLineToRelative(5.72f) - horizontalLineTo(43.3f) + horizontalLineToRelative(-4.36f) close() - moveToRelative(25.51f, 3.63f) + moveTo(68.81f, 8.16f) lineToRelative(-4.15f, -0.43f) quadToRelative(0.23f, -1.08f, 0.68f, -1.7f) quadToRelative(0.44f, -0.62f, 1.27f, -1.07f) @@ -169,7 +168,7 @@ val AppIllus.LogoInfomaniak: ImageVector arcToRelative(4.0f, 4.0f, 0.0f, false, true, -0.32f, -0.66f) quadToRelative(-0.08f, -0.23f, -0.15f, -0.71f) quadToRelative(-0.85f, 0.81f, -1.7f, 1.16f) - quadTo(69.97f, 16.0f, 68.44f, 16.0f) + quadToRelative(-1.15f, 0.47f, -2.68f, 0.47f) quadToRelative(-2.03f, 0.0f, -3.08f, -0.93f) quadToRelative(-1.05f, -0.93f, -1.05f, -2.29f) quadToRelative(0.0f, -1.28f, 0.76f, -2.1f) @@ -192,35 +191,35 @@ val AppIllus.LogoInfomaniak: ImageVector quadToRelative(0.62f, -0.35f, 0.89f, -0.85f) quadToRelative(0.26f, -0.5f, 0.26f, -1.3f) close() - moveToRelative(6.57f, -5.9f) + moveTo(79.15f, 4.53f) horizontalLineToRelative(4.05f) verticalLineToRelative(1.83f) quadToRelative(0.91f, -1.12f, 1.84f, -1.6f) - reflectiveQuadToRelative(2.26f, -0.48f) + quadToRelative(0.93f, -0.48f, 2.26f, -0.48f) quadToRelative(1.8f, 0.0f, 2.82f, 1.06f) quadToRelative(1.02f, 1.06f, 1.02f, 3.28f) verticalLineToRelative(7.13f) horizontalLineToRelative(-4.37f) - verticalLineTo(9.58f) + lineTo(86.77f, 9.58f) quadToRelative(0.0f, -1.06f, -0.4f, -1.5f) quadToRelative(-0.39f, -0.44f, -1.11f, -0.44f) quadToRelative(-0.79f, 0.0f, -1.28f, 0.59f) - reflectiveQuadToRelative(-0.49f, 2.12f) + quadToRelative(-0.49f, 0.59f, -0.49f, 2.12f) verticalLineToRelative(5.39f) horizontalLineToRelative(-4.34f) close() moveTo(93.6f, 0.26f) horizontalLineToRelative(4.34f) verticalLineToRelative(2.92f) - horizontalLineTo(93.6f) + horizontalLineToRelative(-4.34f) close() - moveToRelative(0.0f, 4.27f) + moveTo(93.6f, 4.53f) horizontalLineToRelative(4.34f) verticalLineToRelative(11.22f) - horizontalLineTo(93.6f) + horizontalLineToRelative(-4.34f) close() - moveToRelative(10.8f, 3.63f) - lineToRelative(-4.16f, -0.43f) + moveTo(104.4f, 8.16f) + lineTo(100.24f, 7.73f) quadToRelative(0.23f, -1.08f, 0.68f, -1.7f) quadToRelative(0.44f, -0.62f, 1.28f, -1.07f) quadToRelative(0.6f, -0.33f, 1.64f, -0.51f) @@ -260,13 +259,13 @@ val AppIllus.LogoInfomaniak: ImageVector quadToRelative(0.62f, -0.35f, 0.89f, -0.85f) quadToRelative(0.26f, -0.5f, 0.26f, -1.3f) close() - moveToRelative(6.56f, -10.17f) + moveTo(114.73f, 0.26f) horizontalLineToRelative(4.44f) verticalLineToRelative(7.98f) lineToRelative(3.24f, -3.72f) horizontalLineToRelative(5.35f) lineToRelative(-4.07f, 3.93f) - lineToRelative(4.31f, 7.3f) + lineTo(128.0f, 15.75f) horizontalLineToRelative(-4.9f) lineToRelative(-2.3f, -4.5f) lineToRelative(-1.63f, 1.59f) @@ -275,7 +274,6 @@ val AppIllus.LogoInfomaniak: ImageVector close() } }.build() - return _logoInfomaniak!! } @@ -286,9 +284,9 @@ private var _logoInfomaniak: ImageVector? = null private fun Preview() { Box { Image( - imageVector = AppIllus.LogoInfomaniak, + imageVector = AppImages.AppIllus.LogoInfomaniak, contentDescription = null, - modifier = Modifier.size(AppImages.previewSize), + modifier = Modifier.size(AppImages.previewSize) ) } }