thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

Always show thread icon in input field when activated

Browse source
This commit is contained in:
Arne 2024-12-11 23:16:12 +01:00
parent 57f3bc6bb9
commit 5d6f3e363d
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4551,23 +4551,16 @@ public class ConversationFragment extends XmppFragment
} }
if (activity == null) return; if (activity == null) return;
final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(activity); final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(activity);
ViewGroup.LayoutParams params = binding.threadIdenticonLayout.getLayoutParams(); if (canWrite() && pref != null && pref.getBoolean("show_thread_feature", getResources().getBoolean(R.bool.show_thread_feature))) {
if (identiconWidth < 0) identiconWidth = params.width; binding.threadIdenticonLayout.setVisibility(VISIBLE);
if (hasAttachments || !binding.textinput.getText().toString().replaceFirst("^(\\w|[, ])+:\\s*", "").isEmpty()) {
binding.conversationViewPager.setCurrentItem(0);
params.width = conversation.getThread() == null ? 0 : identiconWidth;
} else if (pref != null && pref.getBoolean("show_thread_feature", getResources().getBoolean(R.bool.show_thread_feature))) {
params.width = identiconWidth;
} else { } else {
params.width = 0; binding.threadIdenticonLayout.setVisibility(GONE);
} }
if (!binding.textinput.getText().toString().isEmpty()) { if (!binding.textinput.getText().toString().isEmpty()) {
binding.quickButtons.setVisibility(GONE); binding.quickButtons.setVisibility(GONE);
} else { } else {
binding.quickButtons.setVisibility(VISIBLE); binding.quickButtons.setVisibility(VISIBLE);
} }
if (!canWrite()) params.width = 0;
binding.threadIdenticonLayout.setLayoutParams(params);
} }
protected void updateStatusMessages() { protected void updateStatusMessages() {

2
src/main/res/layout/fragment_conversation.xml
View file

@ -356,7 +356,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="6dp"
android:background="@drawable/thread_hint"> android:background="@drawable/thread_hint">
<com.lelloman.identicon.view.GithubIdenticonView <com.lelloman.identicon.view.GithubIdenticonView