diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2019-02-26 01:27:51 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2019-02-26 01:27:51 +0000 |
| commit | 0ea2b24c608e8319499f4d1eda5abf10f10e1edd (patch) | |
| tree | c0c8f64ab9eaee641a4e26093c45c8aec22afbd9 /app/src/main/res | |
| parent | b1db59fda2031cc43da6663144998f457ffc4f97 (diff) | |
| download | infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar.gz infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar.bz2 infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar.lz infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar.xz infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.tar.zst infinity-for-reddit-0ea2b24c608e8319499f4d1eda5abf10f10e1edd.zip | |
Add two features: refresh searching and searching in SearchActivity. Fixed a bug which is the listener object is null when it is called because the parse failed in ParsePost, ParseSubredditData and ParseUserData.
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_search.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 35 insertions, 5 deletions
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 8d080b46..f6ff281f 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -11,12 +11,32 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_search_activity" + <FrameLayout android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + android:layout_height="wrap_content"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_search_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + <com.ferfalk.simplesearchview.SimpleSearchView + android:id="@+id/search_view_search_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textColor="@android:color/white" + app:voiceSearch="true" + app:searchBackground="@color/colorPrimary" + app:cursorColor="@android:color/white" + app:hintColor="#E0E0E0" + app:iconsTint="@android:color/white" + app:backIconTint="@android:color/white" + app:iconsAlpha="1" + app:backIconAlpha="1" /> + + </FrameLayout> <com.google.android.material.tabs.TabLayout android:id="@+id/tab_layout_search_activity" @@ -34,6 +54,14 @@ </com.google.android.material.appbar.AppBarLayout> + <View + android:id="@+id/transparent_overlay_search_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#40000000" + android:elevation="1dp" + android:visibility="gone"/> + <androidx.viewpager.widget.ViewPager android:id="@+id/view_pager_search_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 021d5ddf..360767c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,6 +13,8 @@ <string name="tap_to_retry">Error loading image. Tap to retry.</string> <string name="load_posts_error">Error loading posts.\nTap to retry.</string> + <string name="search_subreddits_error">Error searching subreddits.\nTap to retry.</string> + <string name="search_users_error">Error searching users.\nTap to retry.</string> <string name="no_posts">No posts found.</string> <string name="no_subreddits">No subreddits found.</string> <string name="no_users">No users found.</string> |