From f0f34789c55098e88df67421eac75541c4255482 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Wed, 18 Oct 2023 13:52:11 +0200 Subject: [PATCH] =?UTF-8?q?Add=20some=20missing=20`apply=20{=20=E2=80=A6?= =?UTF-8?q?=20}`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccessDeniedBottomSheetDialog.kt | 43 ++++++++++++------- .../NotSupportedExtensionBottomSheetDialog.kt | 42 ++++++++++-------- .../fileShare/FileShareAddUserDialog.kt | 21 +++++---- 3 files changed, 64 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/AccessDeniedBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/AccessDeniedBottomSheetDialog.kt index a318c1c432..58522c4dee 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/AccessDeniedBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/AccessDeniedBottomSheetDialog.kt @@ -49,29 +49,40 @@ class AccessDeniedBottomSheetDialog : InformationBottomSheetDialog() { title.setText(R.string.accessDeniedTitle) if (navigationArgs.isAdmin) { + description.setText(R.string.accessDeniedDescriptionIsAdmin) - actionButton.initProgress(this@AccessDeniedBottomSheetDialog) - actionButton.setText(R.string.buttonConfirmNotify) - actionButton.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.red_error)) - actionButton.setOnClickListener { - actionButton.showProgress() - informationBottomSheetViewModel.forceFolderAccess(navigationArgs.folderId) - .observe(viewLifecycleOwner) { apiResponse -> - if (apiResponse.data == null) { - SnackbarUtils.showSnackbar(requireView(), apiResponse.translateError()) - } else { - apiResponse.data?.let { hasAccess -> - if (hasAccess) navigateToTargetFolder() else closeAndShowRightError() + + actionButton.apply { + initProgress(this@AccessDeniedBottomSheetDialog) + setText(R.string.buttonConfirmNotify) + setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.red_error)) + setOnClickListener { + showProgress() + informationBottomSheetViewModel.forceFolderAccess(navigationArgs.folderId) + .observe(viewLifecycleOwner) { apiResponse -> + if (apiResponse.data == null) { + SnackbarUtils.showSnackbar(requireView(), apiResponse.translateError()) + } else { + apiResponse.data?.let { hasAccess -> + if (hasAccess) navigateToTargetFolder() else closeAndShowRightError() + } } + hideProgress(R.string.buttonConfirmNotify) } - actionButton.hideProgress(R.string.buttonConfirmNotify) - } + } } + secondaryActionButton.setText(R.string.buttonBack) + } else { + description.setText(R.string.accessDeniedDescriptionIsNotAdmin) - actionButton.setText(R.string.buttonClose) - actionButton.setOnClickListener { dismiss() } + + actionButton.apply { + setText(R.string.buttonClose) + setOnClickListener { dismiss() } + } + secondaryActionButton.isGone = true } } diff --git a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/NotSupportedExtensionBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/NotSupportedExtensionBottomSheetDialog.kt index 6659726ea4..3a63b1117f 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/NotSupportedExtensionBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/NotSupportedExtensionBottomSheetDialog.kt @@ -39,32 +39,40 @@ class NotSupportedExtensionBottomSheetDialog : InformationBottomSheetDialog() { override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(binding) { super.onViewCreated(view, savedInstanceState) + FileController.getFileById(navigationArgs.fileId)?.let { currentFile -> title.text = getString(R.string.notSupportedExtensionTitle, currentFile.getFileExtension()) description.text = getString(R.string.notSupportedExtensionDescription, currentFile.name) - illu.layoutParams.height = 50.toPx() - illu.layoutParams.width = 50.toPx() - illu.setImageResource(R.drawable.ic_info) - secondaryActionButton.setText(R.string.buttonOpenReadOnly) - secondaryActionButton.setOnClickListener { - requireContext().openOnlyOfficeActivity(currentFile) - dismiss() + illu.apply { + layoutParams.height = 50.toPx() + layoutParams.width = 50.toPx() + setImageResource(R.drawable.ic_info) + } + + secondaryActionButton.apply { + setText(R.string.buttonOpenReadOnly) + setOnClickListener { + requireContext().openOnlyOfficeActivity(currentFile) + dismiss() + } } - actionButton.initProgress(this@NotSupportedExtensionBottomSheetDialog) - actionButton.text = getString(R.string.buttonCreateOnlyOfficeCopy, currentFile.conversion?.onlyofficeExtension) - actionButton.setOnClickListener { - actionButton.showProgress() - mainViewModel.convertFile(currentFile).observe(viewLifecycleOwner) { apiResponse -> - when (apiResponse?.result) { - ApiResponse.Status.SUCCESS -> apiResponse.data?.let { newFile -> - requireContext().openOnlyOfficeActivity(newFile) + actionButton.apply { + initProgress(this@NotSupportedExtensionBottomSheetDialog) + text = getString(R.string.buttonCreateOnlyOfficeCopy, currentFile.conversion?.onlyofficeExtension) + setOnClickListener { + showProgress() + mainViewModel.convertFile(currentFile).observe(viewLifecycleOwner) { apiResponse -> + when (apiResponse?.result) { + ApiResponse.Status.SUCCESS -> apiResponse.data?.let { newFile -> + requireContext().openOnlyOfficeActivity(newFile) + } + else -> showSnackbar(apiResponse.translateError()) } - else -> showSnackbar(apiResponse.translateError()) + dismiss() } - dismiss() } } } diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt index 47175641f7..086b6184fc 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt @@ -33,6 +33,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.infomaniak.drive.MatomoDrive.trackShareRightsEvent import com.infomaniak.drive.R import com.infomaniak.drive.data.models.* +import com.infomaniak.drive.data.models.Shareable.* import com.infomaniak.drive.databinding.FragmentBottomSheetFileShareBinding import com.infomaniak.drive.ui.bottomSheetDialogs.SelectPermissionBottomSheetDialog import com.infomaniak.drive.ui.bottomSheetDialogs.SelectPermissionBottomSheetDialog.Companion.PERMISSION_BUNDLE_KEY @@ -60,7 +61,7 @@ class FileShareAddUserDialog : FullScreenBottomSheetDialog() { private val navigationArgs: FileShareAddUserDialogArgs by navArgs() private val selectedItems: Share = Share() - private var selectedPermission: Shareable.ShareablePermission = Shareable.ShareablePermission.READ + private var selectedPermission: ShareablePermission = ShareablePermission.READ set(value) { binding.filePermissionsIcon.setImageResource(value.icon) binding.filePermissionsValue.setText(value.translation) @@ -107,12 +108,14 @@ class FileShareAddUserDialog : FullScreenBottomSheetDialog() { selectedPermission = bundle.getParcelable(PERMISSION_BUNDLE_KEY)!! } - shareButton.initProgress(this@FileShareAddUserDialog) - shareButton.setOnClickListener { - shareButton.showProgress() - trackShareRightsEvent("inviteUser") - checkShare(selectedPermission) { file, body -> - createShareAndCloseDialog(file, body) + shareButton.apply { + initProgress(this@FileShareAddUserDialog) + setOnClickListener { + showProgress() + trackShareRightsEvent("inviteUser") + checkShare(selectedPermission) { file, body -> + createShareAndCloseDialog(file, body) + } } } } @@ -202,7 +205,7 @@ class FileShareAddUserDialog : FullScreenBottomSheetDialog() { } private fun checkShare( - newPermission: Shareable.ShareablePermission, + newPermission: ShareablePermission, onCheckApproved: (file: File, body: MutableMap) -> Unit ) = with(binding) { fileShareViewModel.currentFile.value?.let { file -> @@ -234,7 +237,7 @@ class FileShareAddUserDialog : FullScreenBottomSheetDialog() { } private fun showConflictDialog( - newPermission: Shareable.ShareablePermission, + newPermission: ShareablePermission, checkResults: ArrayList, onConflictApproved: () -> Unit ) {