Skip to content

Change bottom tabs height constant value to the dimen-based one #7238

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
merged 2 commits into from
Sep 2, 2021
Merged

Change bottom tabs height constant value to the dimen-based one #7238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bafb0
Change bottom tabs height constants value calculation to the dimen-ba…
svbutko Sep 1, 2021
da00aa6
Merge branch 'master' into bottomTabsHeight
swabbass Sep 2, 2021
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
1 change: 0 additions & 1 deletion lib/android/app/src/main/java/com/reactnativenavigation/react/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ public class Constants {
public static final String STATUS_BAR_HEIGHT_KEY = "statusBarHeight";
public static final String TOP_BAR_HEIGHT_KEY = "topBarHeight";
public static final String BOTTOM_TABS_HEIGHT_KEY = "bottomTabsHeight";
public static final int BOTTOM_TABS_HEIGHT = 56;
}
2 changes: 1 addition & 1 deletion lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private WritableMap createNavigationConstantsMap() {
ReactApplicationContext ctx = getReactApplicationContext();
WritableMap constants = Arguments.createMap();
constants.putString(Constants.BACK_BUTTON_JS_KEY, Constants.BACK_BUTTON_ID);
constants.putDouble(Constants.BOTTOM_TABS_HEIGHT_KEY, Constants.BOTTOM_TABS_HEIGHT);
constants.putDouble(Constants.BOTTOM_TABS_HEIGHT_KEY, pxToDp(ctx, UiUtils.getBottomTabsHeight(ctx)));
constants.putDouble(Constants.STATUS_BAR_HEIGHT_KEY, pxToDp(ctx, StatusBarUtils.getStatusBarHeight(ctx)));
constants.putDouble(Constants.TOP_BAR_HEIGHT_KEY, pxToDp(ctx, UiUtils.getTopBarHeight(ctx)));
return constants;
Expand Down
14 changes: 14 additions & 0 deletions lib/android/app/src/main/java/com/reactnativenavigation/utils/UiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@

public class UiUtils {
private static final int DEFAULT_TOOLBAR_HEIGHT = 56;
private static final int DEFAULT_BOTTOM_TABS_HEIGHT = 56;

private static int topBarHeight = -1;
private static int bottomTabsHeight = -1;

public static <T extends View> void runOnPreDrawOnce(@Nullable final T view, final Functions.Func1<T> task) {
if (view == null) return;
Expand Down Expand Up @@ -117,6 +119,18 @@ public static int getTopBarHeight(Context context) {
return topBarHeight;
}

public static int getBottomTabsHeight(Context context) {
if (bottomTabsHeight > 0) {
return bottomTabsHeight;
}
final Resources resources = context.getResources();
final int resourceId = resources.getIdentifier("bottom_navigation_height", "dimen", context.getPackageName());
bottomTabsHeight = resourceId > 0 ?
resources.getDimensionPixelSize(resourceId) :
dpToPx(context, DEFAULT_BOTTOM_TABS_HEIGHT);
return bottomTabsHeight;
}

public static float dpToPx(Context context, float dp) {
Resources resources = context.getResources();
return dpToPx(resources.getDisplayMetrics(), dp);
Expand Down