diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index cf826d30f..d8bb2e3b0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java @@ -62,7 +62,7 @@ public class SearchFragment extends BaseStatusListFragment impleme if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N) setRetainInstance(true); loadData(); - setEmptyText(R.string.sk_recent_searches_placeholder); + resetEmptyText(); } @Override @@ -71,6 +71,10 @@ public class SearchFragment extends BaseStatusListFragment impleme imm=activity.getSystemService(InputMethodManager.class); } + private void resetEmptyText() { + setEmptyText(R.string.sk_recent_searches_placeholder); + } + @Override protected List buildDisplayItems(SearchResult s){ return switch(s.type){ @@ -120,6 +124,7 @@ public class SearchFragment extends BaseStatusListFragment impleme @Override protected void doLoadData(int offset, int count){ + resetEmptyText(); if(isInRecentMode()){ AccountSessionManager.getInstance().getAccount(accountID).getCacheController().getRecentSearches(sr->{ if(getActivity()==null) @@ -129,11 +134,13 @@ public class SearchFragment extends BaseStatusListFragment impleme onDataLoaded(sr, false); }); }else{ + setEmptyText(R.string.sk_searching); progressVisibilityListener.onProgressVisibilityChanged(true); currentRequest=new GetSearchResults(currentQuery, null, true) .setCallback(new Callback<>(){ @Override public void onSuccess(SearchResults result){ + setEmptyText(R.string.sk_no_results); ArrayList results=new ArrayList<>(); if(result.accounts!=null){ for(Account acc:result.accounts) @@ -154,6 +161,7 @@ public class SearchFragment extends BaseStatusListFragment impleme @Override public void onError(ErrorResponse error){ + resetEmptyText(); currentRequest=null; Activity a=getActivity(); if(a==null) diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index aa8bdb1ad..aad11b81a 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -143,7 +143,7 @@ Home Local Federation - Type something to start searching + Type to start searching Remove as follower Remove %s as a follower by blocking and immediately unblocking them? Remove @@ -227,4 +227,6 @@ Edited posts Edits a reblogged post Attach file + Searching… + No results \ No newline at end of file