fix trending thread

This commit is contained in:
k0shk0sh 2019-07-27 17:37:28 +02:00
parent 4590a4c426
commit c6afe869fd
3 changed files with 15 additions and 3 deletions

View File

@ -85,8 +85,15 @@ class IssueFragment : BaseFragment(), LockUnlockFragment.OnLockReasonSelected,
savedInstanceState: Bundle?
) {
swipeRefresh.appBarLayout = appBar
val scrollTop = toolbar.menu?.findItem(R.id.scrollTop)
appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, p1 ->
toolbar.menu?.findItem(R.id.scrollTop)?.isVisible = p1 < 0
val isVisible = p1 < 0
if (isVisible && scrollTop?.isVisible == false) {
scrollTop.isVisible = true
}
if (!isVisible && scrollTop?.isVisible == true) {
scrollTop.isVisible = false
}
})
setupToolbar("", R.menu.issue_menu)
(recyclerView.itemAnimator as? SimpleItemAnimator)?.supportsChangeAnimations = false
@ -247,7 +254,7 @@ class IssueFragment : BaseFragment(), LockUnlockFragment.OnLockReasonSelected,
opener.text = SpannableBuilder.builder()
.bold(model.author?.login)
.append(" opened this issue ")
.append(getString(R.string.opened_this_issue))
.append(model.createdAt?.timeAgo())
userIcon.loadAvatar(model.author?.avatarUrl, model.author?.url ?: "")

View File

@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
import com.fastaccess.data.model.FirebaseTrendingConfigModel
import com.fastaccess.data.model.TrendingModel
import com.fastaccess.data.model.parcelable.FilterTrendingModel
import com.fastaccess.data.repository.SchedulerProvider
import com.fastaccess.domain.repository.services.ScrapService
import com.fastaccess.github.BuildConfig
import com.fastaccess.github.base.BaseViewModel
@ -20,7 +21,8 @@ import javax.inject.Named
*/
class TrendingViewModel @Inject constructor(
@Named(value = "github_trending") private val databaseReference: DatabaseReference,
private val retrofitBuilder: Retrofit.Builder
private val retrofitBuilder: Retrofit.Builder,
private val schedulerProvider: SchedulerProvider
) : BaseViewModel() {
private var trendingModel = FirebaseTrendingConfigModel()
@ -50,6 +52,8 @@ class TrendingViewModel @Inject constructor(
val language = if (model.lang == "All") "" else model.lang.replace(" ", "_").toLowerCase()
service?.getTrending(language, model.since.name.toLowerCase())?.let { observable ->
justSubscribe(observable
.subscribeOn(schedulerProvider.ioThread())
.observeOn(schedulerProvider.uiThread())
.map { html ->
val document = Jsoup.parse(html, "")
val list = document.select(trendingModel.listName)

View File

@ -121,6 +121,7 @@
<string name="unlock" translatable="false">Unlock</string>
<string name="unlock_everything" translatable="false">Unlock Everything</string>
<string name="feeds" translatable="false">Feeds</string>
<string name="opened_this_issue" translatable="false">opened this issue</string>
<!-- END OF DO NOT COPY, START COPYING FROM LINE BELOW -->
<!--Please DO NOT translate github terms, such as Pull Request, Issues, Commits & etc.-->