mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Adjust WebxdcPage when keyboard visible + add strings

Browse source
This commit is contained in:
Arne 2024-10-16 21:53:07 +02:00
parent d17c04c61f
commit dd859e7594
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -3611,6 +3611,9 @@ public class ConversationFragment extends XmppFragment
private void reInit(Conversation conversation) {
reInit(conversation, false);
if (activity != null) {
activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
}
}
private boolean reInit(final Conversation conversation, final boolean hasExtras) {
@ -4214,6 +4217,9 @@ public class ConversationFragment extends XmppFragment
@Override
public void refresh() {
if (activity != null) {
activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
}
if (this.binding == null) {
Log.d(
Config.LOGTAG,

1
src/main/res/values/strings.xml
View file

@ -1178,4 +1178,5 @@
<string name="copy_GIFs_to_GIFs_folder">Copy GIFs to GIFs folder</string>
<string name="gif_deleted">GIF deleted</string>
<string name="failed_to_delete_gif">Failed to delete GIF</string>
<string name="add_to_home_screen">Add to home screen</string>
</resources>

13
src/monocleschat/java/de/monocles/chat/WebxdcPage.java
View file

@ -19,6 +19,7 @@ import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.util.Base64;
import android.view.WindowManager;
import android.webkit.JavascriptInterface;
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
@ -216,7 +217,9 @@ public class WebxdcPage implements ConversationPage {
binding.webview.loadUrl("javascript:__webxdcUpdate();");
return getView();
}
if (activity != null) {
activity.get().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
}
binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.webxdc_page, null, false);
binding.webview.setWebViewClient(new WebViewClient() {
// `shouldOverrideUrlLoading()` is called when the user clicks a URL,
@ -306,14 +309,14 @@ public class WebxdcPage implements ConversationPage {
binding.webview.loadUrl(baseUrl + "/index.html");
binding.actions.setAdapter(new ArrayAdapter<String>(context, R.layout.simple_list_item, new String[]{"Add to Home Screen", "Close"}) {
binding.actions.setAdapter(new ArrayAdapter<String>(context, R.layout.simple_list_item, new String[]{activity.get().getString(R.string.add_to_home_screen), activity.get().getString(R.string.action_close)}) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View v = super.getView(position, convertView, parent);
TextView tv = (TextView) v.findViewById(android.R.id.text1);
tv.setGravity(Gravity.CENTER);
tv.setTextColor(ContextCompat.getColor(context, R.color.white));
tv.setBackgroundColor(MaterialColors.harmonizeWithPrimary(activity.get(),UIHelper.getColorForName(getItem(position))));
tv.setBackgroundColor(MaterialColors.harmonizeWithPrimary(activity.get(),UIHelper.getColorForName(getItem(position))));
return v;
}
});
@ -350,7 +353,9 @@ public class WebxdcPage implements ConversationPage {
public void refresh() {
if (binding == null) return;
if (activity != null) {
activity.get().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
}
binding.webview.post(() -> binding.webview.loadUrl("javascript:__webxdcUpdate();"));
}