From 6e4519ef93f295178e0b850b739bd0085de6aa17 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 29 Sep 2020 22:19:54 +0800 Subject: Display search history in SearchActivity. Save suggested sort type and nsfw info in database for SubredditData. Fix an issue in parsing posts. --- .../res/drawable/ic_header_hashtag_black_24dp.xml | 9 --- app/src/main/res/drawable/ic_history_24dp.xml | 9 +++ app/src/main/res/drawable/ic_title_24dp.xml | 9 +++ app/src/main/res/layout/activity_search.xml | 74 +++++++++++++++------- .../main/res/layout/item_recent_search_query.xml | 19 ++++++ app/src/main/res/values/strings.xml | 2 + 6 files changed, 89 insertions(+), 33 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_header_hashtag_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_history_24dp.xml create mode 100644 app/src/main/res/drawable/ic_title_24dp.xml create mode 100644 app/src/main/res/layout/item_recent_search_query.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable/ic_header_hashtag_black_24dp.xml b/app/src/main/res/drawable/ic_header_hashtag_black_24dp.xml deleted file mode 100644 index 1cef8584..00000000 --- a/app/src/main/res/drawable/ic_header_hashtag_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml new file mode 100644 index 00000000..a3fbac1c --- /dev/null +++ b/app/src/main/res/drawable/ic_history_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_title_24dp.xml b/app/src/main/res/drawable/ic_title_24dp.xml new file mode 100644 index 00000000..3e622fe7 --- /dev/null +++ b/app/src/main/res/drawable/ic_title_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 0048e1fc..972ba2af 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -48,38 +48,64 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:orientation="vertical"> - + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:padding="16dp"> + + + + + + + + - - + android:padding="16dp" + android:text="@string/recent_searches" + android:fontFamily="?attr/font_family" + android:visibility="gone" /> + + + + diff --git a/app/src/main/res/layout/item_recent_search_query.xml b/app/src/main/res/layout/item_recent_search_query.xml new file mode 100644 index 00000000..f014e2fe --- /dev/null +++ b/app/src/main/res/layout/item_recent_search_query.xml @@ -0,0 +1,19 @@ + + + + + + \ 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 bd3f0681..5b85708a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -912,4 +912,6 @@ Award given Failed + Recent searches + -- cgit v1.2.3