Limit bot keyboard height

vkryl · vkryl · commit a48af132a804 · 2025-10-31T11:33:16.000+04:00
diff --git a/app/src/main/java/org/thunderdog/challegram/ui/MessagesController.java b/app/src/main/java/org/thunderdog/challegram/ui/MessagesController.java
@@ -613,10 +613,7 @@ protected void onBottomInsetChanged (int extraBottomInset, int extraBottomInsetW
       searchControlsLayout.setTranslationY((Screen.dp(49f) + extraBottomInset) * (1f - searchControlsFactor));
     }
     updateSearchControlsInset();
-    if (keyboardWrapper != null && keyboardLayout != null) {
-      Views.applyBottomInset(keyboardWrapper, extraBottomInsetWithoutIme);
-      Views.setLayoutHeight(keyboardWrapper, keyboardLayout.getSize() + extraBottomInsetWithoutIme);
-    }
+    updateCommandKeyboardHeight();
   }
 
   private void updateSearchControlsInset () {
@@ -7534,6 +7531,13 @@ private void openCommandsKeyboard (boolean byUserEvent) {
     openCommandsKeyboard(commandsMessageId, commandsKeyboard, true, byUserEvent);
   }
 
+  private void updateCommandKeyboardHeight () {
+    if (keyboardWrapper != null && keyboardLayout != null) {
+      Views.setLayoutHeight(keyboardWrapper, Math.min(Keyboard.getSize(), keyboardLayout.getSize()) + extraBottomInsetWithoutIme);
+      Views.applyBottomInset(keyboardWrapper, extraBottomInsetWithoutIme);
+    }
+  }
+
   private void openCommandsKeyboard (long messageId, TdApi.ReplyMarkupShowKeyboard keyboard, boolean force, boolean byUserEvent) {
     if (keyboardLayout == null) {
       keyboardWrapper = new ScrollView(context());
@@ -7544,7 +7548,7 @@ private void openCommandsKeyboard (long messageId, TdApi.ReplyMarkupShowKeyboard
       keyboardLayout.setCallback(this);
 
       keyboardWrapper.addView(keyboardLayout);
-      keyboardWrapper.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, keyboardLayout.getSize() + extraBottomInsetWithoutIme));
+      keyboardWrapper.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, Math.min(Keyboard.getSize(), keyboardLayout.getSize()) + extraBottomInsetWithoutIme));
       Views.applyBottomInset(keyboardWrapper, extraBottomInsetWithoutIme);
 
       bottomWrap.addView(keyboardWrapper);
@@ -7556,7 +7560,7 @@ private void openCommandsKeyboard (long messageId, TdApi.ReplyMarkupShowKeyboard
       commandsMessageId = messageId;
       commandsKeyboard = keyboard;
       keyboardLayout.setKeyboard(keyboard);
-      Views.setLayoutHeight(keyboardWrapper, keyboardLayout.getSize() + extraBottomInsetWithoutIme);
+      updateCommandKeyboardHeight();
     }
 
     if (byUserEvent) {
