From 49d0558da150b53025e9004e6f22048c212c889d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Jan 2021 12:58:05 +0100
Subject: [PATCH] fix tab height in StartConversation screen

---
 .../ui/StartConversationActivity.java         | 20 +++++------
 .../layout/activity_start_conversation.xml    | 33 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index ac86aedef..b2d33a7d1 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -93,17 +93,17 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 	public int conference_context_id;
 	public int contact_context_id;
 	private ListPagerAdapter mListPagerAdapter;
-	private List<ListItem> contacts = new ArrayList<>();
+	private final List<ListItem> contacts = new ArrayList<>();
 	private ListItemAdapter mContactsAdapter;
-	private List<ListItem> conferences = new ArrayList<>();
+	private final List<ListItem> conferences = new ArrayList<>();
 	private ListItemAdapter mConferenceAdapter;
-	private List<String> mActivatedAccounts = new ArrayList<>();
+	private final List<String> mActivatedAccounts = new ArrayList<>();
 	private EditText mSearchEditText;
-	private AtomicBoolean mRequestedContactsPermission = new AtomicBoolean(false);
-	private AtomicBoolean mOpenedFab = new AtomicBoolean(false);
+	private final AtomicBoolean mRequestedContactsPermission = new AtomicBoolean(false);
+	private final AtomicBoolean mOpenedFab = new AtomicBoolean(false);
 	private boolean mHideOfflineContacts = false;
 	private boolean createdByViewIntent = false;
-	private MenuItem.OnActionExpandListener mOnActionExpandListener = new MenuItem.OnActionExpandListener() {
+	private final MenuItem.OnActionExpandListener mOnActionExpandListener = new MenuItem.OnActionExpandListener() {
 
 		@Override
 		public boolean onMenuItemActionExpand(MenuItem item) {
@@ -132,7 +132,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 			return true;
 		}
 	};
-	private TextWatcher mSearchTextWatcher = new TextWatcher() {
+	private final TextWatcher mSearchTextWatcher = new TextWatcher() {
 
 		@Override
 		public void afterTextChanged(Editable editable) {
@@ -148,7 +148,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 		}
 	};
 	private MenuItem mMenuSearchView;
-	private ListItemAdapter.OnTagClickedListener mOnTagClickedListener = new ListItemAdapter.OnTagClickedListener() {
+	private final ListItemAdapter.OnTagClickedListener mOnTagClickedListener = new ListItemAdapter.OnTagClickedListener() {
 		@Override
 		public void onTagClicked(String tag) {
 			if (mMenuSearchView != null) {
@@ -161,7 +161,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 	};
 	private Pair<Integer, Intent> mPostponedActivityResult;
 	private Toast mToast;
-	private UiCallback<Conversation> mAdhocConferenceCallback = new UiCallback<Conversation>() {
+	private final UiCallback<Conversation> mAdhocConferenceCallback = new UiCallback<Conversation>() {
 		@Override
 		public void success(final Conversation conversation) {
 			runOnUiThread(() -> {
@@ -181,7 +181,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 		}
 	};
 	private ActivityStartConversationBinding binding;
-	private TextView.OnEditorActionListener mSearchDone = new TextView.OnEditorActionListener() {
+	private final TextView.OnEditorActionListener mSearchDone = new TextView.OnEditorActionListener() {
 		@Override
 		public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
 			int pos = binding.startConversationViewPager.getCurrentItem();
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 6709b3b2a..d4c2f5b57 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <include android:id="@+id/toolbar"
+
+        <include
+            android:id="@+id/toolbar"
             layout="@layout/toolbar" />
+
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
-            android:layout_below="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@id/toolbar"
             android:background="?attr/colorPrimary"
-            android:minHeight="?attr/actionBarSize"
             android:elevation="@dimen/toolbar_elevation"
-            app:tabMode="fixed"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:tabGravity="fill"
-            app:tabTextColor="@color/white70"
-            app:tabSelectedTextColor="@color/white"
             app:tabIndicatorColor="@color/white87"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="@color/white"
+            app:tabTextColor="@color/white70" />
+
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/start_conversation_view_pager"
             android:layout_width="match_parent"
@@ -35,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/tab_layout"
-            android:background="?color_background_overlay"/>
+            android:background="?color_background_overlay" />
 
 
         <com.leinardi.android.speeddial.SpeedDialView
@@ -43,14 +47,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            app:backgroundTint="?colorPrimary"
-            android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
-            app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp"
-            app:sdMainFabClosedBackgroundColor="?colorPrimary"
-            app:sdMainFabOpenedBackgroundColor="?colorPrimaryDark"
-            app:sdUseReverseAnimationOnClose="true"
             android:contentDescription="@string/add_contact_or_create_or_join_group_chat"
-            app:sdOverlayLayout="@id/overlay"/>
+            app:backgroundTint="?colorPrimary"
+            app:sdMainFabClosedBackgroundColor="?colorPrimary"
+            app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp"
+            app:sdMainFabOpenedBackgroundColor="?colorPrimaryDark"
+            app:sdOverlayLayout="@id/overlay"
+            app:sdUseReverseAnimationOnClose="true" />
     </RelativeLayout>
 </layout>