From 1ecd615e82aa722a19914c8ea12f13fe63dd2a7a Mon Sep 17 00:00:00 2001
From: Javinator9889 <dev@javinator9889.com>
Date: Wed, 1 Jul 2020 19:17:51 +0200
Subject: [PATCH] Solved a problem with news loading when an exception occurs

---
 .../views/fragments/news/NewsFragment.kt      | 18 ++++++++++--------
 .../main/res/layout/loading_recycler_view.xml | 19 ++++++++++++++-----
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/news/NewsFragment.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/news/NewsFragment.kt
index b612294..5bbb985 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/news/NewsFragment.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/news/NewsFragment.kt
@@ -24,8 +24,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.observe
 import androidx.lifecycle.whenStarted
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -66,14 +66,15 @@ class NewsFragment : BaseFragmentView(), LayoutVisibilityChange {
             whenStarted {
                 loading.visibility = View.VISIBLE
                 refreshLayout.isEnabled = false
-                newsViewModel.newsData.observe(viewLifecycleOwner, Observer {
+                newsViewModel.newsData.observe(viewLifecycleOwner) {
                     if (::footerAdapter.isInitialized)
                         footerAdapter.clear()
-                    if (it.hasError) {
-                        if (newsAdapter.adapterItemCount == 0) {
-
-                        }
-                    }
+                    if (it.hasError && newsAdapter.adapterItemCount == 0) {
+                        errorScreen.visibility = View.VISIBLE
+                        container.visibility = View.INVISIBLE
+                        refreshLayout.isEnabled = true
+                        return@observe
+                    } else errorScreen.visibility = View.INVISIBLE
                     if (it.id !in activeItems) {
                         val newsObject = News(
                             title = it.title,
@@ -91,7 +92,7 @@ class NewsFragment : BaseFragmentView(), LayoutVisibilityChange {
                         refreshLayout.isEnabled = true
                         activeItems.add(it.id)
                     }
-                })
+                }
             }
         }
     }
@@ -143,6 +144,7 @@ class NewsFragment : BaseFragmentView(), LayoutVisibilityChange {
                 scrollListener.resetPageCount()
             }
             container.visibility = View.INVISIBLE
+            errorScreen.visibility = View.INVISIBLE
         }
     }
 
diff --git a/app/src/main/res/layout/loading_recycler_view.xml b/app/src/main/res/layout/loading_recycler_view.xml
index 82161bb..800d5f7 100644
--- a/app/src/main/res/layout/loading_recycler_view.xml
+++ b/app/src/main/res/layout/loading_recycler_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white">
@@ -27,22 +28,30 @@
 
         <com.javinator9889.handwashingreminder.graphics.LottieAdaptedPerformanceAnimationView
             android:id="@+id/errorAnimation"
-            android:layout_width="200dp"
+            android:layout_width="0dp"
             android:layout_height="200dp"
-            android:layout_marginBottom="19dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/errorText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/error_state" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/errorText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:fontFamily="@font/raleway_medium"
+            android:text="@string/news_error"
+            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
+            android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/errorAnimation" />
+            app:layout_constraintTop_toBottomOf="@+id/errorAnimation"
+            tools:text="Error while obtaining new data" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7a50a2b..4bb1a48 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -290,4 +290,5 @@
     <string name="animations_on">Actualmente, las animaciones están activadas.
         Ten en cuenta que esto puede afectar tanto al rendimiento como a la batería</string>
     <string name="animations_off">No se mostrará ninguna animación</string>
+    <string name="news_error">Error al cargar información sobre las noticias</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e55dd41..f6df4e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -318,4 +318,5 @@
     <string name="animations_on">Currently, the app will play some animations.
     Keep in mind that it can affect both performance and battery life</string>
     <string name="animations_off">No animations will be played</string>
+    <string name="news_error">Error while loading news data</string>
 </resources>