Skip to content

merge Popup feature branch into v.next #502

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

Merged
merged 26 commits into from
Jul 11, 2024
Merged

Conversation

sorenoid
Copy link
Collaborator

@sorenoid sorenoid commented Jul 9, 2024

Related to issue: #

Description:

Popup toolkit component
Popup microapp

Pre-merge Checklist

sorenoid and others added 22 commits April 30, 2024 18:18
* add Popup component and microapp

* add bottom sheet and api file.

* add READMEs

* address review feedback

* change name in android manifest that were changed in previous commit

* Update microapps/PopupApp/README.md

Co-authored-by: Erick Lopez Solis <[email protected]>

* Update toolkit/popup/README.md

Co-authored-by: Erick Lopez Solis <[email protected]>

* add initialization support to the Popup composable.

---------

Co-authored-by: Soren Roth <[email protected]>
Co-authored-by: Erick Lopez Solis <[email protected]>
* pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose)

* Address warnings from version upgrades.
pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose).

* preliminary setup of state collection.

* add initialization support to the Popup composable.

* workaround for known issue in gradle task graph progress. opt in for experimental coroutine API

* view model added to the Popup App.

* move files around. make state objects Parcelable.

* ensure states are not created until expressions are evaluated.

* Update toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt

Co-authored-by: Erick Lopez Solis <[email protected]>

* remove Parcelable super class from base state class

* remove comment

---------

Co-authored-by: Soren Roth <[email protected]>
Co-authored-by: Erick Lopez Solis <[email protected]>
* pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose)

* Address warnings from version upgrades.
pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose).

* preliminary setup of state collection.

* add initialization support to the Popup composable.

* workaround for known issue in gradle task graph progress. opt in for experimental coroutine API

* view model added to the Popup App.

* move files around. make state objects Parcelable.

* ensure states are not created until expressions are evaluated.

* Update toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt

Co-authored-by: Erick Lopez Solis <[email protected]>

* remove Parcelable super class from base state class

* make expandable card more like field maps.

* add defaults

* address PR feedback

* fix formatting

* default to expandable card expanded

---------

Co-authored-by: Soren Roth <[email protected]>
Co-authored-by: Erick Lopez Solis <[email protected]>
* pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose)

* Address warnings from version upgrades.
pull compose bom into androidTest and test Implementations when needed. Add missing version for artifact not covered by compose bom (androidx-activity:activity-compose).

* preliminary setup of state collection.

* add initialization support to the Popup composable.

* workaround for known issue in gradle task graph progress. opt in for experimental coroutine API

* view model added to the Popup App.

* move files around. make state objects Parcelable.

* ensure states are not created until expressions are evaluated.

* attachment initial support

* Revert "attachment initial support"

This reverts commit c888b6b.

* attachment initial support

* Atachments hooked up to state collection and rendering in the Popup.

* remove file from other branch

* Update toolkit/popup/src/main/java/com/arcgismaps/toolkit/popup/Popup.kt

Co-authored-by: Erick Lopez Solis <[email protected]>

* remove Parcelable super class from base state class

* make expandable card more like field maps.

* add defaults

* address PR feedback

* fix formatting

* default to expandable card expanded

* merge in expandable card refactors

* support document and other content types.

* add all shapes sizes and color to theme defaults object

* remove newlines

* remove element count, add toggleable parameter to expandable card

---------

Co-authored-by: Soren Roth <[email protected]>
Co-authored-by: Erick Lopez Solis <[email protected]>
* Media element images wip

* Media element with support for images

* use colors from defaults

* fix capitalization

---------

Co-authored-by: Soren Roth <[email protected]>
* Media element images wip

* Media element with support for images

* chart image support, dark mode support for media.

* update SDK dependency for Popups

* tweak padding of charts vs images

---------

Co-authored-by: Soren Roth <[email protected]>
* chart support for AsyncImage from saved files

* remove unused lambda. update comment

---------

Co-authored-by: Soren Roth <[email protected]>
* chart support for AsyncImage from saved files

* remove unused lambda. update comment

* d

* copy attachments on first fetch and pass down into the composition

---------

Co-authored-by: Soren Roth <[email protected]>
* wip

* Basic support for DynamicEntity in Popups

* minor formatting

* merge in media FileViewer

* only animate the fields element when the dynamic entity pulses -- for now.

* remove unused named lambda parameter. remove newline

---------

Co-authored-by: Soren Roth <[email protected]>
@eri9000 eri9000 self-requested a review July 9, 2024 22:26
Copy link
Collaborator

@eri9000 eri9000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one suggestion, otherwise LGTM

val map = ArcGISMap(
PortalItem(
Portal.arcGISOnline(Portal.Connection.Authenticated),
streamServiceMap
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The map fourteenersId would be better as a default for now

@sorenoid sorenoid merged commit 93041ab into v.next Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants