From cf280029261e032e01a0b278d6ec8ca29e5dc398 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 6 Jun 2023 08:48:55 +0200 Subject: [PATCH] refs #5322 NaturePhotos --- .../feature/photos/fragment/PhotosFragment.kt | 12 ++++++++---- .../feature/photos/fragment/PhotosViewModel.kt | 16 ++-------------- app/src/main/res/drawable/photo_camera.xml | 8 ++++---- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt index 754395ee..e59dba73 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt @@ -117,17 +117,21 @@ responseinsert.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = View.GONE + binding.splashProgress.visibility = GONE if (it.isError) { ma.messageWithSound( - getString(R.string.noSIP) + it.errorMessage + getString(R.string.user) + title, + it.errorMessage + getString(R.string.user) + title, isError = true, true ) } else { - + ma.messageWithSound( + getString(R.string.itemUpdated), + isError = it.isError, + true, isToasted = null, + ) } }) @@ -138,11 +142,11 @@ private fun upLoadPhoto() { - println("llamada") val drawable = binding.userImage.drawable if (drawable is BitmapDrawable) { val bitmap = drawable.bitmap + println("Ruta"+saveBitmapAsTempFile(requireContext(),bitmap)) viewModel.uploadPhoto(saveBitmapAsTempFile(requireContext(),bitmap)) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt index 64288af3..b3c2dce7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt @@ -30,8 +30,8 @@ class PhotosViewModel(val context: Context) : BaseViewModel(context) { fun uploadPhoto( // val img = dataURItoBlob(cropper.getCroppedCanvas().toDataURL("image/png")) urlImage:String, - itemFK:Int = 10 , - itemId:String = "10" , + itemFK:Int = 11 , + itemId:String = "11" , date: Date = Date(), timestamp: Long = date.time, fileName: String = "${itemFK}_$timestamp", @@ -53,10 +53,6 @@ class PhotosViewModel(val context: Context) : BaseViewModel(context) { } override fun onSuccess(response: Response) { - - //sergio devuelve true o false - - if (response.body().toString() == "false") { _responseinsert.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( @@ -64,14 +60,6 @@ class PhotosViewModel(val context: Context) : BaseViewModel(context) { response.message() ) ) - } else { - - _responseinsert.value = - ResponseItemVO(isError = false, response = response.body()!!.toString()) - - } - - } }) diff --git a/app/src/main/res/drawable/photo_camera.xml b/app/src/main/res/drawable/photo_camera.xml index 87c27c5d..0359bf13 100644 --- a/app/src/main/res/drawable/photo_camera.xml +++ b/app/src/main/res/drawable/photo_camera.xml @@ -1,9 +1,9 @@ - +