From 6475dd3f05e7f02de7353315ea7db2ef3a875214 Mon Sep 17 00:00:00 2001 From: Abhishek <52370265+abhishekabhi789@users.noreply.github.com> Date: Thu, 14 Sep 2023 19:59:40 +0530 Subject: Added a button to clear all recent searches. (#1487) * Added a button to clear all recent searches. - Deletes all the searches for the current user from the database. - Delete icon placed at the end of subreddit name layout in the activity search layout(I couldn't find a better place for it). _Icon visible only when there are recent searches. * Confirmation dialog shows when clearing all search history. --- .../activities/SearchActivity.java | 10 ++++ .../DeleteAllRecentSearchQueries.java | 64 ++++++++++++++++++++++ .../recentsearchquery/RecentSearchQueryDao.java | 3 + 3 files changed, 77 insertions(+) create mode 100644 app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteAllRecentSearchQueries.java (limited to 'app/src/main/java/ml/docilealligator') diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java index 4bf0bcfa..3e786f2c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java @@ -47,6 +47,7 @@ import ml.docilealligator.infinityforreddit.apis.RedditAPI; import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; import ml.docilealligator.infinityforreddit.customviews.slidr.Slidr; import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent; +import ml.docilealligator.infinityforreddit.recentsearchquery.DeleteAllRecentSearchQueries; import ml.docilealligator.infinityforreddit.recentsearchquery.DeleteRecentSearchQuery; import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery; import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQueryViewModel; @@ -95,6 +96,8 @@ public class SearchActivity extends BaseActivity { ImageView clearSearchTextImageView; @BindView(R.id.link_handler_image_view_search_activity) ImageView linkHandlerImageView; + @BindView(R.id.delete_all_recent_searches_image_view_search_activity) + ImageView deleteAllSearchesImageView; @BindView(R.id.subreddit_name_relative_layout_search_activity) RelativeLayout subredditNameRelativeLayout; @BindView(R.id.search_in_text_view_search_activity) @@ -156,6 +159,7 @@ public class SearchActivity extends BaseActivity { setSupportActionBar(toolbar); clearSearchTextImageView.setVisibility(View.GONE); + deleteAllSearchesImageView.setVisibility(View.GONE); searchOnlySubreddits = getIntent().getBooleanExtra(EXTRA_SEARCH_ONLY_SUBREDDITS, false); searchOnlyUsers = getIntent().getBooleanExtra(EXTRA_SEARCH_ONLY_USERS, false); @@ -269,6 +273,10 @@ public class SearchActivity extends BaseActivity { } }); + deleteAllSearchesImageView.setOnClickListener(view -> { + DeleteAllRecentSearchQueries.deleteAllRecentSearchQueriesListener(this,mRedditDataRoomDatabase,mAccountName, () -> {}); + }); + if (savedInstanceState != null) { subredditName = savedInstanceState.getString(SUBREDDIT_NAME_STATE); subredditIsUser = savedInstanceState.getBoolean(SUBREDDIT_IS_USER_STATE); @@ -326,8 +334,10 @@ public class SearchActivity extends BaseActivity { mRecentSearchQueryViewModel.getAllRecentSearchQueries().observe(this, recentSearchQueries -> { if (recentSearchQueries != null && !recentSearchQueries.isEmpty()) { divider.setVisibility(View.VISIBLE); + deleteAllSearchesImageView.setVisibility(View.VISIBLE); } else { divider.setVisibility(View.GONE); + deleteAllSearchesImageView.setVisibility(View.GONE); } adapter.setRecentSearchQueries(recentSearchQueries); }); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteAllRecentSearchQueries.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteAllRecentSearchQueries.java new file mode 100644 index 00000000..1aeac1d3 --- /dev/null +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/DeleteAllRecentSearchQueries.java @@ -0,0 +1,64 @@ +package ml.docilealligator.infinityforreddit.recentsearchquery; + +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.os.AsyncTask; + +import ml.docilealligator.infinityforreddit.R; +import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; + +public class DeleteAllRecentSearchQueries { + public static void deleteAllRecentSearchQueriesListener(Context context, RedditDataRoomDatabase redditDataRoomDatabase, String username, + DeleteAllRecentSearchQueriesListener deleteAllRecentSearchQueriesListener) { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(R.string.confirm); + builder.setMessage(R.string.confirm_delete_all_recent_searches); + builder.setPositiveButton(context.getString(R.string.yes), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + new DeleteRecentSearchQueryAsyncTask(context, redditDataRoomDatabase, username, deleteAllRecentSearchQueriesListener).execute(); + } + }); + builder.setNegativeButton(context.getString(R.string.no), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + AlertDialog dialog = builder.create(); + dialog.show(); + } + + public interface DeleteAllRecentSearchQueriesListener { + void success(); + } + + private static class DeleteRecentSearchQueryAsyncTask extends AsyncTask { + + private RecentSearchQueryDao recentSearchQueryDao; + private String username; + private DeleteAllRecentSearchQueriesListener deleteAllRecentSearchQueriesListener; + private Context context; + + public DeleteRecentSearchQueryAsyncTask(Context context, RedditDataRoomDatabase redditDataRoomDatabase, + String username, + DeleteAllRecentSearchQueriesListener deleteRecentSearchQueryListener) { + this.recentSearchQueryDao = redditDataRoomDatabase.recentSearchQueryDao(); + this.username = username; + this.deleteAllRecentSearchQueriesListener = deleteRecentSearchQueryListener; + this.context = context; + } + + @Override + protected Void doInBackground(Void... voids) { + recentSearchQueryDao.deleteAllRecentSearchQueries(username); + return null; + } + + @Override + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); + deleteAllRecentSearchQueriesListener.success(); + } + } +} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java index ae3ec0ee..407b5614 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/recentsearchquery/RecentSearchQueryDao.java @@ -20,6 +20,9 @@ public interface RecentSearchQueryDao { @Query("SELECT * FROM recent_search_queries WHERE username = :username ORDER BY time DESC") List getAllRecentSearchQueries(String username); + @Query("DELETE FROM recent_search_queries WHERE username = :username") + void deleteAllRecentSearchQueries(String username); + @Delete void deleteRecentSearchQueries(RecentSearchQuery recentSearchQuery); } -- cgit v1.2.3