Skip to content

Fix SDK35 Bottom-tab positioning #7992

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.

Sign up for GitHub

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
d4vidi merged 1 commit into from
Apr 3, 2025
Merged

Fix SDK35 Bottom-tab positioning #7992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.reactnativenavigation.viewcontrollers.bottomtabs;

import static com.reactnativenavigation.utils.CollectionUtils.forEach;
import static com.reactnativenavigation.utils.CollectionUtils.map;
import static com.reactnativenavigation.utils.ObjectUtils.perform;

import android.animation.Animator;
import android.app.Activity;
import android.content.res.Configuration;
Expand All @@ -9,6 +13,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.graphics.Insets;
import androidx.core.view.WindowInsetsCompat;

import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
Expand All @@ -34,10 +40,6 @@
import java.util.LinkedList;
import java.util.List;

import static com.reactnativenavigation.utils.CollectionUtils.forEach;
import static com.reactnativenavigation.utils.CollectionUtils.map;
import static com.reactnativenavigation.utils.ObjectUtils.perform;

public class BottomTabsController extends ParentController<BottomTabsLayout> implements AHBottomNavigation.OnTabSelectedListener, TabSelector {

private BottomTabsContainer bottomTabsContainer;
Expand Down Expand Up @@ -84,6 +86,7 @@ public void setDefaultOptions(Options defaultOptions) {
@Override
public BottomTabsLayout createView() {
BottomTabsLayout root = new BottomTabsLayout(getActivity());

this.bottomTabsContainer = createBottomTabsContainer();
this.bottomTabs = bottomTabsContainer.getBottomTabs();
Options resolveCurrentOptions = resolveCurrentOptions();
Expand All @@ -95,6 +98,7 @@ public BottomTabsLayout createView() {
bottomTabs.addItems(createTabs());
setInitialTab(resolveCurrentOptions);
tabsAttacher.attach();

return root;
}

Expand Down Expand Up @@ -299,6 +303,14 @@ public Animator getPopAnimation(Options appearingOptions, Options disappearingOp
return presenter.getPopAnimation(appearingOptions, disappearingOptions);
}

@Override
protected WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat insets) {
Insets sysInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars());
view.setPaddingRelative(0, 0, 0, sysInsets.bottom);
return WindowInsetsCompat.CONSUMED;
}


@RestrictTo(RestrictTo.Scope.TESTS)
public BottomTabs getBottomTabs() {
return bottomTabs;
Expand Down
Loading