-
-
Notifications
You must be signed in to change notification settings - Fork 597
fix(Android, Stack): incorrect header height values #3402
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
73b90fe
add nested config to test screen
kligarski be927aa
fix updating header height
kligarski 9266287
add react-navigation useHeaderHeight test mode
kligarski d0bb9c3
cleanup
kligarski 41d5193
JS cleanup
kligarski f961fde
android format
kligarski 1c7e882
suggestions from code review
kligarski 839f79a
add compatibility flag
kligarski b169732
formatting
kligarski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderHeightUpdateProxy.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.swmansion.rnscreens | ||
|
|
||
| class ScreenStackHeaderHeightUpdateProxy( | ||
| val config: ScreenStackHeaderConfig, | ||
kligarski marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ) { | ||
| var previousHeaderHeightInPx: Int? = null | ||
|
|
||
| fun updateHeaderHeightIfNeeded() { | ||
| val currentHeaderHeightInPx = if (config.isHeaderHidden) 0 else config.toolbar.height | ||
|
|
||
| if (currentHeaderHeightInPx != previousHeaderHeightInPx) { | ||
| previousHeaderHeightInPx = currentHeaderHeightInPx | ||
| config.screen?.notifyHeaderHeightChange(currentHeaderHeightInPx) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
android/src/main/java/com/swmansion/rnscreens/utils/DimensionUtils.kt
kligarski marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.swmansion.rnscreens.utils | ||
|
|
||
| import android.content.Context | ||
| import android.os.Build | ||
| import android.util.TypedValue | ||
|
|
||
| fun pxToDp( | ||
| context: Context, | ||
| px: Float, | ||
| ): Float { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { | ||
| return TypedValue.deriveDimension( | ||
| TypedValue.COMPLEX_UNIT_DIP, | ||
| px, | ||
| context.resources.displayMetrics, | ||
| ) | ||
| } else { | ||
| val density = context.resources.displayMetrics.density | ||
| return px / density | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.