Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 18:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix forward sheet weirdness in full screen activities.

Browse Source
This commit is contained in:
Alex Hart
2022-04-29 09:52:27 -03:00
committed by Greyson Parrelli
parent aae888f5af
commit 3c0c5478b5
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
View File

@@ -39,7 +39,7 @@ public final class FullscreenHelper {
public void configureToolbarLayout(@NonNull View spacer, @NonNull View toolbar) {
if (Build.VERSION.SDK_INT == 19) {
setSpacerHeight(spacer, ViewUtil.getStatusBarHeight(spacer));
int[] padding = makePaddingValuesForAPI19();
int[] padding = makePaddingValuesForAPI19(activity);
toolbar.setPadding(padding[0], 0, padding[1], 0);
return;
}
@@ -56,7 +56,27 @@ public final class FullscreenHelper {
});
}
private void setSpacerHeight(@NonNull View spacer, int height) {
public static void configureBottomBarLayout(@NonNull Activity activity, @NonNull View spacer, @NonNull View bottomBar) {
if (Build.VERSION.SDK_INT == 19) {
setSpacerHeight(spacer, ViewUtil.getNavigationBarHeight(spacer));
int[] padding = makePaddingValuesForAPI19(activity);
bottomBar.setPadding(padding[0], 0, padding[1], 0);
return;
}
ViewCompat.setOnApplyWindowInsetsListener(spacer, (view, insets) -> {
setSpacerHeight(view, insets.getSystemWindowInsetBottom());
return insets;
});
ViewCompat.setOnApplyWindowInsetsListener(bottomBar, (view, insets) -> {
int[] padding = makePaddingValues(insets);
bottomBar.setPadding(padding[0], 0, padding[1], 0);
return insets;
});
}
private static void setSpacerHeight(@NonNull View spacer, int height) {
ViewGroup.LayoutParams params = spacer.getLayoutParams();
params.height = height;
@@ -66,7 +86,7 @@ public final class FullscreenHelper {
}
@SuppressLint("SwitchIntDef")
private int[] makePaddingValuesForAPI19() {
private static int[] makePaddingValuesForAPI19(@NonNull Activity activity) {
int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
return new int[]{0, 0};
@@ -88,7 +108,7 @@ public final class FullscreenHelper {
}
}
private int[] makePaddingValues(WindowInsetsCompat insets) {
private static int[] makePaddingValues(WindowInsetsCompat insets) {
Insets tappable = insets.getTappableElementInsets();
DisplayCutoutCompat cutout = insets.getDisplayCutout();