feat: Add back button in chat search activity (#2358)

* feat: Add back button in chat search activity

* feat: Show query in actionbar

Author: atm1504

app/src/main/AndroidManifest.xml

@@ -22,7 +22,12 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         android:vmSafeMode="true">
-        <activity android:name=".chat.search.ChatSearchActivity"></activity>
+        <activity android:name=".chat.search.ChatSearchActivity"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/PreferencesThemeLight">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.fossasia.susi.ai.chat.search.ChatSearchActivity" /></activity>
         <activity
             android:name=".login.WelcomeActivity"
             android:theme="@style/PreferenceFixTheme.DayNight.NoActionBar">

app/src/main/java/org/fossasia/susi/ai/chat/search/ChatSearchActivity.kt

@@ -11,7 +11,6 @@ import org.fossasia.susi.ai.data.db.DatabaseRepository
 import android.content.Intent
 import android.view.View
 import android.widget.Toast
-import kotlinx.android.synthetic.main.activity_chat_search.chatSearchToolbar
 import kotlinx.android.synthetic.main.activity_chat_search.search_not_found
 import org.fossasia.susi.ai.chat.ChatActivity
 
@@ -29,7 +28,8 @@ class ChatSearchActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         var bundle: Bundle ? = intent.extras
         query = bundle?.getString("query") as String
-        setSupportActionBar(chatSearchToolbar)
+
+        this.title = getString(R.string.search_results) + " - " + query
 
         setContentView(R.layout.activity_chat_search)
         loadQueryList(realm, query)

app/src/main/res/layout/activity_chat_search.xml

@@ -7,21 +7,6 @@
     android:orientation="vertical"
     tools:context="org.fossasia.susi.ai.chat.search.ChatSearchActivity">
 
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/chatSearchToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:title="Search Results" />
-
-    </android.support.design.widget.AppBarLayout>
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">

app/src/main/res/values/strings.xml

@@ -567,6 +567,7 @@
         \nYou agree that the laws of Can Tho, Vietnam will apply to any disputes arising out of or relating to these terms or the Services. All claims arising out of or relating to these terms or the services will be litigated exclusively in the courts of Can Tho City, Vietnam, and you and SUSI consent to personal jurisdiction in those courts.
         \nFor information about how to contact SUSI, please visit our contact page.</string>
     <string name="title_activity_chat_search_main">ChatSearchMainActivity</string>
+    <string name="search_results">Search Results</string>
     <string name="settings_help">Help</string>
     <string name="settings_help_key">help</string>
     <string name="settings_privacy">Privacy</string>