-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #66 from Infomaniak/fix-settings-option-style
Fix settings option style
- Loading branch information
Showing
7 changed files
with
139 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...in/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/OptionScaffold.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Infomaniak SwissTransfer - Android | ||
| * Copyright (C) 2024 Infomaniak Network SA | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.infomaniak.swisstransfer.ui.screen.main.settings.components | ||
|
|
||
| import androidx.annotation.StringRes | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableIntStateOf | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Modifier | ||
| import com.infomaniak.swisstransfer.ui.components.SwissTransferTobAppBar | ||
| import com.infomaniak.swisstransfer.ui.components.TopAppBarButton | ||
|
|
||
| @Composable | ||
| fun OptionScaffold( | ||
| @StringRes topAppBarTitleRes: Int, | ||
| @StringRes optionTitleRes: Int, | ||
| enumEntries: List<SettingOption>, | ||
| selectedSettingOptionPosition: Int, | ||
| setSelectedSettingOptionPosition: (Int) -> Unit, | ||
| navigateBack: (() -> Unit)? = null, | ||
| ) { | ||
| Scaffold(topBar = { | ||
| val canDisplayBackButton = navigateBack?.let { TopAppBarButton.backButton(navigateBack) } | ||
| SwissTransferTobAppBar(topAppBarTitleRes, navigationMenu = canDisplayBackButton) | ||
| }) { paddingsValue -> | ||
| Column( | ||
| modifier = Modifier | ||
| .verticalScroll(rememberScrollState()) | ||
| .padding(paddingsValue), | ||
| ) { | ||
| OptionTitle(titleRes = optionTitleRes) | ||
|
|
||
| var selectedItem by rememberSaveable { mutableIntStateOf(selectedSettingOptionPosition) } | ||
| SingleSelectOptions(enumEntries, { selectedItem }, { position -> | ||
| selectedItem = position | ||
| setSelectedSettingOptionPosition(position) | ||
| }) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.