Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,11 @@ private void setHidden(boolean hide, String bar) {
return;
}

if (bar.isEmpty() || bar.equals(BAR_STATUS_BAR)) {
if (bar.isEmpty()) {
windowInsetsControllerCompat.show(WindowInsetsCompat.Type.systemBars());
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@theproducer should we propagate this equivalent logic to hide (above in this same setHidden method)? In general systemBars should just be statusBars+navigationBars, but maybe this could change in the future? But I suppose if it does then that probably means additional changes in this core plugin.

}
if (bar.isEmpty() || bar.equals(BAR_GESTURE_BAR)) {
} else if (bar.equals(BAR_STATUS_BAR)) {
windowInsetsControllerCompat.show(WindowInsetsCompat.Type.statusBars());
} else if (bar.equals(BAR_GESTURE_BAR)) {
windowInsetsControllerCompat.show(WindowInsetsCompat.Type.navigationBars());
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package com.getcapacitor.plugin;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.view.View;
import android.view.Window;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import com.getcapacitor.Bridge;
import java.lang.reflect.Method;
import org.junit.Test;
import org.mockito.MockedStatic;

public class SystemBarsTest {

@Test
public void showWithEmptyBarShowsSystemBars() throws Exception {
WindowInsetsControllerCompat controller = invokeSetHidden("");

verify(controller).show(WindowInsetsCompat.Type.systemBars());
verify(controller, never()).show(WindowInsetsCompat.Type.statusBars());
verify(controller, never()).show(WindowInsetsCompat.Type.navigationBars());
}

@Test
public void showWithStatusBarShowsOnlyStatusBars() throws Exception {
WindowInsetsControllerCompat controller = invokeSetHidden("StatusBar");

verify(controller).show(WindowInsetsCompat.Type.statusBars());
verify(controller, never()).show(WindowInsetsCompat.Type.systemBars());
verify(controller, never()).show(WindowInsetsCompat.Type.navigationBars());
}

@Test
public void showWithNavigationBarShowsOnlyNavigationBars() throws Exception {
WindowInsetsControllerCompat controller = invokeSetHidden("NavigationBar");

verify(controller).show(WindowInsetsCompat.Type.navigationBars());
verify(controller, never()).show(WindowInsetsCompat.Type.systemBars());
verify(controller, never()).show(WindowInsetsCompat.Type.statusBars());
}

private WindowInsetsControllerCompat invokeSetHidden(String bar) throws Exception {
SystemBars plugin = new SystemBars();
Bridge bridge = mock(Bridge.class);
AppCompatActivity activity = mock(AppCompatActivity.class);
Window window = mock(Window.class);
View decorView = mock(View.class);
WindowInsetsControllerCompat controller = mock(WindowInsetsControllerCompat.class);

when(bridge.getActivity()).thenReturn(activity);
when(activity.getWindow()).thenReturn(window);
when(window.getDecorView()).thenReturn(decorView);

plugin.setBridge(bridge);

try (MockedStatic<WindowCompat> windowCompat = mockStatic(WindowCompat.class)) {
windowCompat.when(() -> WindowCompat.getInsetsController(window, decorView)).thenReturn(controller);

Method setHidden = SystemBars.class.getDeclaredMethod("setHidden", boolean.class, String.class);
setHidden.setAccessible(true);
setHidden.invoke(plugin, false, bar);
}

return controller;
}
}
Loading