fixed error screen

Author: DroidNinja

app/src/main/java/me/arunsharma/devupdates/ui/fragments/bookmarks/BookmarksFragment.kt

@@ -6,12 +6,12 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dev.core.base.BaseFragment
-import com.dev.core.databinding.LayoutProgressErrorBinding
 import com.dev.core.recyclerview.BaseRecyclerViewAdapter
 import com.dev.core.utils.CustomTabHelper
 import com.dev.core.utils.viewBinding
 import com.dev.services.api.models.ServiceItem
 import dagger.hilt.android.AndroidEntryPoint
+import me.arunsharma.devupdates.databinding.LayoutProgressErrorBinding
 import me.arunsharma.devupdates.R
 import me.arunsharma.devupdates.databinding.FragmentBookmarksBinding
 import me.arunsharma.devupdates.ui.fragments.feed.adapter.FeedAdapter
@@ -36,13 +36,13 @@ class BookmarksFragment : BaseFragment(R.layout.fragment_bookmarks) {
             setHasFixedSize(true)
         }
 
-        viewModel.lvUiState.observe(viewLifecycleOwner, {
+        viewModel.lvUiState.observe(viewLifecycleOwner) {
             handleUIState(it)
-        })
+        }
 
-        viewModel.lvShowMessage.observe(viewLifecycleOwner, { resourceString ->
+        viewModel.lvShowMessage.observe(viewLifecycleOwner) { resourceString ->
             view?.let { SnackbarUtil.showBarShortTime(it, getString(resourceString)) }
-        })
+        }
 
         viewModel.getBookmarks()
 

app/src/main/java/me/arunsharma/devupdates/ui/fragments/feed/FeedListFragment.kt

@@ -8,15 +8,14 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dev.core.base.BaseFragment
-import com.dev.core.databinding.LayoutProgressErrorBinding
+import me.arunsharma.devupdates.databinding.LayoutProgressErrorBinding
 import com.dev.core.recyclerview.BaseRecyclerViewAdapter
 import com.dev.core.recyclerview.RequestLoadMoreListener
 import com.dev.core.utils.CustomTabHelper
 import com.dev.core.utils.viewBinding
 import com.dev.services.api.models.ServiceItem
 import com.dev.services.api.models.ServiceRequest
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.collect
 import me.arunsharma.devupdates.R
 import me.arunsharma.devupdates.databinding.FragmentFeedListBinding
 import me.arunsharma.devupdates.ui.fragments.feed.adapter.FeedAdapter
