diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt index 6bf3b143..89ed0103 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt @@ -84,11 +84,9 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) { is DataState.Success -> { entriesAdapter.submitList(dataState.data) binding.entriesProgress.visibility = View.INVISIBLE - binding.entriesRecycler.visibility = View.VISIBLE } is DataState.Loading -> { binding.entriesProgress.visibility = View.VISIBLE - binding.entriesRecycler.visibility = View.INVISIBLE } else -> {} } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt index fe3ca302..807a4502 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt @@ -23,6 +23,7 @@ import com.rtbishop.look4sat.domain.ISettings import com.rtbishop.look4sat.domain.model.DataState import com.rtbishop.look4sat.domain.model.SatItem import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.delay import java.util.* import javax.inject.Inject @@ -34,7 +35,10 @@ class EntriesViewModel @Inject constructor( private val transModes = MutableLiveData(settings.loadModesSelection()) private val currentQuery = MutableLiveData(String()) - private val itemsFromRepo = liveData { emit(loadEntriesWithSelection()) } as MutableLiveData + private val itemsFromRepo = liveData { + delay(125) + emit(loadEntriesWithSelection()) + } as MutableLiveData private val itemsWithModes = transModes.switchMap { modes -> itemsFromRepo.map { items -> filterByModes(items, modes) } } diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index ff1ea97f..f9c1c689 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:transitionGroup="true"> + android:layout_height="match_parent" + android:transitionGroup="true"> + android:layout_height="match_parent" + android:transitionGroup="true"> + app:destination="@id/nav_modes" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_filter" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_sources" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_entries" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_passes" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_radar" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_map" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_settings" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_position" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" /> + app:destination="@id/nav_locator" + app:enterAnim="@anim/nav_default_enter_anim" + app:exitAnim="@anim/nav_default_exit_anim" + app:popEnterAnim="@anim/nav_default_pop_enter_anim" + app:popExitAnim="@anim/nav_default_pop_exit_anim" />