|
|
@ -29,7 +29,6 @@ import com.keylesspalace.tusky.R |
|
|
|
import com.keylesspalace.tusky.ViewTagActivity |
|
|
|
import com.keylesspalace.tusky.ViewTagActivity |
|
|
|
import com.keylesspalace.tusky.adapter.SearchResultsAdapter |
|
|
|
import com.keylesspalace.tusky.adapter.SearchResultsAdapter |
|
|
|
import com.keylesspalace.tusky.di.Injectable |
|
|
|
import com.keylesspalace.tusky.di.Injectable |
|
|
|
import com.keylesspalace.tusky.entity.Attachment |
|
|
|
|
|
|
|
import com.keylesspalace.tusky.entity.SearchResults |
|
|
|
import com.keylesspalace.tusky.entity.SearchResults |
|
|
|
import com.keylesspalace.tusky.entity.Status |
|
|
|
import com.keylesspalace.tusky.entity.Status |
|
|
|
import com.keylesspalace.tusky.interfaces.StatusActionListener |
|
|
|
import com.keylesspalace.tusky.interfaces.StatusActionListener |
|
|
@ -58,7 +57,7 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { |
|
|
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { |
|
|
|
val preferences = PreferenceManager.getDefaultSharedPreferences(activity) |
|
|
|
val preferences = PreferenceManager.getDefaultSharedPreferences(view.context) |
|
|
|
alwaysShowSensitiveMedia = preferences.getBoolean("alwaysShowSensitiveMedia", false) |
|
|
|
alwaysShowSensitiveMedia = preferences.getBoolean("alwaysShowSensitiveMedia", false) |
|
|
|
mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true) |
|
|
|
mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true) |
|
|
|
|
|
|
|
|
|
|
@ -106,14 +105,18 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun displayNoResults() { |
|
|
|
private fun displayNoResults() { |
|
|
|
|
|
|
|
if(isAdded) { |
|
|
|
searchProgressBar.visibility = View.GONE |
|
|
|
searchProgressBar.visibility = View.GONE |
|
|
|
searchNoResultsText.visibility = View.VISIBLE |
|
|
|
searchNoResultsText.visibility = View.VISIBLE |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun hideFeedback() { |
|
|
|
private fun hideFeedback() { |
|
|
|
|
|
|
|
if(isAdded) { |
|
|
|
searchProgressBar.visibility = View.GONE |
|
|
|
searchProgressBar.visibility = View.GONE |
|
|
|
searchNoResultsText.visibility = View.GONE |
|
|
|
searchNoResultsText.visibility = View.GONE |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
override fun timelineCases(): TimelineCases { |
|
|
|
override fun timelineCases(): TimelineCases { |
|
|
|
return timelineCases |
|
|
|
return timelineCases |
|
|
|