diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 2ed632be9..dd3982a72 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -3531,19 +3531,11 @@ public class ConversationFragment extends XmppFragment if (commandAdapter != null && conversation != originalConversation) { commandAdapter.clear(); - conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, activity.xmppConnectionService.isOnboarding(), originalConversation); + conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, activity.xmppConnectionService.isOnboarding(), null); refreshCommands(false); } if (commandAdapter == null && conversation != null) { conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, activity.xmppConnectionService.isOnboarding(), null); - commandAdapter = new CommandAdapter((XmppActivity) getActivity()); - binding.commandsView.setAdapter(commandAdapter); - binding.commandsView.setOnItemClickListener((parent, view, position, id) -> { - if (activity == null) return; - - final Element command = commandAdapter.getItem(position); - activity.startCommand(ConversationFragment.this.conversation.getAccount(), command.getAttributeAsJid("jid"), command.getAttribute("node")); - }); refreshCommands(false); } diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index f6683c29e..3f2800380 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -20,8 +20,8 @@ <com.google.android.material.tabs.TabLayout android:visibility="gone" android:id="@+id/tab_layout" - android:layout_width="match_parent" - android:layout_height="30dp" + android:layout_width="0dp" + android:layout_height="0dp" android:background="?attr/colorPrimary" android:elevation="@dimen/toolbar_elevation" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" @@ -431,7 +431,8 @@ <RelativeLayout android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_height="fill_parent" + android:visibility="gone" > <ListView android:id="@+id/commands_view"