diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt index 400d0055..5e97c6b4 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -45,6 +45,11 @@ class ExploreFragment : MainNavFragmentX() { val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) appsItemAdapter = PagedModelAdapter(PRODUCT_ASYNC_DIFFER_CONFIG) { it.data_item?.let { item -> @@ -64,12 +69,6 @@ class ExploreFragment : MainNavFragmentX() { .setThumbDrawable(this.context.getDrawableCompat(R.drawable.scrollbar_thumb)) .build() } - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - //viewModel.fillList(source) viewModel.db.repositoryDao.allFlowable .observeOn(Schedulers.io()) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt index b962b0e4..8b01c303 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt @@ -49,6 +49,11 @@ class InstalledFragment : MainNavFragmentX() { val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) installedItemAdapter = PagedModelAdapter(PRODUCT_ASYNC_DIFFER_CONFIG) { it.data_item?.let { item -> @@ -80,12 +85,6 @@ class InstalledFragment : MainNavFragmentX() { recycledViewPool.setMaxRecycledViews(AppListAdapter.ViewType.PRODUCT.ordinal, 30) adapter = updatedFastAdapter } - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - //viewModel.fillList(source) viewModel.db.repositoryDao.allFlowable .observeOn(Schedulers.io()) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt index 9cc6c4f4..a2aef47a 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt @@ -50,6 +50,11 @@ class LatestFragment : MainNavFragmentX() { val viewModelFactory = MainNavFragmentViewModelX.Factory(mainActivityX.db, source) viewModel = ViewModelProvider(this, viewModelFactory) .get(MainNavFragmentViewModelX::class.java) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) updatedItemAdapter = PagedModelAdapter(PRODUCT_ASYNC_DIFFER_CONFIG) { it.data_item?.let { item -> @@ -81,12 +86,6 @@ class LatestFragment : MainNavFragmentX() { recycledViewPool.setMaxRecycledViews(AppListAdapter.ViewType.PRODUCT.ordinal, 30) adapter = newFastAdapter } - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - //viewModel.fillList(source) viewModel.db.repositoryDao.allFlowable .observeOn(Schedulers.io())