From 9dce6831b64dc7f831697fb063be947b7d305c66 Mon Sep 17 00:00:00 2001 From: tristan81 Date: Thu, 19 Sep 2024 00:04:53 +1000 Subject: [PATCH] .kt: resolved backing-property-naming error in ktLint, made matching properties public, matched names and refactored --- .../nrw/commons/customselector/ui/selector/FolderFragment.kt | 2 +- .../nrw/commons/customselector/ui/selector/ImageFragment.kt | 2 +- .../fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt | 2 +- .../free/nrw/commons/explore/paging/PagingDataSourceFactory.kt | 2 +- .../free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt | 2 +- .../fr/free/nrw/commons/explore/BasePagingPresenterTest.kt | 2 +- .../fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt index fd8a45650..6ca2b06e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt @@ -28,7 +28,7 @@ class FolderFragment : CommonsDaggerSupportFragment() { * ViewBinding */ private var _binding: FragmentCustomSelectorBinding? = null - private val binding get() = _binding + val binding get() = _binding /** * View Model for images. diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt index 9fde768ea..7e522f681 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt @@ -49,7 +49,7 @@ class ImageFragment : RefreshUIListener, PassDataListener { private var _binding: FragmentCustomSelectorBinding? = null - private val binding get() = _binding + val binding get() = _binding /** * Current bucketId. diff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt index 5582e8226..6c2f0882c 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/BasePagingPresenter.kt @@ -23,7 +23,7 @@ abstract class BasePagingPresenter( pageableBaseDataSource.loadingStates .observeOn(mainThreadScheduler) .subscribe(::onLoadingState, Timber::e), - pageableBaseDataSource.noItemsLoadedQueries.subscribe(view::showEmptyText), + pageableBaseDataSource.noItemsLoadedEvent.subscribe(view::showEmptyText), ) } diff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt index dbe2ef666..10529e29f 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSourceFactory.kt @@ -29,7 +29,7 @@ abstract class PageableBaseDataSource( private val _pagingResults = PublishProcessor.create>>() val pagingResults: Flowable>> = _pagingResults private val _noItemsLoadedEvent = PublishProcessor.create() - val noItemsLoadedQueries: Flowable = _noItemsLoadedEvent + val noItemsLoadedEvent: Flowable = _noItemsLoadedEvent private var currentFactory: PagingDataSourceFactory? = null abstract val loadFunction: LoadFunction diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt index 08ce0434b..d1f8e94b6 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/AdvanceQueryFragment.kt @@ -13,7 +13,7 @@ import fr.free.nrw.commons.databinding.FragmentAdvanceQueryBinding class AdvanceQueryFragment : Fragment() { private var _binding: FragmentAdvanceQueryBinding? = null - private val binding get() = _binding + val binding get() = _binding lateinit var callback: Callback diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt index 1f1f79b49..e3d69d41c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt @@ -48,7 +48,7 @@ class BasePagingPresenterTest { MockitoAnnotations.openMocks(this) whenever(pageableBaseDataSource.pagingResults).thenReturn(searchResults) whenever(pageableBaseDataSource.loadingStates).thenReturn(loadingStates) - whenever(pageableBaseDataSource.noItemsLoadedQueries) + whenever(pageableBaseDataSource.noItemsLoadedEvent) .thenReturn(noItemLoadedQueries) testScheduler = TestScheduler() basePagingPresenter = diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt index f7f876e1f..c0f9bd743 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt @@ -47,7 +47,7 @@ class PageableBaseDataSourceTest { fun `onQueryUpdated invokes livedatconverter with no items emitter`() { val (zeroItemsFuncCaptor, _) = expectNewLiveData() pageableBaseDataSource.onQueryUpdated("test") - pageableBaseDataSource.noItemsLoadedQueries + pageableBaseDataSource.noItemsLoadedEvent .test() .also { zeroItemsFuncCaptor.firstValue.invoke() } .assertValue("test")