From b06f875812384696090ec52e0d3cb03cf2478e72 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Sat, 2 Jan 2021 16:06:08 +0300
Subject: [PATCH] Fixes #4079 Menu item are not visible (#4145)

* Revert custom stylings of toolbar

* Enable back button on toolbar
---
 .../java/fr/free/nrw/commons/explore/SearchActivity.java   | 1 +
 app/src/main/res/layout/activity_search.xml                | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
index d3ca7f61b..487364dfc 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
@@ -69,6 +69,7 @@ public class SearchActivity extends BaseActivity
         ButterKnife.bind(this);
         setTitle(getString(R.string.title_activity_search));
         setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         toolbar.setNavigationOnClickListener(v->onBackPressed());
         supportFragmentManager = getSupportFragmentManager();
         setSearchHistoryFragment();
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 59bdf89e6..939ffdc46 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -23,15 +23,14 @@
             android:id="@+id/toolbar_search"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimaryDark"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:navigationIcon="@drawable/ic_arrow_back_white">
+            app:titleTextColor="?attr/toolbar_text_color"
+            app:subtitleTextColor="?attr/toolbar_text_color"
+          >
             <SearchView
                 android:id="@+id/searchBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
-                app:theme="@style/WhiteSearchBarTheme"
                 android:queryBackground="@android:color/transparent"
                 android:searchIcon="@null"
                 android:paddingLeft="-16dp"