Commit b744bb0a authored by Viktor De Pasquale's avatar Viktor De Pasquale

Fixed loading showing in incorrect view-states

parent 0f140b40
...@@ -122,9 +122,8 @@ class ModuleViewModel( ...@@ -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()
......
...@@ -24,7 +24,7 @@ ...@@ -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 @@ ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment