Skip to content

Commit

Permalink
feat: Add Copy & Share icons in UploadSuccessQr screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinBoulongne
KevinBoulongne committed Oct 22, 2024
1 parent 90b1e4a commit fec6e07
Show file tree
Hide file tree
Showing 3 changed files with 207 additions and 4 deletions.
89 changes: 89 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Copy.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.infomaniak.swisstransfer.ui.images.icons

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
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.vector.ImageVector
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.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

val AppIcons.Copy: ImageVector
get() {

if (_copy != null) return _copy!!

_copy = Builder(
name = "Copy",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0x00000000)), stroke = SolidColor(Color(0xFF9f9f9f)),
strokeLineWidth = 1.5f, strokeLineCap = strokeCapRound, strokeLineJoin =
strokeJoinRound, strokeLineMiter = 4.0f, pathFillType = NonZero
) {
moveTo(7.5f, 6.75f)
lineTo(7.5f, 2.25f)
curveTo(7.5f, 1.852f, 7.658f, 1.471f, 7.939f, 1.189f)
curveTo(8.221f, 0.908f, 8.602f, 0.75f, 9.0f, 0.75f)
lineTo(16.629f, 0.75f)
curveTo(17.027f, 0.75f, 17.408f, 0.908f, 17.689f, 1.189f)
lineTo(20.561f, 4.061f)
curveTo(20.842f, 4.342f, 21.0f, 4.723f, 21.0f, 5.121f)
lineTo(21.0f, 15.75f)
curveTo(21.0f, 16.148f, 20.842f, 16.529f, 20.561f, 16.811f)
curveTo(20.279f, 17.092f, 19.898f, 17.25f, 19.5f, 17.25f)
lineTo(16.5f, 17.25f)
}
path(
fill = SolidColor(Color(0x00000000)), stroke = SolidColor(Color(0xFF9f9f9f)),
strokeLineWidth = 1.5f, strokeLineCap = strokeCapRound, strokeLineJoin =
strokeJoinRound, strokeLineMiter = 4.0f, pathFillType = NonZero
) {
moveTo(16.5f, 21.75f)
curveTo(16.5f, 22.148f, 16.342f, 22.529f, 16.061f, 22.811f)
curveTo(15.779f, 23.092f, 15.398f, 23.25f, 15.0f, 23.25f)
lineTo(4.5f, 23.25f)
curveTo(4.102f, 23.25f, 3.721f, 23.092f, 3.439f, 22.811f)
curveTo(3.158f, 22.529f, 3.0f, 22.148f, 3.0f, 21.75f)
lineTo(3.0f, 8.25f)
curveTo(3.0f, 7.852f, 3.158f, 7.471f, 3.439f, 7.189f)
curveTo(3.721f, 6.908f, 4.102f, 6.75f, 4.5f, 6.75f)
lineTo(12.129f, 6.75f)
curveTo(12.526f, 6.75f, 12.908f, 6.908f, 13.189f, 7.189f)
lineTo(16.061f, 10.061f)
curveTo(16.342f, 10.342f, 16.5f, 10.724f, 16.5f, 11.121f)
lineTo(16.5f, 21.75f)
close()
}
}.build()

return _copy!!
}

private var _copy: ImageVector? = null

@Preview
@Composable
private fun Preview() {
Box {
Image(
imageVector = AppIcons.Copy,
contentDescription = null,
modifier = Modifier.size(AppImages.previewSize),
)
}
}
112 changes: 112 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Share.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
package com.infomaniak.swisstransfer.ui.images.icons

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
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.EvenOdd
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.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.AppIcons
import androidx.compose.ui.graphics.StrokeCap.Companion.Round as strokeCapRound
import androidx.compose.ui.graphics.StrokeJoin.Companion.Round as strokeJoinRound

