-
-
Notifications
You must be signed in to change notification settings - Fork 587
feat(Android, Tabs): safe area component for Android #3215
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
+656
−27
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
4ae0a8e
WIP
kligarski 0ec6f1a
WIP 2
kligarski 8568e04
first prototype on Fabric
kligarski 8cd33ee
add comment to research insets ignoring visibility
kligarski 6213677
add comments about source
kligarski b756cac
WIP Paper
kligarski cb368ba
Paper support
kligarski f59bc6f
add safe area usage examples to TestBottomTabs
kligarski 4c7b0a0
change TabScreen to take full height, below the tab bar
kligarski 4845863
support for older Android versions
kligarski 575c00b
add insetType prop
kligarski 6e398a8
move and rename conversion function in RNSSafeAreaViewState
kligarski 5015eb0
restore testbottomtabs
kligarski 57afd24
apply suggestion from code review
kligarski aa32f14
formatting
kligarski 371ee8b
consume system insets per-edge
kligarski 204d8a5
add arch guard
kligarski d6c47df
apply minor suggestions from code review
kligarski 6942ab4
add docs to SafeAreaProvider interface
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
Some comments aren't visible on the classic Files Changed page.
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
35 changes: 35 additions & 0 deletions
35
android/src/main/java/com/swmansion/rnscreens/safearea/EdgeInsets.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,35 @@ | ||
// Implementation adapted from `react-native-safe-area-context`: | ||
// https://github.com/AppAndFlow/react-native-safe-area-context/tree/v5.6.1 | ||
package com.swmansion.rnscreens.safearea | ||
|
||
import androidx.core.graphics.Insets | ||
import kotlin.math.max | ||
|
||
data class EdgeInsets( | ||
val left: Float, | ||
val top: Float, | ||
val right: Float, | ||
val bottom: Float, | ||
) { | ||
companion object { | ||
val ZERO: EdgeInsets = EdgeInsets(0.0f, 0.0f, 0.0f, 0.0f) | ||
|
||
fun fromInsets(insets: Insets) = | ||
EdgeInsets( | ||
insets.left.toFloat(), | ||
insets.top.toFloat(), | ||
insets.right.toFloat(), | ||
insets.bottom.toFloat(), | ||
) | ||
|
||
fun max( | ||
i1: EdgeInsets, | ||
i2: EdgeInsets, | ||
) = EdgeInsets( | ||
max(i1.left, i2.left), | ||
max(i1.top, i2.top), | ||
max(i1.right, i2.right), | ||
max(i1.bottom, i2.bottom), | ||
) | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
android/src/main/java/com/swmansion/rnscreens/safearea/InsetType.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,12 @@ | ||
package com.swmansion.rnscreens.safearea | ||
|
||
enum class InsetType { | ||
ALL, | ||
SYSTEM, | ||
INTERFACE, | ||
; | ||
|
||
fun containsSystem(): Boolean = this == ALL || this == SYSTEM | ||
|
||
fun containsInterface(): Boolean = this == ALL || this == INTERFACE | ||
} |
36 changes: 36 additions & 0 deletions
36
android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaProvider.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,36 @@ | ||
package com.swmansion.rnscreens.safearea | ||
|
||
/** | ||
* Allows containers that obscure some part of its children views to provide safe area. | ||
* | ||
* This protocol only handles **interface insets** (e.g. toolbar, bottomNavigationView). | ||
* System insets (e.g. `systemBars`, `displayCutout`) are handled through Android inset | ||
* dispatch mechanism (via `onApplyWindowInsets`). | ||
* | ||
* Classes implementing this protocol are responsible for notifying `SafeAreaView`, which | ||
* registers as a listener, about changes to **interface** safe area insets. | ||
*/ | ||
interface SafeAreaProvider { | ||
/** | ||
* Responsible for registering **interface** safe area insets listener. | ||
* | ||
* @param listener `SafeAreaView` instance that wants to receive notifications | ||
* about changes to **interface** safe area insets via `onInterfaceInsetsChange`. | ||
*/ | ||
fun setOnInterfaceInsetsChangeListener(listener: SafeAreaView) | ||
|
||
/** | ||
* Responsible for unregistering **interface** safe area insets listener. | ||
* | ||
* @param listener `SafeAreaView` instance that wants to stop receiving notifications | ||
* about changes to **interface** safe area insets. | ||
*/ | ||
fun removeOnInterfaceInsetsChangeListener(listener: SafeAreaView) | ||
|
||
/** | ||
* Responsible for providing current **interface** safe area insets. | ||
* | ||
* @returns `EdgeInsets` describing the current **interface** safe area insets. | ||
*/ | ||
fun getInterfaceInsets(): EdgeInsets | ||
kligarski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
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.