Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add TransferTypeButtons component #98

Merged
merged 5 commits into from
Oct 16, 2024
Merged

feat: Add TransferTypeButtons component #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e76ce4
feat(TransferTypesButtons): Add icons files
FabianDevel Oct 15, 2024
28b2877
feat(TransferTypesButtons): Add components
FabianDevel Oct 16, 2024
525ee3f
feat(TransferTypesButtons): Remove old TransferScreen
FabianDevel Oct 16, 2024
ebb44dc
chore(TransferTypeButtons): Clean code
FabianDevel Oct 16, 2024
b8c5080
chore(TransferTypeButtons): Apply suggestions
FabianDevel Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import androidx.compose.ui.unit.dp
import com.infomaniak.swisstransfer.R
import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
import com.infomaniak.swisstransfer.ui.images.icons.Add
import com.infomaniak.swisstransfer.ui.theme.Dimens
import com.infomaniak.swisstransfer.ui.theme.Margin
import com.infomaniak.swisstransfer.ui.theme.Shapes
import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
Expand Down Expand Up @@ -113,7 +114,7 @@ enum class ButtonType(val buttonColors: @Composable () -> ButtonColors) {
}

private enum class ButtonSize(val height: Dp) {
LARGE(56.dp),
LARGE(Dimens.LargeButtonHeight),
SMALL(40.dp),
}

Expand Down
78 changes: 78 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Chain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
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.Chain: ImageVector
get() {
if (_chain != null) return _chain!!

_chain = Builder(
name = "Chain",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = null,
stroke = SolidColor(Color(0xFF9F9F9F)),
strokeLineWidth = 1.5f,
strokeLineCap = strokeCapRound,
strokeLineJoin = strokeJoinRound,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(9.365f, 19.127f)
lineToRelative(-0.932f, 0.932f)
arcToRelative(4.5f, 4.5f, 0.0f, false, true, -6.364f, -6.364f)
lineTo(6.842f, 8.92f)
arcToRelative(4.5f, 4.5f, 0.0f, false, true, 6.826f, 5.825f)
}
path(
fill = null,
stroke = SolidColor(Color(0xFF9F9F9F)),
strokeLineWidth = 1.5f,
strokeLineCap = strokeCapRound,
strokeLineJoin = strokeJoinRound,
strokeLineMiter = 4.0f,
pathFillType = NonZero
) {
moveTo(14.82f, 6.194f)
lineToRelative(0.75f, -0.75f)
arcToRelative(4.5f, 4.5f, 0.0f, true, true, 6.363f, 6.364f)
lineTo(17.16f, 16.58f)
arcToRelative(4.5f, 4.5f, 0.0f, false, true, -6.824f, -5.826f)
}
}.build()
return _chain!!
}

private var _chain: ImageVector? = null

@Preview
@Composable
private fun Preview() {
Box {
Image(
imageVector = AppIcons.Chain,
contentDescription = null,
modifier = Modifier.size(AppImages.previewSize)
)
}
}
75 changes: 75 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/Envelope.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
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.Envelope: ImageVector
get() {
if (_envelope != null) return _envelope!!

_envelope = Builder(
name = "Envelope",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = null,
stroke = SolidColor(Color(0xFF9F9F9F)),
strokeLineWidth = 1.5f,
strokeLineCap = strokeCapRound,
strokeLineJoin = strokeJoinRound,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(1.22f, 5.695f)
curveToRelative(-0.3f, 0.282f, -0.47f, 0.663f, -0.47f, 1.061f)
verticalLineToRelative(12.0f)
curveToRelative(0.0f, 0.398f, 0.17f, 0.78f, 0.47f, 1.06f)
curveToRelative(0.302f, 0.282f, 0.71f, 0.44f, 1.137f, 0.44f)
horizontalLineToRelative(19.286f)
curveToRelative(0.426f, 0.0f, 0.835f, -0.158f, 1.136f, -0.44f)
curveToRelative(0.302f, -0.28f, 0.471f, -0.662f, 0.471f, -1.06f)
verticalLineToRelative(-12.0f)
curveToRelative(0.0f, -0.398f, -0.17f, -0.78f, -0.47f, -1.06f)
moveToRelative(-21.56f, 0.0f)
curveToRelative(0.302f, -0.282f, 0.71f, -0.44f, 1.137f, -0.44f)
horizontalLineToRelative(19.286f)
curveToRelative(0.426f, 0.0f, 0.835f, 0.158f, 1.136f, 0.44f)
moveToRelative(-21.558f, 0.0f)
lineToRelative(8.618f, 6.374f)
arcTo(3.7f, 3.7f, 0.0f, false, false, 12.0f, 12.756f)
arcToRelative(3.7f, 3.7f, 0.0f, false, false, 2.161f, -0.686f)
lineToRelative(8.618f, -6.375f)
}
}.build()
return _envelope!!
}