val AppIcons.Share: ImageVector
get() {

if (_share != null) return _share!!

_share = Builder(
name = "Share",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF9f9f9f)), stroke = SolidColor(Color(0x00000000)),
strokeLineWidth = 0.0f, strokeLineCap = Butt, strokeLineJoin = Miter,
strokeLineMiter = 4.0f, pathFillType = EvenOdd
) {
moveTo(19.644f, 16.175f)
curveTo(19.673f, 16.206f, 19.702f, 16.237f, 19.732f, 16.268f)
curveTo(20.201f, 16.737f, 20.837f, 17.0f, 21.5f, 17.0f)
curveTo(22.163f, 17.0f, 22.799f, 16.737f, 23.268f, 16.268f)
curveTo(23.737f, 15.799f, 24.0f, 15.163f, 24.0f, 14.5f)
curveTo(24.0f, 13.837f, 23.737f, 13.201f, 23.268f, 12.732f)
curveTo(22.799f, 12.263f, 22.163f, 12.0f, 21.5f, 12.0f)
curveTo(20.837f, 12.0f, 20.201f, 12.263f, 19.732f, 12.732f)
curveTo(19.263f, 13.201f, 19.0f, 13.837f, 19.0f, 14.5f)
curveTo(19.0f, 14.604f, 19.007f, 14.708f, 19.019f, 14.81f)
lineTo(16.236f, 16.202f)
curveTo(15.771f, 15.752f, 15.148f, 15.5f, 14.5f, 15.5f)
curveTo(13.837f, 15.5f, 13.201f, 15.763f, 12.732f, 16.232f)
curveTo(12.263f, 16.701f, 12.0f, 17.337f, 12.0f, 18.0f)
curveTo(12.0f, 18.663f, 12.263f, 19.299f, 12.732f, 19.768f)
curveTo(13.201f, 20.237f, 13.837f, 20.5f, 14.5f, 20.5f)
curveTo(15.148f, 20.5f, 15.771f, 20.248f, 16.236f, 19.799f)
lineTo(19.019f, 21.19f)
curveTo(19.007f, 21.292f, 19.0f, 21.396f, 19.0f, 21.5f)
curveTo(19.0f, 22.163f, 19.263f, 22.799f, 19.732f, 23.268f)
curveTo(20.201f, 23.737f, 20.837f, 24.0f, 21.5f, 24.0f)
curveTo(22.163f, 24.0f, 22.799f, 23.737f, 23.268f, 23.268f)
curveTo(23.737f, 22.799f, 24.0f, 22.163f, 24.0f, 21.5f)
curveTo(24.0f, 20.837f, 23.737f, 20.201f, 23.268f, 19.732f)
curveTo(22.799f, 19.263f, 22.163f, 19.0f, 21.5f, 19.0f)
curveTo(20.837f, 19.0f, 20.201f, 19.263f, 19.732f, 19.732f)
curveTo(19.702f, 19.763f, 19.673f, 19.794f, 19.644f, 19.825f)
lineTo(16.954f, 18.48f)
curveTo(16.984f, 18.323f, 17.0f, 18.162f, 17.0f, 18.0f)
curveTo(17.0f, 17.838f, 16.984f, 17.677f, 16.954f, 17.52f)
lineTo(19.644f, 16.175f)
close()
}
path(
fill = SolidColor(Color(0x00000000)), stroke = SolidColor(Color(0xFF9f9f9f)),
strokeLineWidth = 1.5f, strokeLineCap = strokeCapRound, strokeLineJoin =
strokeJoinRound, strokeLineMiter = 4.0f, pathFillType = NonZero
) {
moveTo(9.983f, 19.75f)
lineTo(0.75f, 19.75f)
curveTo(0.75f, 17.622f, 1.617f, 15.581f, 3.161f, 14.076f)
curveTo(4.706f, 12.571f, 6.8f, 11.725f, 8.983f, 11.725f)
curveTo(10.829f, 11.725f, 12.61f, 12.329f, 14.05f, 13.425f)
moveTo(3.917f, 5.817f)
curveTo(3.917f, 7.16f, 4.45f, 8.449f, 5.401f, 9.399f)
curveTo(6.351f, 10.349f, 7.64f, 10.883f, 8.983f, 10.883f)
curveTo(10.327f, 10.883f, 11.616f, 10.349f, 12.566f, 9.399f)
curveTo(13.516f, 8.449f, 14.05f, 7.16f, 14.05f, 5.817f)
curveTo(14.05f, 4.473f, 13.516f, 3.184f, 12.566f, 2.234f)
curveTo(11.616f, 1.284f, 10.327f, 0.75f, 8.983f, 0.75f)
curveTo(7.64f, 0.75f, 6.351f, 1.284f, 5.401f, 2.234f)
curveTo(4.45f, 3.184f, 3.917f, 4.473f, 3.917f, 5.817f)
close()
}
}.build()

return _share!!
}

private var _share: ImageVector? = null

@Preview
@Composable
private fun Preview() {
Box {
Image(
imageVector = AppIcons.Share,
contentDescription = null,
modifier = Modifier.size(AppImages.previewSize),
)
}
}
10 changes: 6 additions & 4 deletions ...n/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/UploadSuccessQrScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.infomaniak.swisstransfer.R
import com.infomaniak.swisstransfer.ui.components.*
import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
import com.infomaniak.swisstransfer.ui.images.AppImages.AppIllus
import com.infomaniak.swisstransfer.ui.images.icons.Copy
import com.infomaniak.swisstransfer.ui.images.icons.Share
import com.infomaniak.swisstransfer.ui.images.illus.uploadSuccessQr.UploadSuccessQr
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.components.TransferType
import com.infomaniak.swisstransfer.ui.theme.Dimens
Expand All @@ -48,6 +50,7 @@ fun UploadSuccessQrScreen(transferType: TransferType) {
modifier = it,
style = ButtonType.PRIMARY,
titleRes = R.string.buttonShare,
imageVector = AppIcons.Share,
onClick = { /* TODO */ },
)
},
Expand Down Expand Up @@ -104,9 +107,7 @@ private fun Content(transferType: TransferType) {
style = SwissTransferTheme.typography.bodyRegular,
textAlign = TextAlign.Center,
color = SwissTransferTheme.colors.secondaryTextColor,
modifier = Modifier
.alpha(1.0f)
.widthIn(max = Dimens.DescriptionWidth),
modifier = Modifier.widthIn(max = Dimens.DescriptionWidth),
)
}
}
Expand All @@ -116,6 +117,7 @@ private fun Content(transferType: TransferType) {
modifier = Modifier.padding(Margin.Medium),
style = ButtonType.SECONDARY,
titleRes = R.string.buttonCopyLink,
imageVector = AppIcons.Copy,
onClick = { /* TODO */ },
)
}
Expand Down

0 comments on commit fec6e07

Please sign in to comment.