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

Statistics (EXPOSUREAPP-3674) #2166

Merged
merged 45 commits into from
Jan 22, 2021
Merged

Conversation

d4rken
Copy link
Member

@d4rken d4rken commented Jan 20, 2021

Don't squash this.

d4rken and others added 30 commits January 6, 2021 16:54
…-3674) #2043

* Skeletons for showing statistics in the home screen feed.
Introduce nested horizontally scrolling recycler view that supports dynamic content updates.

* Fix homescreen unit test.

* LINT doesn't like the TODO.

* Refactor nested if to flatter when.
…to-1.12.x

Merge 1.11.x into 1.12.x (DEV)
* Add placeholders for statistic UIs.

* Satisfy the linter.
* Texts for statistics explanation screen

* Added double quotes to statistics text
…new-infections-strings

# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
…-infections-strings

Screen: Confirmed New Infections - string update (EXPOSUREAPP-4510)
* Texts for statistics explanation screen

* Added double quotes to statistics text

* Text change due to outdated moockups

* FAQ link label added
* styles and strings

* styles and strings

* styles and strings
…atter-for-statistics-values

Create NumberFormatter for Statistics Values (EXPOSUREAPP-4652)
* Texts for statistics explanation screen

* Added double quotes to statistics text

* Text change due to outdated moockups

* FAQ link label added

* Removed dot from 7-tage-mittlewert text
* Replace mock data with data loaded from server.

* Revert unrelated change.

* Some refactoring, add a generic statistics scope annotation.
Clear retrofit cache on clear.

* Clear statistic data on app reset.

* Unit tests for StatisticsCache.kt

* Implement tests for StatisticsModule init.

* Add tests for statistics api.

* Add statistics server tests that check signature validation behavior.

* Add tests for StatisticsProvider behavior.

* Tests for parsing statistics data.

* LINTING

* Add helper methods to access each cards values, and validate card KeyFigure count and types before exposing them.

* LINTs.

* Rename variable.
* Implement StatisticsNumberValueFormatter.kt and add tests

* Fix ktlint issues

* Improve StatisticsNumberValueFormatter.kt

* Reduce parameters for formatter, adapt test

* Define formatting function as top-level function instead of a function in object
* TrendArrowView

* remove redundant frame layout

* add content description
* Introduce getFormattedDate()

* Update strings
* TrendArrowView

* card 7-day-r-value implementation

* margins and ripple

* use decimals provided by backend
* update Infections Card layout

* Revert some changes

* Add primary label to statistics cards

* Implement strings

* Update Infections Card design

* Update Infections Card design

* Ignore MissingConstraints to satisfy lint

* Add night drawable

* Update dimensions

* Update design

* Remove icon duplicate

* use StatisticsCardInfoButton style

* Update layout
* Adjust layout to not cut off text on large text sizes.

* Adjust layout to not cut off text on large text sizes.
@d4rken d4rken added the maintainers Tag pull requests created by maintainers label Jan 20, 2021
@d4rken d4rken added this to the 1.11.0 milestone Jan 20, 2021
@d4rken d4rken requested review from a team January 20, 2021 12:05
@d4rken d4rken added the author merge PR to be merged by author label Jan 20, 2021
d4rken and others added 3 commits January 20, 2021 14:57
# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/HomeFragmentViewModelTest.kt
* Unify cards design

* Change cards height

* Layout update after merge

* Revert layout changes
* Texts for statistics explanation screen

* Initial commit with illustration and layout

* First descriptions added

* Legend added

* Trends added

* Navigation added

* Night mode image added

* Complete screen

* Lint fix

* Image update

* Refactor
@harambasicluka harambasicluka self-assigned this Jan 20, 2021
harambasicluka
harambasicluka previously approved these changes Jan 20, 2021
@harambasicluka
Copy link
Contributor

Please do not merge until we have the final decision.

harambasicluka and others added 5 commits January 21, 2021 09:56
…ormation screen (EXPOSUREAPP-4704) (#2175)

* Override equals() of StatisticsHomeCard.Item to ignore onHelpAction click listener

* Override hashCode() in StatisticsHomeCard.Item
* Unify cards design

* Change cards height

* Layout update after merge

* Implement responsive layout manager

* Update layout and refactor code

* Satisfy lint

* Update image padding

* Code improvements
…2189)

* Fix statistics data missing on in-app data reset due to no refresh being triggered.
Don't do a full reset and add statistics data subscription timeout.

* Fix test (bad changeset)
harambasicluka
harambasicluka previously approved these changes Jan 22, 2021
@sonarcloud
Copy link

sonarcloud bot commented Jan 22, 2021

Kudos, SonarCloud Quality Gate passed!

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

51.7% 51.7% Coverage
3.7% 3.7% Duplication

@d4rken d4rken merged commit 27030f6 into release/1.11.x Jan 22, 2021
@d4rken d4rken deleted the feature/3674-statistics-main branch January 22, 2021 16:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
author merge PR to be merged by author maintainers Tag pull requests created by maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants