From b749d151685e25f9cdf107774984d8fbbf4f5426 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 9 Jan 2020 15:12:26 +0100
Subject: [PATCH] Improve search icons layout size

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../res/layout/complete_search_layout.xml     | 45 -------------------
 app/src/main/res/layout/search_layout.xml     | 10 ++---
 2 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 app/src/main/res/layout/complete_search_layout.xml

diff --git a/app/src/main/res/layout/complete_search_layout.xml b/app/src/main/res/layout/complete_search_layout.xml
deleted file mode 100644
index 2e2068a24..000000000
--- a/app/src/main/res/layout/complete_search_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~  * Nextcloud Talk application
-  ~  *
-  ~  * @author Mario Danic
-  ~  * Copyright (C) 2017-2020 Mario Danic <mario@lovelyhq.com>
-  ~  *
-  ~  * This program is free software: you can redistribute it and/or modify
-  ~  * it under the terms of the GNU General Public License as published by
-  ~  * the Free Software Foundation, either version 3 of the License, or
-  ~  * at your option) any later version.
-  ~  *
-  ~  * This program is distributed in the hope that it will be useful,
-  ~  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  * GNU General Public License for more details.
-  ~  *
-  ~  * You should have received a copy of the GNU General Public License
-  ~  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  ~  */
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:elevation="0dp">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="enterAlways|scroll|snap"
-            >
-
-            <include layout="@layout/search_layout"
-                android:layout_height="match_parent"
-                android:layout_width="64dp"
-                />
-        </com.google.android.material.appbar.MaterialToolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-</merge>
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
index cb5dcf553..72241bca6 100644
--- a/app/src/main/res/layout/search_layout.xml
+++ b/app/src/main/res/layout/search_layout.xml
@@ -60,7 +60,7 @@
                 <ImageButton
                     android:id="@+id/leftButton"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
@@ -110,8 +110,8 @@
 
                 <ImageView
                     android:id="@+id/clearButton"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
@@ -123,8 +123,8 @@
 
                 <ImageView
                 android:id="@+id/settingsButton"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_gravity="center"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:scaleType="fitCenter"