private var _envelope: ImageVector? = null

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

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.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.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.QrCode: ImageVector
get() {
if (_qrCode != null) return _qrCode!!

_qrCode = Builder(
name = "QrCode",
defaultWidth = 24.0.dp,
defaultHeight = 25.0.dp,
viewportWidth = 24.0f,
viewportHeight = 25.0f,
).apply {
group {
path(
fill = null,
stroke = SolidColor(Color(0xFF9F9F9F)),
strokeLineWidth = 1.5f,
strokeLineCap = strokeCapRound,
strokeLineJoin = strokeJoinRound,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(5.25f, 6.033f)
horizontalLineToRelative(3.0f)
verticalLineToRelative(3.0f)
horizontalLineToRelative(-3.0f)
close()
moveToRelative(0.0f, 10.5f)
horizontalLineToRelative(3.0f)
verticalLineToRelative(3.0f)
horizontalLineToRelative(-3.0f)
close()
moveToRelative(10.5f, -10.5f)
horizontalLineToRelative(3.0f)
verticalLineToRelative(3.0f)
horizontalLineToRelative(-3.0f)
close()
moveToRelative(-10.5f, 7.5f)
horizontalLineToRelative(6.0f)
verticalLineToRelative(1.5f)
moveToRelative(3.0f, 0.0f)
verticalLineToRelative(4.5f)
horizontalLineToRelative(4.5f)
verticalLineToRelative(-4.5f)
horizontalLineToRelative(-1.5f)
moveToRelative(-6.0f, 3.0f)
verticalLineToRelative(1.5f)
moveToRelative(0.0f, -13.5f)
verticalLineToRelative(4.5f)
horizontalLineToRelative(1.5f)
moveToRelative(3.0f, 1.5f)
horizontalLineToRelative(3.0f)
moveToRelative(-18.0f, -5.25f)
verticalLineToRelative(-3.75f)
arcToRelative(1.5f, 1.5f, 0.0f, false, true, 1.5f, -1.5f)
horizontalLineTo(6.0f)
moveToRelative(12.0f, 0.0f)
horizontalLineToRelative(3.75f)
arcToRelative(1.5f, 1.5f, 0.0f, false, true, 1.5f, 1.5f)
verticalLineToRelative(3.75f)
moveToRelative(0.0f, 12.0f)
verticalLineToRelative(3.75f)
arcToRelative(1.5f, 1.5f, 0.0f, false, true, -1.5f, 1.5f)
horizontalLineTo(18.0f)
moveToRelative(-12.0f, 0.0f)
horizontalLineTo(2.25f)
arcToRelative(1.5f, 1.5f, 0.0f, false, true, -1.5f, -1.5f)
verticalLineToRelative(-3.75f)
}
}
}.build()
return _qrCode!!
}

private var _qrCode: ImageVector? = null

@Preview
@Composable
private fun Preview() {
Box {
Image(
imageVector = AppIcons.QrCode,
contentDescription = null,
modifier = Modifier.size(AppImages.previewSize)
)
}
}
67 changes: 67 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/images/icons/WifiWave.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
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.WifiWave: ImageVector
get() {
if (_wifiWave != null) return _wifiWave!!

_wifiWave = Builder(
name = "WifiWave",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = null,
stroke = SolidColor(Color(0xFF9F9F9F)),
strokeLineWidth = 1.5f,
strokeLineCap = strokeCapRound,
strokeLineJoin = strokeJoinRound,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(9.0f, 19.632f)
arcToRelative(3.0f, 3.0f, 0.0f, true, false, 6.0f, 0.0f)
arcToRelative(3.0f, 3.0f, 0.0f, false, false, -6.0f, 0.0f)
moveToRelative(8.3f, -5.303f)
arcToRelative(7.5f, 7.5f, 0.0f, false, false, -10.606f, 0.0f)
moveToRelative(13.791f, -3.182f)
arcToRelative(12.0f, 12.0f, 0.0f, false, false, -16.97f, 0.0f)
moveTo(23.25f, 7.563f)
arcToRelative(16.5f, 16.5f, 0.0f, false, false, -22.5f, 0.0f)
}
}.build()
return _wifiWave!!
}

private var _wifiWave: ImageVector? = null

@Preview
@Composable
private fun Preview() {
Box {
Image(
imageVector = AppIcons.WifiWave,
contentDescription = null,
modifier = Modifier.size(AppImages.previewSize)
)
}
}
8 changes: 0 additions & 8 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation
import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation.*
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.ImportFilesScreen
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.TransferOptionsScreen
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.TransferTypeScreen
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.ValidateUserEmailScreen
import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadProgressScreen
import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadSuccessScreen
Expand All @@ -40,13 +39,6 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
closeActivity = closeActivity,
)
}
composable<TransferTypeDestination> {
TransferTypeScreen(
navigateToTransfer = { /* TODO */ },
popBack = { navController.navigateUp() },
closeActivity = closeActivity,
)
}
composable<TransferOptionsDestination> {
TransferOptionsScreen()
}
Expand Down
Loading
Loading