Support Android 15 on call screen

vkryl · vkryl · commit 6cd10ecee588 · 2025-08-27T22:17:16.000+03:00
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/CallController.java b/app/src/main/java/org/thunderdog/challegram/ui/CallController.java
@@ -82,7 +82,7 @@
 import me.vkryl.core.MathUtils;
 import me.vkryl.core.StringUtils;
 
-public class CallController extends ViewController<CallController.Arguments> implements TdlibCache.UserDataChangeListener, TdlibCache.CallStateChangeListener, View.OnClickListener, FactorAnimator.Target, Runnable, CallControlsLayout.CallControlCallback {
+public class CallController extends ViewController<CallController.Arguments> implements TdlibCache.UserDataChangeListener, TdlibCache.CallStateChangeListener, View.OnClickListener, FactorAnimator.Target, Runnable, CallControlsLayout.CallControlCallback, Screen.StatusBarHeightChangeListener {
   private static final boolean DEBUG_FADE_BRANDING = true;
 
   private static class ButtonView extends View implements FactorAnimator.Target {
@@ -314,6 +314,26 @@ private void setCallBarsCount (int count) {
     }
   }
 
+  @Override
+  public boolean supportsBottomInset () {
+    return true;
+  }
+
+  @Override
+  protected void onBottomInsetChanged (int extraBottomInset, int extraBottomInsetWithoutIme, boolean isImeInset) {
+    super.onBottomInsetChanged(extraBottomInset, extraBottomInsetWithoutIme, isImeInset);
+    Views.setPaddingBottom(buttonWrap, extraBottomInset);
+    Views.setPaddingBottom(callControlsLayout, extraBottomInset);
+  }
+
+  @Override
+  public void onStatusBarHeightChanged (int newHeight) {
+    int startMargin = Math.max(Screen.dp(18f) + newHeight, Screen.dp(42f));
+    Views.setTopMargin(brandWrap, startMargin);
+    Views.setTopMargin(nameView, startMargin + Screen.dp(34f));
+    Views.setTopMargin(stateView, startMargin + Screen.dp(94f));
+  }
+
   @Override
   protected View onCreateView (final Context context) {
     final FrameLayoutFix contentView = new FrameLayoutFix(context) {
@@ -378,7 +398,9 @@ protected void onDraw(Canvas c){
 
     // Top-left corner
 
-    params.topMargin = Screen.dp(76f);
+    int startMargin = Math.max(Screen.dp(18f) + Screen.getStatusBarHeight(), Screen.dp(42f));
+
+    params.topMargin = startMargin + Screen.dp(34f);
     params.leftMargin = params.rightMargin = Screen.dp(18f);
 
     nameView = new EmojiTextView(context) {
@@ -414,7 +436,7 @@ protected void onDraw (Canvas canvas) {
     emojiStatusHelper = new EmojiStatusHelper(tdlib, nameView, null);
 
     params = FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-    params.topMargin = Screen.dp(136f);
+    params.topMargin = startMargin + Screen.dp(94f);
     params.leftMargin = params.rightMargin = Screen.dp(18f);
 
     stateView = new TextView(context);
@@ -430,8 +452,9 @@ protected void onDraw (Canvas canvas) {
     stateView.setLayoutParams(params);
     contentView.addView(stateView);
 
+    Screen.addStatusBarHeightListener(this);
     params = FrameLayoutFix.newParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-    params.topMargin = Screen.dp(42f);
+    params.topMargin = startMargin;
     params.leftMargin = params.rightMargin = Screen.dp(18f);
     brandWrap = new LinearLayout(context);
     if (DEBUG_FADE_BRANDING) {
@@ -603,6 +626,7 @@ public boolean onTouchEvent (MotionEvent event) {
     buttonWrap.addView(muteButtonView);
     buttonWrap.addView(messageButtonView);
     buttonWrap.addView(speakerButtonView);
+    Views.setPaddingBottom(buttonWrap, extraBottomInset);
     Drawable drawable = ScrimUtil.makeCubicGradientScrimDrawable(0xff000000, 2, Gravity.BOTTOM, false);
     drawable.setAlpha((int) (255f * .3f));
     ViewUtils.setBackground(buttonWrap, drawable);
@@ -611,6 +635,7 @@ public boolean onTouchEvent (MotionEvent event) {
     // Answer controls
 
     callControlsLayout = new CallControlsLayout(context, this);
+    Views.setPaddingBottom(callControlsLayout, extraBottomInset);
     callControlsLayout.setCallback(this);
     callControlsLayout.setLayoutParams(FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
     contentView.addView(callControlsLayout);
@@ -1150,6 +1175,7 @@ public void replaceCall (TdApi.Call call) {
   @Override
   public void destroy () {
     super.destroy();
+    Screen.removeStatusBarHeightListener(this);
     tdlib.cache().unsubscribeFromCallUpdates(call.id, this);
     tdlib.cache().removeUserDataListener(call.userId, this);
     avatarView.performDestroy();
