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

Revert "Display UploadSourceChoiceBottomSheet before navigating to NewTransferScreen" #73

Merged
merged 1 commit into from
Sep 23, 2024
+12 −35
Merged

Revert "Display UploadSourceChoiceBottomSheet before navigating to NewTransferScreen" #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,24 @@ package com.infomaniak.swisstransfer.ui.components
import androidx.compose.material3.FloatingActionButtonDefaults
import androidx.compose.material3.FloatingActionButtonElevation
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.UploadSourceChoiceBottomSheet
import com.infomaniak.swisstransfer.ui.NewTransferActivity
import com.infomaniak.swisstransfer.ui.utils.launchActivity

@Composable
fun NewTransferFab(
modifier: Modifier = Modifier,
newTransferFabType: NewTransferFabType
) {
var showUploadSourceChoiceBottomSheet by rememberSaveable { mutableStateOf(false) }

val context = LocalContext.current
SwissTransferFab(
modifier = modifier,
fabType = newTransferFabType.fabType,
elevation = newTransferFabType.elevation(),
onClick = { showUploadSourceChoiceBottomSheet = true },
)
UploadSourceChoiceBottomSheet(
isBottomSheetVisible = { showUploadSourceChoiceBottomSheet },
onDismissRequest = { showUploadSourceChoiceBottomSheet = false },
onClick = { context.launchActivity(NewTransferActivity::class) },
)
}

Expand Down
30 changes: 7 additions & 23 deletions ...fomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,53 +23,37 @@ import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import com.infomaniak.swisstransfer.R
import com.infomaniak.swisstransfer.ui.NewTransferActivity
import com.infomaniak.swisstransfer.ui.components.BottomSheetItem
import com.infomaniak.swisstransfer.ui.components.SwissTransferBottomSheet
import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
import com.infomaniak.swisstransfer.ui.images.AppImages
import com.infomaniak.swisstransfer.ui.images.icons.Camera
import com.infomaniak.swisstransfer.ui.images.icons.Folder
import com.infomaniak.swisstransfer.ui.images.icons.PolaroidLandscape
import com.infomaniak.swisstransfer.ui.theme.Margin
import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
import com.infomaniak.swisstransfer.ui.utils.launchActivity

@Composable
fun UploadSourceChoiceBottomSheet(
isBottomSheetVisible: () -> Boolean,
onDismissRequest: () -> Unit,
) {
val context = LocalContext.current

if (isBottomSheetVisible()) {
SwissTransferBottomSheet(
onDismissRequest = onDismissRequest,
titleRes = R.string.transferUploadSourceChoiceTitle,
content = {
Column {
BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) {

// TODO: Remove this, it's only here to be able to navigate to the
// NewTransferActivity, since we don't have the FilePicker for now.
context.launchActivity(NewTransferActivity::class)

/* TODO */
onDismissRequest()
}
BottomSheetItem(AppImages.AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /* TODO */ }
HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) {
/* TODO */
onDismissRequest()
}
BottomSheetItem(
AppImages.AppIcons.PolaroidLandscape,
R.string.transferUploadSourceChoiceGallery
) { /* TODO */ }
HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) {
/* TODO */
onDismissRequest()
}
BottomSheetItem(AppImages.AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /* TODO */ }
}
},
)
Expand Down
Loading