Skip to content

Commit c947a17

Browse files
refactor: Clean code
1 parent dd608c3 commit c947a17

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

app/src/main/java/com/infomaniak/drive/ui/BasePreviewSliderFragment.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -125,25 +125,25 @@ abstract class BasePreviewSliderFragment : Fragment(), FileInfoActionsView.OnIte
125125

126126
registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
127127
override fun onPageSelected(position: Int) {
128-
val fragment = childFragmentManager.findFragmentByTag("f${previewSliderAdapter.getItemId(position)}")
129-
fragment?.trackScreen()
130-
131128
currentFile = previewSliderAdapter.getFile(position)
132129
previewSliderViewModel.currentPreview = currentFile
130+
131+
var shouldDisplayPageNumber = false
132+
133+
childFragmentManager.findFragmentByTag("f${previewSliderAdapter.getItemId(position)}")?.apply {
134+
this.trackScreen()
135+
shouldDisplayPageNumber = if (this is PreviewPDFFragment) this.tryToUpdatePageCount() else false
136+
}
137+
133138
with(header) {
134139
toggleEditVisibility(isVisible = currentFile.isOnlyOfficePreview())
135140
toggleOpenWithVisibility(isVisible = !isPublicShare && !currentFile.isOnlyOfficePreview())
141+
setPageNumberVisibility(isVisible = shouldDisplayPageNumber)
142+
setPrintButtonVisibility(isGone = !currentFile.isPDF())
136143
}
137144

138-
setPrintButtonVisibility(isGone = !currentFile.isPDF())
139145
(bottomSheetView as? FileInfoActionsView)?.openWith?.isGone = isPublicShare
140146
updateBottomSheetWithCurrentFile()
141-
142-
(fragment as? PreviewPDFFragment)?.let {
143-
binding.header.setPageNumberVisibility(it.tryToUpdatePageCount())
144-
} ?: run {
145-
binding.header.setPageNumberVisibility(false)
146-
}
147147
}
148148
})
149149
}

app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewPDFFragment.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,17 @@ class PreviewPDFFragment : PreviewFragment(), PDFPrintListener {
179179
// We can arrive here with a file different from a real PDF like OpenOffice documents
180180
val canPrintFile = externalFileUri != null || file.extensionType == ExtensionType.PDF.value
181181
shouldHidePrintOption(isGone = !canPrintFile)
182-
totalPageCount = pageCount
183-
currentPageIndex = 1
184182

185183
dismissPasswordDialog()
186184
updatePageNumber(totalPage = pageCount)
185+
187186
pdfViewPrintListener = this@PreviewPDFFragment
188187

189-
setPageNumberChipVisibility(true)
190188
binding.downloadLayout.root.isGone = true
189+
190+
totalPageCount = pageCount
191+
currentPageIndex = 1
192+
setPageNumberChipVisibility(true)
191193
}
192194
onPageChange { currentPage, pageCount ->
193195
currentPageIndex = currentPage

0 commit comments

Comments
 (0)