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

Vertically center contact diary name and info (COMMUNITY) #2681

Merged
merged 3 commits into from
Mar 24, 2021

Conversation

koenidv
Copy link
Contributor

@koenidv koenidv commented Mar 23, 2021

Description

The encounter info in the contact journal isn't aligned correctly. This fixes it.

Before After
image image

@koenidv koenidv requested a review from a team March 23, 2021 16:24
@ralfgehrer ralfgehrer added the community Tag issues created by community members label Mar 23, 2021
android:id="@+id/contact_diary_overview_element_attributes"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="3"
android:text="unter 15 Min, im Freien"
app:layout_constraintBottom_toBottomOf="@+id/contact_diary_overview_element_image"
Copy link
Contributor

Choose a reason for hiding this comment

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

Many thanks for the fix! I suppose this bottom constraint will break the layout with multiple lines of notes, does it?
Otherwise, the PR looks good to me. Could you please target the release/2.0.x branch instead of main?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! It does actually work, because of layout_height="wrap_content".
image

@ralfgehrer ralfgehrer self-assigned this Mar 23, 2021
@koenidv koenidv changed the base branch from main to release/2.0.x March 23, 2021 16:49
@ralfgehrer ralfgehrer changed the title Vertically center contact diary name and info Vertically center contact diary name and info (COMMUNITY) Mar 24, 2021
@ralfgehrer
Copy link
Contributor

Many thanks for targeting the 2.0 release branch @koenidv. Unfortunately, by simply changing the target branch, you'd end up pulling all changes from the main branch into release/2.0.x. Instead, you'd have to rebase solely your commits - so only they "show up" in the commit history of this branch targeting release/2.0.x (and based on release/2.0.x). If you run into issues doing so, please let us know and we are happy to support.

@koenidv
Copy link
Contributor Author

koenidv commented Mar 24, 2021

Alright, I rebased the commit onto release/2.0.x. Hope this works :)

@harambasicluka harambasicluka self-assigned this Mar 24, 2021
Copy link
Contributor

@harambasicluka harambasicluka left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution! LGTM 🎉

Tested on a OnePlus 8 Pro (Android 11).

@harambasicluka harambasicluka added the bug Something isn't working label Mar 24, 2021
Copy link
Contributor

@ralfgehrer ralfgehrer left a comment

Choose a reason for hiding this comment

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

Many thanks!

@ralfgehrer ralfgehrer merged commit ac395d1 into corona-warn-app:release/2.0.x Mar 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working community Tag issues created by community members
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants