Skip to content

Commit 5b7484e

Browse files
authored
Merge pull request #17376 from Hoossayn/17010_Detekt_Resolve_Suppress_All_Baseline_Warnings_long_method_MediaPickerFragment
Detekt - Resolve/Suppress All Baseline Warnings - Long methods warnings_ MediaPickerFragment
2 parents c91f080 + d88041f commit 5b7484e

2 files changed

Lines changed: 49 additions & 42 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,7 @@ class MediaPickerFragment : Fragment() {
235235
layoutManager.onRestoreInstanceState(it)
236236
}
237237
with(MediaPickerFragmentBinding.bind(view)) {
238-
binding = this
239-
recycler.layoutManager = layoutManager
240-
recycler.setEmptyView(actionableEmptyView)
241-
recycler.setHasFixedSize(true)
238+
setUpRecyclerView(layoutManager)
242239

243240
val swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(pullToRefresh) {
244241
viewModel.onPullToRefresh()
@@ -264,42 +261,9 @@ class MediaPickerFragment : Fragment() {
264261
}
265262
})
266263

267-
viewModel.onNavigate.observeEvent(viewLifecycleOwner,
268-
{ navigationEvent ->
269-
when (navigationEvent) {
270-
is PreviewUrl -> {
271-
MediaPreviewActivity.showPreview(
272-
requireContext(),
273-
null,
274-
navigationEvent.url
275-
)
276-
AccessibilityUtils.setActionModeDoneButtonContentDescription(
277-
activity,
278-
getString(R.string.cancel)
279-
)
280-
}
281-
is PreviewMedia -> MediaPreviewActivity.showPreview(
282-
requireContext(),
283-
null,
284-
navigationEvent.media,
285-
null
286-
)
287-
is EditMedia -> {
288-
val inputData = WPMediaUtils.createListOfEditImageInputData(
289-
requireContext(),
290-
navigationEvent.uris.map { wrapper -> wrapper.uri }
291-
)
292-
ActivityLauncher.openImageEditor(activity, inputData)
293-
}
294-
is InsertMedia -> listener?.onItemsChosen(navigationEvent.identifiers)
295-
is IconClickEvent -> listener?.onIconClicked(navigationEvent.action)
296-
Exit -> {
297-
val activity = requireActivity()
298-
activity.setResult(Activity.RESULT_CANCELED)
299-
activity.finish()
300-
}
301-
}
302-
})
264+
viewModel.onNavigate.observeEvent(viewLifecycleOwner) { navigationEvent ->
265+
navigateEvent(navigationEvent)
266+
}
303267

304268
viewModel.onPermissionsRequested.observeEvent(viewLifecycleOwner, {
305269
when (it) {
@@ -317,6 +281,51 @@ class MediaPickerFragment : Fragment() {
317281
}
318282
}
319283

284+
private fun navigateEvent(navigationEvent: MediaNavigationEvent) {
285+
when (navigationEvent) {
286+
is PreviewUrl -> {
287+
MediaPreviewActivity.showPreview(
288+
requireContext(),
289+
null,
290+
navigationEvent.url
291+
)
292+
AccessibilityUtils.setActionModeDoneButtonContentDescription(
293+
activity,
294+
getString(R.string.cancel)
295+
)
296+
}
297+
is PreviewMedia -> MediaPreviewActivity.showPreview(
298+
requireContext(),
299+
null,
300+
navigationEvent.media,
301+
null
302+
)
303+
is EditMedia -> {
304+
val inputData = WPMediaUtils.createListOfEditImageInputData(
305+
requireContext(),
306+
navigationEvent.uris.map { wrapper -> wrapper.uri }
307+
)
308+
ActivityLauncher.openImageEditor(activity, inputData)
309+
}
310+
is InsertMedia -> listener?.onItemsChosen(navigationEvent.identifiers)
311+
is IconClickEvent -> listener?.onIconClicked(navigationEvent.action)
312+
Exit -> {
313+
val activity = requireActivity()
314+
activity.setResult(Activity.RESULT_CANCELED)
315+
activity.finish()
316+
}
317+
}
318+
}
319+
320+
private fun MediaPickerFragmentBinding.setUpRecyclerView(
321+
layoutManager: GridLayoutManager
322+
) {
323+
binding = this
324+
recycler.layoutManager = layoutManager
325+
recycler.setEmptyView(actionableEmptyView)
326+
recycler.setHasFixedSize(true)
327+
}
328+
320329
override fun onDestroyView() {
321330
super.onDestroyView()
322331
binding = null

config/detekt/baseline.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ID>ComplexMethod:HomepageSettingsDialog.kt$HomepageSettingsDialog$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
1919
<ID>ComplexMethod:ImagePlaceholderManager.kt$ImagePlaceholderManager$fun getErrorResource(imgType: ImageType): Int?</ID>
2020
<ID>ComplexMethod:ImagePlaceholderManager.kt$ImagePlaceholderManager$fun getPlaceholderResource(imgType: ImageType): Int?</ID>
21-
<ID>ComplexMethod:MediaPickerFragment.kt$MediaPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
2221
<ID>ComplexMethod:MediaPickerViewModel.kt$MediaPickerViewModel$private fun buildUiModel( domainModel: DomainModel?, selectedIds: List&lt;Identifier>?, softAskRequest: SoftAskRequest?, isSearching: Boolean? ): PhotoListUiModel</ID>
2322
<ID>ComplexMethod:NoticonUtils.kt$NoticonUtils$fun noticonToGridicon(noticon: String): Int</ID>
2423
<ID>ComplexMethod:PostActionHandler.kt$PostActionHandler$fun handlePostButton(buttonType: PostListButtonType, post: PostModel, hasAutoSave: Boolean)</ID>
@@ -72,7 +71,6 @@
7271
<ID>LongMethod:BarChartViewHolder.kt$BarChartViewHolder$private fun BarChart.draw( item: BarChartItem, labelStart: TextView, labelEnd: TextView ): BarCount</ID>
7372
<ID>LongMethod:ClicksUseCase.kt$ClicksUseCase$override fun buildUiModel(domainModel: ClicksModel, uiState: SelectedClicksGroup): List&lt;BlockListItem></ID>
7473
<ID>LongMethod:HomepageSettingsDialog.kt$HomepageSettingsDialog$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
75-
<ID>LongMethod:MediaPickerFragment.kt$MediaPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
7674
<ID>LongMethod:MediaPickerViewModel.kt$MediaPickerViewModel$private fun buildUiModel( domainModel: DomainModel?, selectedIds: List&lt;Identifier>?, softAskRequest: SoftAskRequest?, isSearching: Boolean? ): PhotoListUiModel</ID>
7775
<ID>LongMethod:PrepublishingHomeViewModel.kt$PrepublishingHomeViewModel$private fun setupHomeUiState( editPostRepository: EditPostRepository, site: SiteModel, isStoryPost: Boolean )</ID>
7876
<ID>LongMethod:PublishSettingsFragment.kt$PublishSettingsFragment$override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View?</ID>

0 commit comments

Comments
 (0)