From 531706368900cd95b9418c6c565e0b2ebc5d1469 Mon Sep 17 00:00:00 2001
From: Adam Jones <jones_adam@rocketmail.com>
Date: Tue, 1 Jan 2019 10:55:46 +0000
Subject: [PATCH] Fix night mode issues with search and categories (#2213)

---
 .../nrw/commons/explore/SearchActivity.java   |  7 ------
 .../RecentSearchesFragment.java               | 23 ++++---------------
 .../main/res/layout/item_recent_searches.xml  |  1 -
 .../item_recent_searches_dark_theme.xml       |  9 --------
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/layout/item_recent_searches_dark_theme.xml

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 98a6d4b90..489cc99fd 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
@@ -58,16 +58,9 @@ public class SearchActivity extends NavigationBaseActivity implements MediaDetai
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        boolean currentThemeIsDark = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme", false);
         setContentView(R.layout.activity_search);
         ButterKnife.bind(this);
         initDrawer();
-        if (currentThemeIsDark) {
-            searchView.setBackgroundResource(R.color.vpi__bright_foreground_disabled_holo_dark);
-            tabLayout.setBackgroundResource(R.color.vpi__bright_foreground_disabled_holo_dark);
-            toolbar.setBackgroundResource(R.color.vpi__bright_foreground_disabled_holo_dark);
-            viewPager.setBackgroundResource(R.color.vpi__bright_foreground_disabled_holo_dark);
-        }
         setTitle(getString(R.string.title_activity_search));
         toolbar.setNavigationOnClickListener(v->onBackPressed());
         supportFragmentManager = getSupportFragmentManager();
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
index d697eb399..9f645756c 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
@@ -1,8 +1,6 @@
 package fr.free.nrw.commons.explore.recentsearches;
 
-import android.content.Context;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,7 +32,6 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
     ArrayAdapter adapter;
     @BindView(R.id.recent_searches_delete_button)
     ImageView recent_searches_delete_button;
-    boolean currentThemeIsDark = false;
     @BindView(R.id.recent_searches_text_view)
     TextView recent_searches_text_view;
 
@@ -68,13 +65,12 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
                 .create()
                 .show();
         });
-        currentThemeIsDark = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("theme", false);
-        setAdapterForThemes(getContext(), currentThemeIsDark);
-        
+
+        adapter = new ArrayAdapter<>(requireContext(), R.layout.item_recent_searches, recentSearches);
         recentSearchesList.setAdapter(adapter);
         recentSearchesList.setOnItemClickListener((parent, view, position, id) -> (
                 (SearchActivity)getContext()).updateText(recentSearches.get(position)));
-        adapter.notifyDataSetChanged();
+        updateRecentSearches();
         return rootView;
     }
 
@@ -84,8 +80,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
      */
     @Override
     public void onResume() {
-        recentSearches = recentSearchesDao.recentSearches(10);
-        adapter.notifyDataSetChanged();
+        updateRecentSearches();
         super.onResume();
     }
 
@@ -94,8 +89,6 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
      */
     public void updateRecentSearches() {
         recentSearches = recentSearchesDao.recentSearches(10);
-        setAdapterForThemes(getContext(), currentThemeIsDark);
-        recentSearchesList.setAdapter(adapter);
         adapter.notifyDataSetChanged();
 
         if(!recentSearches.isEmpty()) {
@@ -103,12 +96,4 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
             recent_searches_text_view.setText(R.string.search_recent_header);
         }
     }
-
-    private void setAdapterForThemes(Context context, boolean currentThemeIsDark) {
-        if (currentThemeIsDark) {
-            adapter = new ArrayAdapter<String>(context, R.layout.item_recent_searches_dark_theme, recentSearches);
-        } else {
-            adapter = new ArrayAdapter<String>(context, R.layout.item_recent_searches, recentSearches);
-        }
-    }
 }
diff --git a/app/src/main/res/layout/item_recent_searches.xml b/app/src/main/res/layout/item_recent_searches.xml
index 6b0b0b68e..b0050eb40 100644
--- a/app/src/main/res/layout/item_recent_searches.xml
+++ b/app/src/main/res/layout/item_recent_searches.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView android:id="@+id/textView1"
     android:layout_width="match_parent"
-    android:background="@color/item_white_background"
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:padding="@dimen/standard_gap"
diff --git a/app/src/main/res/layout/item_recent_searches_dark_theme.xml b/app/src/main/res/layout/item_recent_searches_dark_theme.xml
deleted file mode 100644
index 1f8be3141..000000000
--- a/app/src/main/res/layout/item_recent_searches_dark_theme.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textView2"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/vpi__bright_foreground_disabled_holo_dark"
-    android:padding="@dimen/standard_gap"
-    android:text="@string/search_commons"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
\ No newline at end of file