From 60a2f7c1c51456d025f92c191b51cf38e411ae21 Mon Sep 17 00:00:00 2001
From: reduplicated <110570621+reduplicated@users.noreply.github.com>
Date: Sat, 5 Nov 2022 01:27:35 +0100
Subject: [PATCH] clear history
---
.../cloudstream3/ui/search/SearchFragment.kt | 39 ++++++++++++++++++-
app/src/main/res/drawable/delete_all.xml | 9 +++++
app/src/main/res/layout/fragment_search.xml | 19 +++++++++
app/src/main/res/values/strings.xml | 3 ++
4 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/res/drawable/delete_all.xml
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index bcb36f7e..e6e290c1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -1,5 +1,6 @@
package com.lagradost.cloudstream3.ui.search
+import android.content.DialogInterface
import android.content.res.Configuration
import android.os.Bundle
import android.view.LayoutInflater
@@ -10,6 +11,7 @@ import android.widget.AbsListView
import android.widget.ArrayAdapter
import android.widget.ImageView
import android.widget.ListView
+import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.SearchView
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
@@ -28,6 +30,7 @@ import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
import com.lagradost.cloudstream3.APIHolder.getApiSettings
import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
import com.lagradost.cloudstream3.mvvm.Resource
@@ -343,7 +346,7 @@ class SearchFragment : Fragment() {
searchViewModel.updateHistory()
}
- search_history_recycler?.isVisible = showHistory
+ search_history_holder?.isVisible = showHistory
search_master_recycler?.isVisible = !showHistory && isAdvancedSearch
search_autofit_results?.isVisible = !showHistory && !isAdvancedSearch
@@ -352,7 +355,41 @@ class SearchFragment : Fragment() {
}
})
+ search_clear_call_history?.setOnClickListener {
+ activity?.let { ctx ->
+ val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
+ val dialogClickListener =
+ DialogInterface.OnClickListener { _, which ->
+ when (which) {
+ DialogInterface.BUTTON_POSITIVE -> {
+ removeKeys(SEARCH_HISTORY_KEY)
+ searchViewModel.updateHistory()
+ }
+ DialogInterface.BUTTON_NEGATIVE -> {
+ }
+ }
+ }
+
+ try {
+ builder.setTitle(R.string.clear_history).setMessage(
+ ctx.getString(R.string.delete_message).format(
+ ctx.getString(R.string.history)
+ )
+ )
+ .setPositiveButton(R.string.sort_clear, dialogClickListener)
+ .setNegativeButton(R.string.cancel, dialogClickListener)
+ .show()
+ } catch (e: Exception) {
+ logError(e)
+ // ye you somehow fucked up formatting did you?
+ }
+ }
+
+
+ }
+
observe(searchViewModel.currentHistory) { list ->
+ search_clear_call_history?.isVisible = list.isNotEmpty()
(search_history_recycler.adapter as? SearchHistoryAdaptor?)?.updateList(list)
}
diff --git a/app/src/main/res/drawable/delete_all.xml b/app/src/main/res/drawable/delete_all.xml
new file mode 100644
index 00000000..a5e8775c
--- /dev/null
+++ b/app/src/main/res/drawable/delete_all.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 083cd64e..6df5837f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -112,6 +112,11 @@
android:nextFocusLeft="@id/nav_rail_view"
android:visibility="gone"
tools:listitem="@layout/homepage_parent" />
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 144d2477..e3ef9f6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -647,4 +647,7 @@
Mixed opening
Credits
Intro
+
+ Clear history
+ History