From f0747c65cb62c7866119da033c2bc70726053100 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <chineseperson5@gmail.com>
Date: Wed, 1 Jun 2022 15:41:01 +0800
Subject: Use EditText instead of SimpleSearchView in SearchActivity.

---
 app/src/main/res/layout/activity_search.xml        | 40 ++++++++++------------
 .../main/res/layout/activity_view_post_detail.xml  |  2 +-
 app/src/main/res/menu/search_activity.xml          | 12 -------
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/main/res/menu/search_activity.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 29b5b94f..cb3305fe 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -13,32 +13,28 @@
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <FrameLayout
-            android:id="@+id/toolbar_frame_layout_search_activity"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:navigationIcon="?attr/homeAsUpIndicator">
 
-            <com.ferfalk.simplesearchview.SimpleSearchView
-                android:id="@+id/search_view_search_activity"
+            <EditText
+                android:id="@+id/search_edit_text_search_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:backIconAlpha="1"
-                app:backIconTint="@android:color/white"
-                app:cursorColor="@android:color/white"
-                app:hintColor="#E0E0E0"
-                app:iconsAlpha="1"
-                app:iconsTint="@android:color/white"
-                app:searchBackground="?attr/colorPrimary"
-                app:voiceSearch="true" />
-
-        </FrameLayout>
+                android:background="#00000000"
+                android:gravity="top"
+                android:hint="@string/search"
+                android:maxLines="1"
+                android:textSize="?attr/font_20"
+                android:fontFamily="?attr/font_family"
+                android:inputType="textNoSuggestions"
+                android:imeOptions="actionSearch" />
+
+        </androidx.appcompat.widget.Toolbar>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index 3746f5c6..6fd17685 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -113,7 +113,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:padding="8dp"
-                android:src="@drawable/ic_close_black_24dp"
+                android:src="@drawable/ic_close_24dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true" />
diff --git a/app/src/main/res/menu/search_activity.xml b/app/src/main/res/menu/search_activity.xml
deleted file mode 100644
index b7abcc32..00000000
--- a/app/src/main/res/menu/search_activity.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:application="ml.docilealligator.infinityforreddit.activities.SearchResultActivity">
-    <item
-        android:id="@+id/action_search_search_activity"
-        android:orderInCategory="1"
-        android:title="@string/action_search"
-        android:icon="@drawable/ic_search_toolbar_24dp"
-        app:showAsAction="ifRoom" />
-</menu>
-- 
cgit v1.2.3