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.

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

added dynamic trailing icons on toolbar with on click functionality #3198

Merged

Conversation

aurangzaibumer
Copy link
Contributor

@aurangzaibumer aurangzaibumer commented Apr 17, 2024

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes : #3140

Engineer Checklist

  • I have written Unit tests for any new feature(s) and edge cases for bug fixes
  • I have added any strings visible on UI components to the strings.xml file
  • I have updated the CHANGELOG.md file for any notable changes to the codebase
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
  • I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
  • I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

  • I have verified Unit tests have been written for any new feature(s) and edge cases
  • I have verified any strings visible on UI components are in the strings.xml file
  • I have verifed the CHANGELOG.md file has any notable changes to the codebase
  • I have verified the solution has been implemented in a configurable and generic way for reuseable components
  • I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

@aurangzaibumer aurangzaibumer self-assigned this Apr 17, 2024
@aurangzaibumer aurangzaibumer marked this pull request as ready for review April 17, 2024 12:01
@dubdabasoduba dubdabasoduba merged commit 8dff9c0 into 3002-geowidget-decouple-refactor Apr 18, 2024
@dubdabasoduba dubdabasoduba deleted the dynamic-trailing-icons-toolbar branch April 18, 2024 07:18
ellykits added a commit that referenced this pull request May 20, 2024
* Set Location collector

* Move geowidget config to quest

* Code re-structure on setting up views

* Setup Toolbar and Mapview Listener

* Invoke onClick location and onAdding new location callbacks

* Code-restructure on zooming locations

* Create builder for geowidget fragment

* Cleanup

* Define geowidget location

* Create location features stateflow

* Allow adding locations to map

* Clear locations on map

* Code cleanup

* Rename navigation to GeoWidgetLauncher

* Direct navigation graph to the geowidget launcher

* Re-route handleClickEvent to geowidget launcher

* Create the GeoWidgetLauncherFragment

- Responsible to launch the Geowidget module fragment
- A place to define callbacks, listeners, and passing data to the map
-

* Create the GeoWidgetLauncherViewModel

- Responsible in getting the locations to be populated into the geowidget module
- The locationsFlow is the data source of truth
- Responsible to launch a questionnaire and receiving its response

* Cleanup

* Updated search bar config to hide/show it

* added layer view for street and satellite view

* fixed package error issue

* fixed package path related issues for app theme and color

* fixed added street + satellite layer view in map

* Fixed rendering stored locations from the database on the map view

* WIP fixing map view toolbar

* adding set location dialog

* Fixed showing Map view as Default view

* reduced delay in rendering locaions

* WIP resolving feedback

* WIP working on switching between map and register view through toggle view button

* configured map layers (#3127)

* configured map layers

* configured visibility of location button, plane switcher and floating button on mapview

* WIP added toggle button on topbar

* fixed compilation error

* added toggle icon on toolbar

* added configurable functionality of toggle button on Toolbar to switch between Map and Register view

* removed unnecessary code

* disable set location dialog for now

* removed extra lines

* Lazy load geoWidgetConfiguration

* Refactor "context" to "color"

* Move latitude and longitude action parameter to configs

* Rename launchQuestionnaire method

* Remove un-used context related code

* Fixed location/play service library issue - thanks to Ben

* enabled all map layers by default for now

* Make GeoWIdget icons configurable (#3185)

* Initial Commit

* fetch related encounters

* Update models

* Refactor GeowWidgetLocation to Feature

* Update GeowWidget Config Model

* Update Feature Geometry model

* Fix location id value

* PR feedback changes

* Refactor constants

* Fix navigation graph for mapview

---------

Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com>

* Summary Bottom Sheet Opening from GeoWidget Map (#3183)

* WIP added summary bottom sheet for geo widget

* fixed maplayer to enum

* Initial Commit

* fetch related encounters

* fixed maplayer default value

* Update models

* converting bottom sheet view into configuration

* Refactor GeowWidgetLocation to Feature

* Update GeowWidget Config Model

* merged hamza's work for retrieve locations

* Update Feature Geometry model

* commiting half commit before merging Hamza's PR

* Fixed working summary bottom sheet opening directly through the widget fragment

* Fixed uncessary imports

* removed unnecessary code

* Refactor config for map layer

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

---------

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Co-authored-by: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com>
Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com>

* fixed import and gradle issue

* added dynamic trailing icons on toolbar with on click functionality (#3198)

* added dynamic trailing icons on toolbar with on click functionality

* added style for bottom sheet to round the corners from the top

---------

Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com>

* Dynamic trailing icons toolbar (#3203)

* added dynamic trailing icons on toolbar with on click functionality

* added style for bottom sheet to round the corners from the top

* added toggle map view icon on register config

* removed dropdownmenu icons for now

* ran spotless

* ran spotless

* spotless ran

* conflicts resolved and fixed imports

* Fix configuration of add location button on map view

* feedback updated

* 3155 cherry pick (#3260)

* Fix configuration of add location button on map view

* feedback updated

* Adding tests for geowidget work

* WIP fixing compilation error for tests

* spotless ran

* fixed some compilation errors on test

* fixed some UI tests compilation

* added more tests in geowidgetviewmodel

* deleted failed tests

* added more tests in geowidgetviewmodel

* removed failing test and class to check the overall coverage

---------

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
Co-authored-by: Aurangzaib Umer <aurangzaib.umer@venturedive.com>
Co-authored-by: Benjamin Mwalimu <dubdabasoduba@gmail.com>
Co-authored-by: aurangzaibumer <35099184+aurangzaibumer@users.noreply.github.com>
Co-authored-by: Hamza Ahmed Khan <70560433+hamza-vd@users.noreply.github.com>
Co-authored-by: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com>
Co-authored-by: Peter Lubell-Doughtie <peter@ona.io>
Co-authored-by: Lentumunai Mark <90028422+Lentumunai-Mark@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants