Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Provide onset of symptoms before upload (EXPOSUREAPP-1605) #1170

Merged
merged 94 commits into from
Sep 17, 2020
Merged

Provide onset of symptoms before upload (EXPOSUREAPP-1605) #1170

merged 94 commits into from
Sep 17, 2020

Conversation

@Oliver-Zimmerman
Copy link
Contributor

@Oliver-Zimmerman Oliver-Zimmerman commented Sep 15, 2020 •
edited
Loading

Description

Implemented feature where the user provides the onset of symptoms before uploading a positive test result.

  • Created custom calendar widget
  • Replaced generation of transmission risk vector
  • Created fragments for symptom introduction and symptom calendar screens
  • Created necessary XML views for fragments
  • Adjusted SubmissionViewModel for required fragments

Steps to reproduce

  1. Submit a new positive test via QR code.
  2. Select one of three buttons on symptom introduction screen, once one button is selected, the others should be unselected. Also, the user should not be able to navigate until a button has been selected.
  3. Navigate to calendar screen, select either an exact date or range via buttons. Selecting a date or range should unselect other options. User should not be able to navigate until an option is selected.

Oliver-Zimmerman and others added 30 commits September 4, 2020 15:03
@Oliver-Zimmerman
initial commit of new fragment for symptom screen
25dc99e
@Oliver-Zimmerman
Added relevant strings for symptom screen. Started editing xml of ini…
d4aea33 
…tial symptom screen
@Oliver-Zimmerman
Addded 3 selection options within symptom screen
e5ad0d1
@Oliver-Zimmerman
button id name change to something more relevant
eec2835
@Oliver-Zimmerman
ID changes to be something more relevant to symptom scenerio.
ad0186f
@Oliver-Zimmerman
Implemented symptom initial screen logic. Temporary nav for testing.
838200f
@Oliver-Zimmerman
CircleCI formatting
7ebeda4
@Oliver-Zimmerman
Adapted interoperability test provided by apopov
0af97bf
@Oliver-Zimmerman
Added accessibilty announcement on resume, fixed navigation for main …
8671944 
…page
@Oliver-Zimmerman
circleCI indentation fix
fa19067
@harambasicluka
removed ar & ru and updated default strings
954743f
@Oliver-Zimmerman
Adaption to ViewModel logic. Not yet complete
01e352d 
Adaption to ViewModel logic, attempting to align with implementation done with some interoporibility tasks: reusable layout files, etc.
@Oliver-Zimmerman
More ViewModel transformation additions
38d6174
@Oliver-Zimmerman
revert nav from test. Circle CI formatting changes
da34834
@Oliver-Zimmerman
Update SubmissionSymptomIntroductionFragment.kt
2d20aa8
@Oliver-Zimmerman
Removed old fragment based test
3f149c1
@Oliver-Zimmerman
Will implement navigation during marry session.
cbd4ee4
@Oliver-Zimmerman
Update SubmissionViewModel.kt
4af9ba4
@Oliver-Zimmerman
Calendar button selection screen + required strings
b0d94bc
@chris-cwa
Merge branch 'dev' into feature/implement-initial-symptom-screen
c943091
@AlexanderAlferov
Custom calendar view
3314ea7
@AlexanderAlferov
Accessibility improved
3f8dc4d
@chris-cwa
introduced data types for symptoms
2d01e80
@chris-cwa
represent date by long in millis
6ff60a2
@chris-cwa
new TransmissionRiskVector
c234b3f
@AlexanderAlferov
Constants and formatting
ca4cdb8
@Oliver-Zimmerman
Naming changes requested
6a2938a
@Oliver-Zimmerman
Better event naming
b9e38d2
@Oliver-Zimmerman
Update fragment_submission_symptom_intro.xml
7755d3d
@Oliver-Zimmerman
Merge branch 'feature/implement-initial-symptom-screen' into feature/…
b5e4802 
…symptom-calendar-surrounding-parts
Oliver-Zimmerman and others added 16 commits September 16, 2020 17:14
d4rken
d4rken previously approved these changes Sep 17, 2020
View reviewed changes
Copy link
Member

@d4rken d4rken left a comment

Choose a reason for hiding this comment

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

lgtm

harambasicluka
harambasicluka previously approved these changes Sep 17, 2020
View reviewed changes
@d4rken d4rken dismissed stale reviews from harambasicluka, jakobmoellerdev, and themself via f6caed3 September 17, 2020 11:08
@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 17, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 2 Code Smells

16.8% 16.8% Coverage
0.0% 0.0% Duplication

@d4rken d4rken merged commit 8c7e050 into release/1.4.x Sep 17, 2020
@d4rken d4rken deleted the feature/EXPOSUREAPP_2489 branch September 17, 2020 12:05
@d4rken d4rken added this to the 1.4.0 milestone Oct 7, 2020
@daimpi daimpi mentioned this pull request Oct 23, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

5 more reviewers

@chris-cwa chris-cwa chris-cwa left review comments

@d4rken d4rken d4rken left review comments

@harambasicluka harambasicluka harambasicluka left review comments

@jakobmoellerdev jakobmoellerdev jakobmoellerdev left review comments

@janetback janetback janetback left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

maintainers Tag pull requests created by maintainers

Projects

None yet

Milestone

1.4.0

Development

Successfully merging this pull request may close these issues.

8 participants

@Oliver-Zimmerman @d4rken @harambasicluka @jakobmoellerdev @janetback @chris-cwa @AlexanderAlferov