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

[UI] Family test selection and consent screen (EXPOSUREAPP-12316, EXPOSUREAPP-12317) #4951

Merged
merged 22 commits into from
Mar 24, 2022
Merged

[UI] Family test selection and consent screen (EXPOSUREAPP-12316, EXPOSUREAPP-12317) #4951

merged 22 commits into from
Mar 24, 2022

Conversation

AlexanderAlferov
Copy link
Contributor

@AlexanderAlferov AlexanderAlferov commented Mar 17, 2022 •
edited
Loading

Whats new

Test type selection screen

Screenshot 2022-03-17 at 18 12 56

##Family member consent consent

Screenshot 2022-03-17 at 20 04 16

Story

Story
Test type selection
Family member

How to test

  1. scan any test
  2. check test type selection fragment
  3. press "Für andere" button
  4. check family consent fragment
  5. check that with empty name confirmation button is not enabled
  6. type any name
  7. check confirmation button is now enabled

ToDo

  • Strings
  • New icons and illustration
  • Layouts
  • Wiring up

@AlexanderAlferov AlexanderAlferov added ui Issue related to UI aspects maintainers Tag pull requests created by maintainers text change PRs with text changes. labels Mar 17, 2022
@AlexanderAlferov AlexanderAlferov added this to the 2.21.0 milestone Mar 17, 2022
@AlexanderAlferov
Merge remote-tracking branch 'origin/release/2.21.x' into feature/123…
c7ee698 
…16-12317-family-test-selection-and-consent

# Conflicts:
#	Corona-Warn-App/src/main/res/layout/fragment_family_test_consent.xml
#	Corona-Warn-App/src/main/res/layout/fragment_test_registration_selection.xml
#	Corona-Warn-App/src/main/res/values-de/family_tests_strings.xml
#	Corona-Warn-App/src/main/res/values/family_tests_strings.xml
Ein-Tim
Ein-Tim suggested changes Mar 17, 2022
View reviewed changes
Copy link
Contributor

@Ein-Tim Ein-Tim left a comment

Choose a reason for hiding this comment

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

Bitte nicht "Ihr Testergebnis" nutzen, wenn es um das Testergebnis eines Familienmitgliedes geht. Das wird sonst verwirrend.

@AlexanderAlferov
Copy link
Contributor Author

Bitte nicht "Ihr Testergebnis" nutzen, wenn es um das Testergebnis eines Familienmitgliedes geht. Das wird sonst verwirrend.

@KathrinLuecke FYI 👀

Ein-Tim
Ein-Tim reviewed Mar 21, 2022
View reviewed changes
Copy link
Contributor

@Ein-Tim Ein-Tim left a comment

Choose a reason for hiding this comment

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

Make it clearer what is meant here.

Corona-Warn-App/src/main/res/values-de/family_tests_strings.xml Outdated Show resolved Hide resolved
@KathrinLuecke
Copy link
Contributor

It looks like the screens for Android are not up-to-date in Figma. They are different from the iOS screens with regards to the wording. I will aks Anna-Maria to update them, then the texts here have to be adapted.

@KathrinLuecke
Copy link
Contributor

iOS:
image

KathrinLuecke
KathrinLuecke previously approved these changes Mar 22, 2022
View reviewed changes
Copy link
Contributor

@KathrinLuecke KathrinLuecke left a comment

Choose a reason for hiding this comment

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

UA approved

@AlexanderAlferov
Merge remote-tracking branch 'origin/release/2.21.x' into feature/123…
3dec0e9 
…16-12317-family-test-selection-and-consent

# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/family_tests_strings.xml
#	Corona-Warn-App/src/main/res/values/family_tests_strings.xml
@AlexanderAlferov
Legal strings fix
ae80f9c
@AlexanderAlferov AlexanderAlferov marked this pull request as ready for review March 22, 2022 13:05
@AlexanderAlferov AlexanderAlferov requested review from a team March 22, 2022 13:05
CV113
CV113 previously approved these changes Mar 22, 2022
View reviewed changes
Copy link
Contributor

@CV113 CV113 left a comment

Choose a reason for hiding this comment

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

UA approved

@mtwalli mtwalli self-assigned this Mar 22, 2022
mtwalli
mtwalli reviewed Mar 22, 2022
View reviewed changes
.../main/java/de/rki/coronawarnapp/familytest/ui/selection/TestRegistrationSelectionFragment.kt Outdated Show resolved Hide resolved
.../main/java/de/rki/coronawarnapp/familytest/ui/selection/TestRegistrationSelectionFragment.kt Outdated Show resolved Hide resolved
.../main/java/de/rki/coronawarnapp/familytest/ui/selection/TestRegistrationSelectionFragment.kt Outdated Show resolved Hide resolved
...n-App/src/main/java/de/rki/coronawarnapp/familytest/ui/consent/FamilyTestConsentViewModel.kt Outdated Show resolved Hide resolved
Corona-Warn-App/src/main/res/layout/fragment_family_test_consent.xml Outdated Show resolved Hide resolved
Corona-Warn-App/src/main/res/layout/fragment_family_test_consent.xml Outdated Show resolved Hide resolved
Corona-Warn-App/src/main/res/layout/fragment_family_test_consent.xml Outdated Show resolved Hide resolved
Corona-Warn-App/src/main/res/layout/fragment_test_registration_selection.xml Outdated Show resolved Hide resolved
Corona-Warn-App/src/main/res/layout/fragment_test_registration_selection.xml Outdated Show resolved Hide resolved
@SamuraiKek SamuraiKek self-assigned this Mar 23, 2022
mtwalli
mtwalli reviewed Mar 23, 2022
View reviewed changes
Copy link
Contributor

@mtwalli mtwalli left a comment

Choose a reason for hiding this comment

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

Great job ,slick UI

.../main/java/de/rki/coronawarnapp/familytest/ui/selection/TestRegistrationSelectionFragment.kt Show resolved Hide resolved
mtwalli
mtwalli previously approved these changes Mar 24, 2022
View reviewed changes
Copy link
Contributor

@mtwalli mtwalli left a comment

Choose a reason for hiding this comment

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

🚀🚀🚀🚀🚀

@sonarcloud
Copy link

sonarcloud bot commented Mar 24, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

SamuraiKek
SamuraiKek approved these changes Mar 24, 2022
View reviewed changes
Copy link
Contributor

@SamuraiKek SamuraiKek left a comment

Choose a reason for hiding this comment

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

Let's go! 🚀

@mtwalli mtwalli merged commit 7852922 into release/2.21.x Mar 24, 2022
@mtwalli mtwalli deleted the feature/12316-12317-family-test-selection-and-consent branch March 24, 2022 15:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Ein-Tim Ein-Tim Ein-Tim requested changes

@SamuraiKek SamuraiKek SamuraiKek approved these changes

@mtwalli mtwalli mtwalli left review comments

@KathrinLuecke KathrinLuecke Awaiting requested review from KathrinLuecke

@CV113 CV113 Awaiting requested review from CV113

Assignees

@SamuraiKek SamuraiKek

@mtwalli mtwalli

Labels
maintainers Tag pull requests created by maintainers text change PRs with text changes. ui Issue related to UI aspects
Projects
None yet
Milestone
2.21.0
Development

Successfully merging this pull request may close these issues.
6 participants
@AlexanderAlferov @KathrinLuecke @SamuraiKek @mtwalli @Ein-Tim @CV113