From 21197ad0a50d50f4f447c23b77f1d32a5143b2ad Mon Sep 17 00:00:00 2001 From: Aryankc2 Date: Wed, 30 Apr 2025 18:06:19 +0530 Subject: [PATCH] pdf will chaneg --- .../data/models/responses/InspectionData.kt | 2 +- .../ui/damagedetails/DamageDetailsFragment.kt | 14 +++++++++++--- .../fieldagent/ui/homescreen/HomeFragment.kt | 11 ++++++----- .../fieldagent/ui/homescreen/HomeViewModel.kt | 12 ++++++++++++ app/src/main/res/layout/fill_image_adapter.xml | 1 + .../main/res/layout/fragment_damage_details.xml | 2 +- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/fieldagent/data/models/responses/InspectionData.kt b/app/src/main/java/com/example/fieldagent/data/models/responses/InspectionData.kt index 3efd801..b072e92 100644 --- a/app/src/main/java/com/example/fieldagent/data/models/responses/InspectionData.kt +++ b/app/src/main/java/com/example/fieldagent/data/models/responses/InspectionData.kt @@ -11,7 +11,7 @@ data class InspectionData ( data class ListData ( - val inspections: List? = null, + val inspections: ArrayList? = null, val pagination: Pagination? = null ) diff --git a/app/src/main/java/com/example/fieldagent/ui/damagedetails/DamageDetailsFragment.kt b/app/src/main/java/com/example/fieldagent/ui/damagedetails/DamageDetailsFragment.kt index 376d84b..69e68e5 100644 --- a/app/src/main/java/com/example/fieldagent/ui/damagedetails/DamageDetailsFragment.kt +++ b/app/src/main/java/com/example/fieldagent/ui/damagedetails/DamageDetailsFragment.kt @@ -490,9 +490,17 @@ class DamageDetailsFragment : Fragment() { showImageDialog() } fun removeImage(pos: Int) { - imageList.removeAt(pos) - adapter.notifyItemRemoved(pos) - imageList.add(null) + try { + imageList.removeAt(pos) + adapter.notifyItemRemoved(pos) + imageList.add(null) + adapter.notifyDataSetChanged() + } + catch (e:Exception) + { + // + } + } override fun onDestroyView() { diff --git a/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeFragment.kt b/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeFragment.kt index 558611a..c97e7d6 100644 --- a/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeFragment.kt +++ b/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeFragment.kt @@ -114,6 +114,7 @@ class HomeFragment : Fragment() { private fun initialize(){ + prefsManager.save(IS_LOGIN,true) if (isFirstPage) { @@ -124,7 +125,6 @@ class HomeFragment : Fragment() { } - } private fun setAdapter(){ @@ -208,7 +208,6 @@ class HomeFragment : Fragment() { binding.etSearch.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) { // Debounce: cancel any previous search job - Log.e("Chekckkkkss","aasaaa") searchJob?.cancel() searchJob = lifecycleScope.launch { delay(300) // wait for user to stop typing (300ms) @@ -242,8 +241,6 @@ class HomeFragment : Fragment() { isLastPage = false isFirstPage = true isLoadingMoreItems = false - items.clear() - adapter.notifyDataSetChanged() } private fun callStatusSearchApi( value:String,search:String){ @@ -304,10 +301,12 @@ class HomeFragment : Fragment() { binding.swipeRefresh.isRefreshing = false } private fun bindObservers() { - viewModel.inspections.observe(requireActivity(), Observer { + viewModel.inspections.observe(viewLifecycleOwner, Observer { it ?: return@Observer when (it.status) { Status.SUCCESS -> { + + Log.e("Checkkkkkkksds==in sucess=>","${items.size}") binding.clLoader.root.gone() binding.swipeRefresh.isRefreshing = false isLoadingMoreItems = false @@ -334,6 +333,7 @@ class HomeFragment : Fragment() { binding.clNoData.hideShowView(items.isEmpty()) } Status.ERROR -> { + Log.e("Checkkkkkkksds==in erro=>","${items.size}") isLoadingMoreItems = false adapter.setAllItemsLoaded(true) @@ -342,6 +342,7 @@ class HomeFragment : Fragment() { ApisRespHandler.handleError(it.error, requireActivity()) } Status.LOADING -> { + Log.e("Checkkkkkkksds==in loading=>","${items.size}") if (!isLoadingMoreItems && !binding.swipeRefresh.isRefreshing && !binding.clNoData.isVisible && items.isEmpty()) binding.clLoader.root.visible() } diff --git a/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeViewModel.kt b/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeViewModel.kt index 9dfdf5a..fc1b047 100644 --- a/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeViewModel.kt +++ b/app/src/main/java/com/example/fieldagent/ui/homescreen/HomeViewModel.kt @@ -58,7 +58,19 @@ class HomeViewModel @Inject constructor(private val webService: WebService) : Vi ) { if (response.isSuccessful) { delete.value = Resource.success(response.body()) + val currentData = inspections.value?.data?.data + currentData?.let { + val updatedInspections = it.inspections?.filterNot { inspection -> + inspection.id.toString() == id + } ?: emptyList() + val updatedListData = it.copy(inspections = ArrayList(updatedInspections)) + + inspections.value = Resource.success(InspectionData(status = inspections.value?.data?.status, + success = inspections.value?.data?.success, + message = inspections.value?.data?.message, + data = updatedListData)) + } } else { delete.value = Resource.error( ApiUtils.getError(response.code(), diff --git a/app/src/main/res/layout/fill_image_adapter.xml b/app/src/main/res/layout/fill_image_adapter.xml index cc30243..b16f2ed 100644 --- a/app/src/main/res/layout/fill_image_adapter.xml +++ b/app/src/main/res/layout/fill_image_adapter.xml @@ -8,6 +8,7 @@ android:layout_marginEnd="@dimen/dp_16" android:elevation="0dp" app:cardCornerRadius="@dimen/dp_6" + android:layout_margin="@dimen/dp_2" android:background="@drawable/line_space_line_color">