From 6624fefbdeda8e065fdd86a6f78bc57b576c2da6 Mon Sep 17 00:00:00 2001
From: Chumva <faiver.unknown@gmail.com>
Date: Thu, 11 Apr 2019 12:13:05 +0300
Subject: [PATCH] Open keyboard automatically and change background image

---
 .../drawable/gradient_both_sides_light.xml    | 21 ----------
 .../res/layout/empty_state_search.xml         | 39 +++----------------
 .../telegram/ui/SearchDialogFragment.kt       | 15 ++-----
 3 files changed, 9 insertions(+), 66 deletions(-)
 delete mode 100644 OsmAnd-telegram/res/drawable/gradient_both_sides_light.xml

diff --git a/OsmAnd-telegram/res/drawable/gradient_both_sides_light.xml b/OsmAnd-telegram/res/drawable/gradient_both_sides_light.xml
deleted file mode 100644
index 89f6d1c4ca..0000000000
--- a/OsmAnd-telegram/res/drawable/gradient_both_sides_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="rectangle">
-			<gradient
-				android:angle="0"
-				android:centerColor="#00ffffff"
-				android:centerX="0.2"
-				android:startColor="@color/card_bg_light" />
-		</shape>
-	</item>
-	<item>
-		<shape android:shape="rectangle">
-			<gradient
-				android:angle="180"
-				android:centerColor="#00ffffff"
-				android:centerX="0.2"
-				android:startColor="@color/card_bg_light" />
-		</shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/layout/empty_state_search.xml b/OsmAnd-telegram/res/layout/empty_state_search.xml
index 1f0eb39653..0a91771332 100644
--- a/OsmAnd-telegram/res/layout/empty_state_search.xml
+++ b/OsmAnd-telegram/res/layout/empty_state_search.xml
@@ -6,42 +6,13 @@
 	android:gravity="center_horizontal"
 	android:orientation="vertical">
 
-	<FrameLayout
-		android:id="@+id/empty_state_image_container"
+	<ImageView
+		android:id="@+id/empty_state_background_image"
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/my_location_image_height"
+		android:layout_height="wrap_content"
 		android:layout_marginBottom="16dp"
-		android:foreground="@drawable/gradient_both_sides_light">
-
-		<ImageView
-			android:id="@+id/empty_state_background"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:scaleType="center"
-			android:src="@drawable/img_my_location_roadbg" />
-
-		<FrameLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/content_padding_standard">
-
-			<ImageView
-				android:id="@+id/empty_state_placeholder"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/img_my_location_user" />
-
-			<ImageView
-				android:id="@+id/empty_state_user_icon"
-				android:layout_width="@dimen/my_location_user_icon_size"
-				android:layout_height="@dimen/my_location_user_icon_size"
-				android:layout_gravity="center"
-				android:src="@drawable/img_user_placeholder" />
-
-		</FrameLayout>
-
-	</FrameLayout>
+		android:scaleType="center"
+		android:src="@drawable/img_empty_state_search" />
 
 	<net.osmand.telegram.ui.views.TextViewEx
 		android:layout_width="wrap_content"
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
index ad1125b6ee..0b286ab115 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
@@ -2,8 +2,6 @@ package net.osmand.telegram.ui
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.ColorMatrix
-import android.graphics.ColorMatrixColorFilter
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
@@ -43,7 +41,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 
 	private lateinit var locationViewCache: UiUtils.UpdateLocationViewCache
 
-	private lateinit var searchBox: EditText
+	private lateinit var searchEditText: EditText
 	private lateinit var buttonsBar: LinearLayout
 
 	private var searchedChatsIds = mutableSetOf<Long>()
@@ -74,7 +72,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 			setNavigationOnClickListener { dismiss() }
 		}
 
-		searchBox = mainView.findViewById<EditText>(R.id.searchEditText).apply {
+		searchEditText = mainView.findViewById<EditText>(R.id.searchEditText).apply {
 			addTextChangedListener(object : TextWatcher {
 
 				override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
@@ -111,13 +109,6 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 			})
 		}
 
-		val matrix = ColorMatrix()
-		matrix.setSaturation(0f)
-		val filter = ColorMatrixColorFilter(matrix)
-
-		mainView.findViewById<ImageView>(R.id.empty_state_background).colorFilter = filter
-		mainView.findViewById<ImageView>(R.id.empty_state_placeholder).colorFilter = filter
-
 		buttonsBar = mainView.findViewById<LinearLayout>(R.id.buttons_bar).apply {
 			findViewById<TextView>(R.id.primary_btn).apply {
 				text = getString(R.string.shared_string_continue)
@@ -162,6 +153,8 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
 		telegramHelper.addSearchListener(this)
 		locationViewCache = app.uiUtils.getUpdateLocationViewCache()
 		startLocationUpdate()
+		searchEditText.requestFocus()
+		AndroidUtils.softKeyboardDelayed(searchEditText)
 	}
 
 	override fun onPause() {