MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed loading showing in incorrect view-states

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-11-16 19:20:44 +01:00
parent 0f140b408c
commit b744bb0a5a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
View File

@ -122,9 +122,8 @@ class ModuleViewModel(
moveToState() moveToState()
} }
fun loadRemoteImplicit() = downloadRepos() fun loadRemoteImplicit() = let { items.clear(); itemsSearch.clear() }
.observeOn(AndroidSchedulers.mainThread()) .run { downloadRepos() }
.doOnComplete { items.clear(); itemsSearch.clear() }
.applyViewModel(this, false) .applyViewModel(this, false)
.subscribeK { refresh(); submitQuery() } .subscribeK { refresh(); submitQuery() }
.add() .add()

4
app/src/main/res/layout/fragment_module_md2.xml
View File

@ -24,7 +24,7 @@
adapter="@{viewModel.adapter}" adapter="@{viewModel.adapter}"
dividerHorizontal="@{R.drawable.divider_l1}" dividerHorizontal="@{R.drawable.divider_l1}"
dividerVertical="@{R.drawable.divider_l1}" dividerVertical="@{R.drawable.divider_l1}"
gone="@{viewModel.loading}" gone="@{viewModel.loading && viewModel.items.empty}"
itemBinding="@{viewModel.itemBinding}" itemBinding="@{viewModel.itemBinding}"
items="@{viewModel.items}" items="@{viewModel.items}"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -71,7 +71,7 @@
</com.google.android.material.circularreveal.cardview.CircularRevealCardView> </com.google.android.material.circularreveal.cardview.CircularRevealCardView>
<LinearLayout <LinearLayout
goneUnless="@{viewModel.loading}" goneUnless="@{viewModel.loading &amp;&amp; viewModel.items.empty}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"