From c708cab4fc24b15bb402a53487395dabf05adb6c Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Fri, 19 Apr 2019 12:25:43 +0200
Subject: [PATCH] Improve loader UI

---
 app/src/main/res/layout/fragment_loader.xml | 39 +++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_loader.xml b/app/src/main/res/layout/fragment_loader.xml
index 0a2390f5..c2371f04 100644
--- a/app/src/main/res/layout/fragment_loader.xml
+++ b/app/src/main/res/layout/fragment_loader.xml
@@ -1,18 +1,11 @@
 <?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"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center">
-
-	<View
-		android:layout_width="128dp"
-		android:layout_height="128dp"
-		android:background="@color/colorPrimary"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="256dp"
+	android:layout_height="128dp"
+	android:layout_gravity="center"
+	android:background="@color/colorPrimary">
 
 	<androidx.core.widget.ContentLoadingProgressBar
 		android:id="@+id/progressBar"
@@ -20,12 +13,30 @@
 		android:layout_width="32dp"
 		android:layout_height="32dp"
 		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		app:layout_constraintBottom_toTopOf="@+id/loadingMessage"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed" />
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/loadingMessage"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="16dp"
 		android:layout_marginEnd="8dp"
 		android:layout_marginBottom="8dp"
+		android:fontFamily="@font/roboto"
+		android:textSize="16sp"
+		android:text="@string/calculating_please_wait_"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toBottomOf="@+id/progressBar"
+		app:layout_constraintVertical_chainStyle="packed" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file