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

Close NewTransfer activity when clicking on cross #59

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Close NewTransfer activity when clicking on cross #59

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
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class NewTransferActivity : ComponentActivity() {
enableEdgeToEdge()
setContent {
SwissTransferTheme {
NewTransferScreen()
NewTransferScreen(closeActivity = { finish() })
}
}
}
Expand Down
13 changes: 10 additions & 3 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 @@ -31,14 +31,21 @@ import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadProgressS
import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadSuccessScreen

@Composable
fun NewTransferNavHost(navController: NavHostController) {
fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Unit) {

NavHost(navController, NewTransferNavigation.startDestination) {
composable<ImportFilesDestination> {
ImportFilesScreen(navigateToTransferTypeScreen = { navController.navigate(TransferTypeDestination) })
ImportFilesScreen(
navigateToTransferTypeScreen = { navController.navigate(TransferTypeDestination) },
closeActivity = closeActivity,
)
}
composable<TransferTypeDestination> {
TransferTypeScreen(navigateToTransfer = { /* TODO */ }, popBack = { navController.navigateUp() })
TransferTypeScreen(
navigateToTransfer = { /* TODO */ },
popBack = { navController.navigateUp() },
closeActivity = closeActivity,
)
}
composable<TransferOptionsDestination> {
TransferOptionsScreen()
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
import com.infomaniak.swisstransfer.ui.utils.PreviewTablet

@Composable
fun NewTransferScreen() {
fun NewTransferScreen(closeActivity: () -> Unit) {
val navController = rememberNavController()

NewTransferNavHost(navController)
NewTransferNavHost(navController, closeActivity)
}

@PreviewMobile
@PreviewTablet
@Composable
private fun NewTransferPreview() {
SwissTransferTheme {
NewTransferScreen()
NewTransferScreen {}
}
}
6 changes: 3 additions & 3 deletions .../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
import com.infomaniak.swisstransfer.ui.utils.PreviewTablet

@Composable
fun ImportFilesScreen(navigateToTransferTypeScreen: () -> Unit) {
fun ImportFilesScreen(navigateToTransferTypeScreen: () -> Unit, closeActivity: () -> Unit) {
var showUploadSourceChoiceBottomSheet by rememberSaveable { mutableStateOf(false) }

BottomStickyButtonScaffold(
topBar = {
SwissTransferTobAppBar(
titleRes = R.string.importFilesScreenTitle,
navigationMenu = null,
TopAppBarButton.closeButton { /* TODO */ },
TopAppBarButton.closeButton { closeActivity() },
)
},
topButton = { modifier ->
Expand Down Expand Up @@ -74,6 +74,6 @@ fun ImportFilesScreen(navigateToTransferTypeScreen: () -> Unit) {
@Composable
private fun ImportFilesScreenPreview() {
SwissTransferTheme {
ImportFilesScreen {}
ImportFilesScreen({}, {})
}
}
6 changes: 3 additions & 3 deletions ...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/TransferTypeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
import com.infomaniak.swisstransfer.ui.utils.PreviewTablet

@Composable
fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit, popBack: () -> Unit) {
fun TransferTypeScreen(navigateToTransfer: (TransferType) -> Unit, popBack: () -> Unit, closeActivity: () -> Unit) {
Scaffold(topBar = {
SwissTransferTobAppBar(
titleRes = R.string.transferTypeScreenTitle,
navigationMenu = TopAppBarButton.backButton(popBack),
TopAppBarButton.closeButton { /* TODO */ },
TopAppBarButton.closeButton { closeActivity() },
)
}) { contentPaddings ->
Column(
Expand Down Expand Up @@ -108,6 +108,6 @@ enum class TransferType(
@Composable
private fun TransferTypeScreenPreview() {
SwissTransferTheme {
TransferTypeScreen({}) {}
TransferTypeScreen({}, {}, {})
}
}
Loading