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

GeoWidget Decouple Refactor #3020

Merged
merged 109 commits into from
May 20, 2024
Merged

GeoWidget Decouple Refactor #3020

merged 109 commits into from
May 20, 2024

Commits on Feb 2, 2024

  1. Set Location collector

    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    805dff0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd043e4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    959910e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b90e2ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ef81c7b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3436c06 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    655849c View commit details
    Browse the repository at this point in the history
  8. Cleanup

    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    bc1a415 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    35b49f6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6deac0b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    555d6d4 View commit details
    Browse the repository at this point in the history
  12. Clear locations on map

    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    d6e9e36 View commit details
    Browse the repository at this point in the history
  13. Code cleanup

    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    67f61ee View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    578a626 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    84cf995 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    5735e3c View commit details
    Browse the repository at this point in the history
  17. Create the GeoWidgetLauncherFragment

    - Responsible to launch the Geowidget module fragment
    - A place to define callbacks, listeners, and passing data to the map
    -
    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    55f3685 View commit details
    Browse the repository at this point in the history
  18. 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
    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    56c1d5b View commit details
    Browse the repository at this point in the history
  19. Cleanup

    FikriMilano committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    52ab271 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    50dd4bc View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Configuration menu
    Copy the full SHA
    2df139a View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Configuration menu
    Copy the full SHA
    b2c6688 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Configuration menu
    Copy the full SHA
    6010671 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Merge pull request #3054 from opensrp/2917

    [EUSM] 2917
    dubdabasoduba authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    51982fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a9561be View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3071 from opensrp/2941

    Default to “Satellite and Streets” View on Map View (WIP)
    dubdabasoduba authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    bc740bd View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'main' into 3002-geowidget-decouple-refactor

    # Conflicts:
    #	android/geowidget/src/main/java/org/smartregister/fhircore/geowidget/KujakuFhirCoreConverter.kt
    #	android/geowidget/src/main/java/org/smartregister/fhircore/geowidget/screens/GeoWidgetFragment.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
    aurangzaibumer committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    48fcc2d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2929d91 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04f714d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cdd1243 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/3002-geowidget-decouple-refactor…

    …' into 3002-geowidget-decouple-refactor
    aurangzaibumer committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    1574b67 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dba69e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Configuration menu
    Copy the full SHA
    b53129b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    715841f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eea39a7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3099 from opensrp/fix-map-view-toolbar

    Fix map view toolbar
    dubdabasoduba authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    62bbe02 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Configuration menu
    Copy the full SHA
    beb4650 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Configuration menu
    Copy the full SHA
    2890dfb View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Configuration menu
    Copy the full SHA
    1c5e5e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3168222 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    562149b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Configuration menu
    Copy the full SHA
    eb84d35 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Configuration menu
    Copy the full SHA
    d0ff1fc View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. WIP resolving feedback

    aurangzaibumer committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    814378b View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Configuration menu
    Copy the full SHA
    60e0633 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. configured map layers (#3127)

    * configured map layers
    
    * configured visibility of location button, plane switcher and floating button on mapview
    aurangzaibumer authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    318eb46 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    bb3791c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e5d23c1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cf199c3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dcab225 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. added configurable functionality of toggle button on Toolbar to switc…

    …h between Map and Register view
    aurangzaibumer committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    41350fe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64a7399 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e420c34 View commit details
    Browse the repository at this point in the history
  4. removed extra lines

    aurangzaibumer committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    88211c9 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3148 from opensrp/3139_switch_bw_map_register

    3139 switch bw map register
    dubdabasoduba authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    83e2f11 View commit details
    Browse the repository at this point in the history
  6. Merge branch '3002-geowidget-decouple-refactor' into default_map_view

    # Conflicts:
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/ui/launcher/GeoWidgetLauncherViewModel.kt
    aurangzaibumer committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    8d72889 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #3110 from opensrp/default_map_view

    Add Map view as default View
    dubdabasoduba authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    eae89d3 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'main' into 3002-geowidget-decouple-refactor

    # Conflicts:
    #	android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/ui/register/RegisterScreen.kt
    aurangzaibumer committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    0c31080 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Configuration menu
    Copy the full SHA
    0293e07 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c0b9e9d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fec1e35 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6025a87 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    eb4ad15 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Configuration menu
    Copy the full SHA
    41fce58 View commit details
    Browse the repository at this point in the history
  2. Merge branch '3002-geowidget-decouple-refactor' of github.com:opensrp…

    …/fhircore into 3002-geowidget-decouple-refactor
    FikriMilano committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    43b038a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    febd719 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    37e019e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cfae271 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    04cdb7e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch '3002-geowidget-decouple-refactor' of github.com:opensrp…

    …/fhircore into 3002-geowidget-decouple-refactor
    FikriMilano committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    9325ef2 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Configuration menu
    Copy the full SHA
    b662a6d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Configuration menu
    Copy the full SHA
    cd5931e View commit details
    Browse the repository at this point in the history
  2. 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 <[email protected]>
    hamza-vd and dubdabasoduba authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    6e54ff4 View commit details
    Browse the repository at this point in the history
  3. 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 <[email protected]>
    
    ---------
    
    Signed-off-by: Elly Kitoto <[email protected]>
    Co-authored-by: Hamza Ahmed Khan <[email protected]>
    Co-authored-by: Hamza Ahmed Khan <[email protected]>
    Co-authored-by: Elly Kitoto <[email protected]>
    4 people authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    54c0695 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    32b0047 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    06a7845 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Configuration menu
    Copy the full SHA
    55287dd View commit details
    Browse the repository at this point in the history
  2. 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 <[email protected]>
    aurangzaibumer and dubdabasoduba authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    8dff9c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. 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
    aurangzaibumer authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    cb932c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Configuration menu
    Copy the full SHA
    67b87d1 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/3002-geowidget-decouple-refactor…

    …' into 3002-geowidget-decouple-refactor
    aurangzaibumer committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    4bd64ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    28b1077 View commit details
    Browse the repository at this point in the history
  4. ran spotless

    aurangzaibumer committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    d3ef347 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/3002-geowidget-decouple-refactor…

    …' into 3002-geowidget-decouple-refactor
    aurangzaibumer committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    56853b1 View commit details
    Browse the repository at this point in the history
  6. ran spotless

    aurangzaibumer committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    2a19192 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. spotless ran

    aurangzaibumer committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0085f42 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Configuration menu
    Copy the full SHA
    63f4745 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Configuration menu
    Copy the full SHA
    b4ea497 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge branch 'main' into 3002-geowidget-decouple-refactor

    # Conflicts:
    #	android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt
    #	android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/MainNavigationScreen.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/navigation/NavigationArg.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainActivity.kt
    #	android/quest/src/main/java/org/smartregister/fhircore/quest/util/LocationUtils.kt
    #	android/quest/src/main/res/navigation/application_nav_graph.xml
    aurangzaibumer committed May 14, 2024
    Configuration menu
    Copy the full SHA
    a975734 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6199e6d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    334af50 View commit details
    Browse the repository at this point in the history
  4. feedback updated

    aurangzaibumer committed May 14, 2024
    Configuration menu
    Copy the full SHA
    a8378d6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e091688 View commit details
    Browse the repository at this point in the history
  6. 3155 cherry pick (#3260)

    * Fix configuration of add location button on map view
    
    * feedback updated
    aurangzaibumer authored May 14, 2024
    Configuration menu
    Copy the full SHA
    168579b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8d367e7 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge remote-tracking branch 'origin/3002-geowidget-decouple-refactor…

    …' into 3002-geowidget-decouple-refactor
    aurangzaibumer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    6d56527 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into 3002-geowidget-decouple-refactor

    # Conflicts:
    #	android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt
    aurangzaibumer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    ed50534 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4611eaf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    31db813 View commit details
    Browse the repository at this point in the history
  5. spotless ran

    aurangzaibumer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    3dc874b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7a572db View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1b8a54a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    dc05885 View commit details
    Browse the repository at this point in the history
  9. deleted failed tests

    aurangzaibumer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    2c6bcf5 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Configuration menu
    Copy the full SHA
    898505a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48cc104 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    53ad70d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    49cb040 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/3002-geowidget-decouple-refactor…

    …' into 3002-geowidget-decouple-refactor
    aurangzaibumer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    cc1f706 View commit details
    Browse the repository at this point in the history