fix(app): Show error message when loading charts

Fixes #62
OmriCat · Mar 23, 2022 · 829f7fc · 829f7fc
1 parent bfbd103
commit 829f7fc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/omricat/maplibrarian/chartlist/FirebaseChartsService.kt b/app/src/main/kotlin/com/omricat/maplibrarian/chartlist/FirebaseChartsService.kt
@@ -6,6 +6,7 @@ import com.github.michaelbull.result.combine
 import com.github.michaelbull.result.coroutines.runSuspendCatching
 import com.github.michaelbull.result.map
 import com.github.michaelbull.result.mapError
+import com.github.michaelbull.result.onFailure
 import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.FirebaseFirestore
 import com.omricat.maplibrarian.model.ChartId
@@ -18,6 +19,7 @@ import com.omricat.maplibrarian.utils.DispatcherProvider
 import com.omricat.maplibrarian.utils.logErrorAndMap
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 class FirebaseChartsService(
     private val db: FirebaseFirestore,
@@ -34,6 +36,7 @@ class FirebaseChartsService(
             }
         }
             .mapError(ChartsServiceError::fromThrowable)
+            .onFailure { Timber.e(it.message) }
             .andThen { snapshot ->
                 snapshot.map { m -> m.parseMapModel() }.combine()
                     .mapError { e -> ChartsServiceError(e.message) }

diff --git a/app/src/main/kotlin/com/omricat/maplibrarian/root/MainActivity.kt b/app/src/main/kotlin/com/omricat/maplibrarian/root/MainActivity.kt
@@ -18,6 +18,7 @@ import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.flow.StateFlow
+import timber.log.Timber
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -42,7 +43,13 @@ internal class MainViewModel(app: Application, private val savedState: SavedStat
             ),
             scope = viewModelScope,
             savedStateHandle = savedState,
-            interceptors = listOf(SimpleLoggingWorkflowInterceptor())
+            interceptors = listOf(TimberLoggingWorkflowInterceptor)
         )
     }
 }
+
+internal object TimberLoggingWorkflowInterceptor : SimpleLoggingWorkflowInterceptor() {
+    override fun log(text: String) {
+        Timber.d(text)
+    }
+}
diff --git a/app/src/main/res/layout/error.xml b/app/src/main/res/layout/error.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/error_message"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center|bottom" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:text="Error!" />