-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Adds ExpandableCard State and uses it in TraceOptions #619
Merged
eri9000
merged 9 commits into
feature-branches/utilitynetworktrace
from
Erick/ExpandableCardState_1
Oct 24, 2024
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
162fabb
adds ExpandableCard State
eri9000 da9b7d6
Extract class into file
eri9000 47c04e7
rename expandable card and add toggle
eri9000 b5f44a9
refactor ExpandableCard with Label
eri9000 6472212
change traceConfigurations to use ExpandableCard with label
eri9000 30ba218
Merge branch 'feature-branches/utilitynetworktrace' into Erick/Expand…
eri9000 cc2b67d
update method signature
eri9000 338b2fb
code review suggestions
eri9000 aa8b2be
review suggestions
eri9000 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
68 changes: 68 additions & 0 deletions
68
...t/sharedlib/src/main/java/com/arcgismaps/toolkit/ui/expandablecard/ExpandableCardState.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,68 @@ | ||
| /* | ||
| * Copyright 2024 Esri | ||
| * | ||
| * 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 | ||
| * | ||
| * http://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.arcgismaps.toolkit.ui.expandablecard | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.saveable.Saver | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
|
|
||
| /** | ||
| * State object that can be hoisted to control the [ExpandableCard]. | ||
| * | ||
| * In most cases, this will be created using [rememberExpandableCardState]. | ||
| * @since 200.6.0 | ||
| */ | ||
| class ExpandableCardState internal constructor(initialExpandedState: Boolean) { | ||
| /** | ||
| * The expanded state of the [ExpandableCard]. | ||
| * @since 200.6.0 | ||
| */ | ||
| internal var isExpanded by mutableStateOf(initialExpandedState) | ||
| private set | ||
|
|
||
| /** | ||
| * Toggles the expanded state of the [ExpandableCard]. | ||
| * | ||
| * @since 200.6.0 | ||
| */ | ||
| fun toggle() { | ||
| isExpanded = !isExpanded | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Remember the state of [ExpandableCard]. | ||
| * | ||
| * @param isExpanded the initial expanded state | ||
| * @since 200.6.0 | ||
| */ | ||
| @Composable | ||
| fun rememberExpandableCardState( | ||
| isExpanded: Boolean = true | ||
| ): ExpandableCardState { | ||
| return rememberSaveable( | ||
| saver = Saver( | ||
| save = { it.isExpanded}, | ||
| restore = { ExpandableCardState(it) } | ||
| ) | ||
| ) { | ||
| ExpandableCardState(isExpanded) | ||
| } | ||
| } |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we removing these padding values ?
They are making the result screen look congested.
Before
After
Also notice that AdvancedOptions is smaller that Feature and FunctionResult Card in the after picture.
It needs to be the same size the ones above it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be fixed in a follow up PR.
This padding value will go on the outside composable for
TraceResultas a Spacer.