@@ -84,6 +83,7 @@ class FeedListFragment : BaseFragment(R.layout.fragment_feed_list) {
                 setDataOnList(state.request, data)
             }
             is FeedUIState.ShowError -> {
+                binding.srlView.isRefreshing = false
                 LayoutProgressErrorBinding.inflate(LayoutInflater.from(requireContext())).apply {
                     tvTitle.text = state.errorTitle
                     tvSubtitle.text = state.errorSubtitle

app/src/main/java/me/arunsharma/devupdates/ui/fragments/feed/GithubFragment.kt

@@ -8,7 +8,7 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dev.core.base.BaseFragment
-import com.dev.core.databinding.LayoutProgressErrorBinding
+import me.arunsharma.devupdates.databinding.LayoutProgressErrorBinding
 import com.dev.core.recyclerview.BaseRecyclerViewAdapter
 import com.dev.core.recyclerview.RequestLoadMoreListener
 import com.dev.core.utils.CustomTabHelper
@@ -95,6 +95,7 @@ class GithubFragment : BaseFragment(R.layout.fragment_feed_github) {
                 setDataOnList(state.request, data)
             }
             is FeedUIState.ShowError -> {
+                binding.srlView.isRefreshing = false
                 LayoutProgressErrorBinding.inflate(LayoutInflater.from(requireContext())).apply {
                     tvTitle.text = state.errorTitle
                     tvSubtitle.text = state.errorSubtitle

app/src/main/java/me/arunsharma/devupdates/ui/fragments/feed/HomeFeedFragment.kt

@@ -10,7 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dev.core.base.BaseFragment
-import com.dev.core.databinding.LayoutProgressErrorBinding
+import me.arunsharma.devupdates.databinding.LayoutProgressErrorBinding
 import com.dev.core.recyclerview.BaseRecyclerViewAdapter
 import com.dev.core.recyclerview.RequestLoadMoreListener
 import com.dev.core.utils.CustomTabHelper
@@ -100,6 +100,7 @@ class HomeFeedFragment : BaseFragment(R.layout.fragment_home_feed_list) {
             }
 
             is FeedUIState.ShowError -> {
+                binding.srlView.isRefreshing = false
                 LayoutProgressErrorBinding.inflate(LayoutInflater.from(requireContext())).apply {
                     tvTitle.text = state.errorTitle
                     tvSubtitle.text = state.errorSubtitle

…ain/res/layout/layout_progress_error.xml …ain/res/layout/layout_progress_error.xmlcore/src/main/res/layout/layout_progress_error.xml renamed to app/src/main/res/layout/layout_progress_error.xml core/src/main/res/layout/layout_progress_error.xml renamed to app/src/main/res/layout/layout_progress_error.xml

@@ -10,8 +10,7 @@
         android:layout_height="wrap_content"
         android:text="@string/empty_feed"
         android:gravity="center"
-        android:textSize="@dimen/_18ssp"
-        android:textColor="@color/text_black"
+        style="@style/TextAppearance.H2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -23,8 +22,7 @@
         android:layout_height="wrap_content"
         android:text="@string/swipe_down_to_refresh_the_feed"
         android:gravity="center"
-        android:textSize="@dimen/_14ssp"
-        android:textColor="@color/text_gray"
+        style="@style/TextAppearance.H2.Subtitle"
         android:layout_marginTop="@dimen/_10sdp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

core/src/main/java/com/dev/core/view/ProgressLayout.kt

@@ -135,31 +135,11 @@ class ProgressLayout : RelativeLayout {
             removeView(errorView)
         }
         hideLoadingView()
+        this.errorGroup = errorLayout
         errorLayout.tag = ERROR_TAG
         layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT)
-        this.errorGroup = errorLayout
-        addView(errorGroup, layoutParams)
-        setContentVisibility(false)
-    }
-
-    fun showError(@StringRes stringId: Int, onClickListener: View.OnClickListener?) {
-        showError(resources.getString(stringId), onClickListener)
-    }
-
-    fun showError(errorMessage: String, onClickListener: View.OnClickListener?) {
-        currentState = State.ERROR
-        hideLoadingView()
-        showErrorView()
-
-        errorTextView?.text = errorMessage
-
-        if (onClickListener != null) {
-            errorButton?.visibility = View.VISIBLE
-            errorButton?.setOnClickListener(onClickListener)
-        } else {
-            errorButton?.visibility = View.GONE
-        }
+        addView(errorLayout, layoutParams)
         setContentVisibility(false)
     }
 
@@ -168,24 +148,6 @@ class ProgressLayout : RelativeLayout {
         if (errorButton != null) errorButton!!.setOnClickListener(null)
     }
 
-    private fun showErrorView() {
-        if (errorGroup == null) {
-            errorGroup = inflater?.inflate(R.layout.layout_progress_error, null)
-            errorGroup?.tag = ERROR_TAG
-//            errorLayout = errorGroup?.
-//
-//            errorTextView = errorGroup?.findViewById(R.id.tvError)
-//            errorButton = errorGroup?.findViewById(R.id.tvRetry)
-//
-//            layoutParams = LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-//                ViewGroup.LayoutParams.MATCH_PARENT)
-
-            addView(errorGroup, layoutParams)
-        } else {
-            errorLayout?.visibility = View.VISIBLE
-        }
-    }
-
     private fun hideLoadingView() {
         if (loadingGroup != null && loadingGroup?.visibility != View.GONE) {
             loadingGroup?.visibility = View.GONE