-
Notifications
You must be signed in to change notification settings - Fork 581
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 #211 from slothwriter/update-add-components
Added a stepper and a slider
- Loading branch information
Showing
7 changed files
with
239 additions
and
7 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
48 changes: 48 additions & 0 deletions
48
...va/com/example/android/wearable/composeadvanced/presentation/ui/userinput/SliderScreen.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,48 @@ | ||
| /* | ||
| * Copyright 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.example.android.wearable.composeadvanced.presentation.ui.userinput | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.wear.compose.material.InlineSlider | ||
|
|
||
| /** | ||
| * Displays a Slider, which allows users to make a selection from a range of values. | ||
| */ | ||
| @Composable | ||
| fun SliderScreen( | ||
| displayValue: Int, | ||
| onValueChange: (Int) -> Unit | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(top = 10.dp), | ||
| verticalArrangement = Arrangement.Center | ||
| ) { | ||
| InlineSlider( | ||
| value = displayValue, | ||
| onValueChange = onValueChange, | ||
| valueProgression = 1..10, | ||
| segmented = true | ||
| ) | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...a/com/example/android/wearable/composeadvanced/presentation/ui/userinput/StepperScreen.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,48 @@ | ||
| /* | ||
| * Copyright 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.example.android.wearable.composeadvanced.presentation.ui.userinput | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.wear.compose.material.Stepper | ||
| import androidx.wear.compose.material.Text | ||
|
|
||
| /** | ||
| * Displays a Stepper, which allows users to make a selection from a range of values. | ||
| */ | ||
| @Composable | ||
| fun StepperScreen( | ||
| displayValue: Int, | ||
| onValueChange: (Int) -> Unit | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(top = 10.dp), | ||
| verticalArrangement = Arrangement.Center | ||
| ) { | ||
| Stepper( | ||
| value = displayValue, | ||
| onValueChange = onValueChange, | ||
| valueProgression = 1..10 | ||
| ) { Text("Value: $displayValue") } | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
...e/android/wearable/composeadvanced/presentation/ui/userinput/UserInputComponentsScreen.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,78 @@ | ||
| /* | ||
| * Copyright 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.example.android.wearable.composeadvanced.presentation.ui.userinput | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.wear.compose.material.CompactChip | ||
| import androidx.wear.compose.material.Text | ||
| import com.example.android.wearable.composeadvanced.R | ||
|
|
||
| /** | ||
| * Displays a value by using a Stepper or a Slider | ||
| */ | ||
| @Composable | ||
| fun UserInputComponentsScreen( | ||
| value: Int, | ||
| onClickStepper: () -> Unit, | ||
| onClickSlider: () -> Unit | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(vertical = 10.dp) | ||
| .padding(horizontal = 10.dp), | ||
| verticalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterVertically) | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.fillMaxWidth(1f), | ||
| text = "${stringResource(R.string.selected_value)}: $value", | ||
| textAlign = TextAlign.Center | ||
| ) | ||
|
|
||
| CompactChip( | ||
| onClick = onClickStepper, | ||
| label = { | ||
| Text( | ||
| stringResource(R.string.stepper_label), | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
| } | ||
| ) | ||
|
|
||
| CompactChip( | ||
| onClick = onClickSlider, | ||
| label = { | ||
| Text( | ||
| stringResource(R.string.slider_label), | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
| } |
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