From b94287b825190bc051c10b74bbdb61df73bf9f1d Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Tue, 27 Aug 2024 11:23:27 +0200 Subject: [PATCH] Replace kotlin class for flags with xml --- .../ui/icons/illu/EnglishFlag.kt | 213 ------------------ .../swisstransfer/ui/icons/illu/FrenchFlag.kt | 109 --------- .../swisstransfer/ui/icons/illu/GermanFlag.kt | 91 -------- .../ui/icons/illu/ItalianFlag.kt | 94 -------- .../settings/SettingsEmailLanguageScreen.kt | 13 +- .../ui/screen/main/settings/SettingsScreen.kt | 6 - app/src/main/res/drawable/flag_fr.xml | 22 ++ app/src/main/res/drawable/flag_gb.xml | 49 ++++ app/src/main/res/drawable/flag_ge.xml | 19 ++ app/src/main/res/drawable/flag_it.xml | 19 ++ 10 files changed, 113 insertions(+), 522 deletions(-) delete mode 100644 app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnglishFlag.kt delete mode 100644 app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/FrenchFlag.kt delete mode 100644 app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/GermanFlag.kt delete mode 100644 app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ItalianFlag.kt create mode 100644 app/src/main/res/drawable/flag_fr.xml create mode 100644 app/src/main/res/drawable/flag_gb.xml create mode 100644 app/src/main/res/drawable/flag_ge.xml create mode 100644 app/src/main/res/drawable/flag_it.xml diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnglishFlag.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnglishFlag.kt deleted file mode 100644 index 28b4adea0..000000000 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/EnglishFlag.kt +++ /dev/null @@ -1,213 +0,0 @@ -package com.infomaniak.swisstransfer.ui.icons.illu - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.PathData -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 - -val AppIcons.EnglishFlag: ImageVector - get() { - if (_englishFlag != null) { - return _englishFlag!! - } - _englishFlag = Builder( - name = "EnglishFlag", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f - ).apply { - group(clipPathData = PathData { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(16.65f) - arcToRelative(1.333f, 1.333f, 0.0f, false, true, -1.333f, 1.333f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 20.334f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - }) { - path( - fill = SolidColor(Color(0xFF0B5394)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(16.65f) - arcToRelative(1.333f, 1.333f, 0.0f, false, true, -1.333f, 1.333f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 20.334f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(12.0f, 11.667f) - lineTo(24.0f, 3.0f) - verticalLineToRelative(3.333f) - lineToRelative(-6.667f, 4.0f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(14.667f, 10.334f) - lineTo(24.0f, 3.667f) - verticalLineTo(5.0f) - lineToRelative(-8.0f, 5.334f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(12.0f, 13.667f) - lineTo(0.0f, 22.334f) - verticalLineToRelative(-3.333f) - lineToRelative(6.667f, -4.0f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(9.333f, 15.0f) - lineTo(0.0f, 21.667f) - verticalLineToRelative(-1.333f) - lineTo(8.0f, 15.0f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(12.0f, 11.667f) - lineTo(0.0f, 3.0f) - verticalLineToRelative(3.333f) - lineToRelative(6.667f, 4.0f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(9.333f, 10.334f) - lineTo(0.0f, 3.667f) - verticalLineTo(5.0f) - lineToRelative(8.0f, 5.334f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(12.0f, 13.667f) - lineToRelative(12.0f, 8.667f) - verticalLineToRelative(-3.333f) - lineToRelative(-6.667f, -4.0f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(14.667f, 15.0f) - lineTo(24.0f, 21.667f) - verticalLineToRelative(-1.333f) - lineTo(16.0f, 15.0f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 15.0f) - verticalLineTo(9.667f) - horizontalLineToRelative(24.0f) - verticalLineTo(15.0f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(9.333f, 3.0f) - horizontalLineToRelative(5.333f) - verticalLineToRelative(19.3f) - horizontalLineTo(9.333f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(10.667f, 3.0f) - horizontalLineToRelative(2.667f) - verticalLineToRelative(19.3f) - horizontalLineToRelative(-2.667f) - close() - } - path( - fill = SolidColor(Color(0xFFD0142C)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 13.667f) - verticalLineTo(11.0f) - horizontalLineToRelative(24.0f) - verticalLineToRelative(2.667f) - close() - } - } - } - .build() - return _englishFlag!! - } - -private var _englishFlag: ImageVector? = null - -@Preview -@Composable -private fun Preview() { - Box(modifier = Modifier.padding(12.dp)) { - Image( - imageVector = AppIcons.EnglishFlag, - contentDescription = "", - modifier = Modifier.size(AppIcons.previewSize) - ) - } -} diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/FrenchFlag.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/FrenchFlag.kt deleted file mode 100644 index e6af17ea4..000000000 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/FrenchFlag.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.infomaniak.swisstransfer.ui.icons.illu - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -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 - -val AppIcons.FrenchFlag: ImageVector - get() { - if (_frenchFlag != null) { - return _frenchFlag!! - } - _frenchFlag = Builder( - name = "FrenchFlag", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f - ).apply { - group { - path( - fill = SolidColor(Color(0xFF0B5394)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(15.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 22.667f, 21.0f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 19.667f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - } - path( - fill = SolidColor(Color(0xFFE70E0E)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(16.001f) - arcToRelative(1.333f, 1.333f, 0.0f, false, true, -1.333f, 1.333f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 20.334f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - } - path( - fill = SolidColor(Color(0xFF0B5394)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 4.333f) - curveTo(0.0f, 3.597f, 0.597f, 3.0f, 1.333f, 3.0f) - horizontalLineTo(8.0f) - verticalLineToRelative(18.667f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 20.333f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(8.0f, 3.0f) - horizontalLineToRelative(8.0f) - verticalLineToRelative(18.667f) - horizontalLineTo(8.0f) - close() - } - } - } - .build() - return _frenchFlag!! - } - -private var _frenchFlag: ImageVector? = null - -@Preview -@Composable -private fun Preview() { - Box(modifier = Modifier.padding(12.dp)) { - Image( - imageVector = AppIcons.FrenchFlag, - contentDescription = "", - modifier = Modifier.size(AppIcons.previewSize) - ) - } -} diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/GermanFlag.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/GermanFlag.kt deleted file mode 100644 index 678fef7ce..000000000 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/GermanFlag.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.infomaniak.swisstransfer.ui.icons.illu - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -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 - -val AppIcons.GermanFlag: ImageVector - get() { - if (_germanFlag != null) { - return _germanFlag!! - } - _germanFlag = Builder( - name = "GermanFlag", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f - ).apply { - group { - path( - fill = SolidColor(Color(0xFFE70E0E)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(15.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 22.667f, 21.0f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 19.667f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - } - path( - fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 3.0f) - horizontalLineToRelative(24.0f) - verticalLineToRelative(6.0f) - horizontalLineTo(0.0f) - close() - } - path( - fill = SolidColor(Color(0xFFFDDA25)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 15.667f) - horizontalLineToRelative(24.0f) - verticalLineToRelative(6.0f) - horizontalLineTo(0.0f) - close() - } - } - } - .build() - return _germanFlag!! - } - -private var _germanFlag: ImageVector? = null - -@Preview -@Composable -private fun Preview() { - Box(modifier = Modifier.padding(12.dp)) { - Image( - imageVector = AppIcons.GermanFlag, - contentDescription = "", - modifier = Modifier.size(AppIcons.previewSize) - ) - } -} diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ItalianFlag.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ItalianFlag.kt deleted file mode 100644 index a137e5de2..000000000 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/icons/illu/ItalianFlag.kt +++ /dev/null @@ -1,94 +0,0 @@ -package com.infomaniak.swisstransfer.ui.icons.illu - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -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 androidx.core.graphics.translationMatrix -import com.infomaniak.swisstransfer.ui.icons.AppIcons - -val AppIcons.ItalianFlag: ImageVector - get() { - if (_italianFlag != null) { - return _italianFlag!! - } - _italianFlag = Builder( - name = "ItalianFlag", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f - ).apply { - group { - path( - fill = SolidColor(Color(0xFFE70E0E)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(1.333f, 3.0f) - horizontalLineToRelative(21.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 24.0f, 4.333f) - verticalLineToRelative(15.334f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 22.667f, 21.0f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 19.667f) - verticalLineTo(4.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 1.333f, 3.0f) - close() - } - path( - fill = SolidColor(Color(0xFF128D4E)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(0.0f, 4.333f) - curveTo(0.0f, 3.597f, 0.597f, 3.0f, 1.333f, 3.0f) - horizontalLineTo(8.0f) - verticalLineToRelative(18.0f) - horizontalLineTo(1.333f) - arcTo(1.333f, 1.333f, 0.0f, false, true, 0.0f, 19.6f) - close() - } - path( - fill = SolidColor(Color(0xFFFFFFFF)), stroke = null, strokeLineWidth = - 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = - 4.0f, pathFillType = NonZero - ) { - moveTo(8.0f, 3.0f) - horizontalLineToRelative(8.0f) - verticalLineToRelative(18.0f) - horizontalLineTo(8.0f) - close() - } - } - } - .build() - return _italianFlag!! - } - -private var _italianFlag: ImageVector? = null - -@Preview -@Composable -private fun Preview() { - Box(modifier = Modifier.padding(12.dp)) { - Image( - imageVector = AppIcons.ItalianFlag, - contentDescription = "", - modifier = Modifier.size(AppIcons.previewSize) - ) - } -} diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt index daaa1b6ee..ce6d7ffdc 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsEmailLanguageScreen.kt @@ -29,11 +29,6 @@ import androidx.compose.ui.Modifier 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.illu.EnglishFlag -import com.infomaniak.swisstransfer.ui.icons.illu.FrenchFlag -import com.infomaniak.swisstransfer.ui.icons.illu.GermanFlag -import com.infomaniak.swisstransfer.ui.icons.illu.ItalianFlag 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 @@ -56,10 +51,10 @@ enum class EmailLanguage( override val imageVector: ImageVector? = null, override val imageVectorResId: Int? = null ) : SettingOption { - ENGLISH({ stringResource(R.string.settingsEmailLanguageValueEnglish) }, imageVector = AppIcons.EnglishFlag), - FRENCH({ stringResource(R.string.settingsEmailLanguageValueFrench) }, imageVector = AppIcons.FrenchFlag), - GERMAN({ stringResource(R.string.settingsEmailLanguageValueGerman) }, imageVector = AppIcons.GermanFlag), - ITALIAN({ stringResource(R.string.settingsEmailLanguageValueItalian) }, imageVector = AppIcons.ItalianFlag), + ENGLISH({ stringResource(R.string.settingsEmailLanguageValueEnglish) }, imageVectorResId = R.drawable.flag_gb), + FRENCH({ stringResource(R.string.settingsEmailLanguageValueFrench) }, imageVectorResId = R.drawable.flag_fr), + GERMAN({ stringResource(R.string.settingsEmailLanguageValueGerman) }, imageVectorResId = R.drawable.flag_ge), + ITALIAN({ stringResource(R.string.settingsEmailLanguageValueItalian) }, imageVectorResId = R.drawable.flag_it), SPANISH({ stringResource(R.string.settingsEmailLanguageValueSpanish) }, imageVectorResId = R.drawable.flag_es), } 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 854e3acc4..0e7ff529c 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 @@ -18,12 +18,6 @@ package com.infomaniak.swisstransfer.ui.screen.main.settings -import android.content.ActivityNotFoundException -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.Build -import android.provider.Settings import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize diff --git a/app/src/main/res/drawable/flag_fr.xml b/app/src/main/res/drawable/flag_fr.xml new file mode 100644 index 000000000..7a2ab8813 --- /dev/null +++ b/app/src/main/res/drawable/flag_fr.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/flag_gb.xml b/app/src/main/res/drawable/flag_gb.xml new file mode 100644 index 000000000..af86fadce --- /dev/null +++ b/app/src/main/res/drawable/flag_gb.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/flag_ge.xml b/app/src/main/res/drawable/flag_ge.xml new file mode 100644 index 000000000..a5a3b7e78 --- /dev/null +++ b/app/src/main/res/drawable/flag_ge.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/flag_it.xml b/app/src/main/res/drawable/flag_it.xml new file mode 100644 index 000000000..105424d2d --- /dev/null +++ b/app/src/main/res/drawable/flag_it.xml @@ -0,0 +1,19 @@ + + + + + + + +