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

FE-580 Feature/annotation group #32

Merged
merged 7 commits into from
Feb 16, 2024
Merged

FE-580 Feature/annotation group #32

merged 7 commits into from
Feb 16, 2024

Conversation

PavlosTze
Copy link
Member

@PavlosTze PavlosTze commented Feb 12, 2024

Why?

Integrate new annotation_summary property.

How?

  • Added annotationSummary in the API Models and RewardsAnnotationGroup which is the new structure we will use.
  • Sort the new summary annotations based on severity (error -> warning -> info) before populating the UI
  • Minor enhancements in MessageCardView in order to implement the new annotations
  • Changes in RewardProblemsAdapter to use the new RewardsAnnotatonGroup as input data

Testing

Either run localMockDebug flavor or the dev build (which communicates with the dev API) and ensure everything is OK rewards-related.

Others:

Replace the following:

  1. device.relation == DeviceRelation.OWNED
  2. device.relation == DeviceRelation.FOLLOWED
  3. device.relation == DeviceRelation.UNFOLLOWED

With the respective extension functions:

  1. device.isOwned()
  2. device.isFollowed()
  3. device.isUnfollowed()

Copy link
Collaborator

@pantelisss pantelisss left a comment

Choose a reason for hiding this comment

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

👌
Check my comment and is up to you

app/src/main/java/com/weatherxm/ui/common/UIModels.kt Outdated Show resolved Hide resolved
Copy link
Collaborator

@JohnFrontzos JohnFrontzos left a comment

Choose a reason for hiding this comment

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

LGTM! Tho the majority of changes are out of this PR scope (talking about the helper functions)

@PavlosTze PavlosTze merged commit fa770fa into main Feb 16, 2024
3 checks passed
@PavlosTze PavlosTze deleted the feature/annotation-group branch February 16, 2024 07:37
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.

4 participants