From 1ace896cf708a9c2f93d7df82736a29e0469985b Mon Sep 17 00:00:00 2001
From: Milos Marinkovic <milosmns@gmail.com>
Date: Mon, 23 May 2016 23:13:09 +0200
Subject: [PATCH] Adding layouts for stats page, landscape. - Related to issue
 #3

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   1 -
 .../contactsgenerator/ProgressActivity.java   |   5 +-
 .../contactsgenerator/StatsActivity.java      |   3 +-
 .../service/GeneratorService.java             |   6 +-
 .../main/res/layout-land/activity_main.xml    |   1 +
 .../res/layout-land/activity_progress.xml     |   5 +-
 .../main/res/layout-land/activity_stats.xml   | 275 ++++++++++++++++++
 .../res/layout-sw600dp-land/activity_main.xml |   1 +
 .../main/res/layout-sw600dp/activity_main.xml |   1 +
 app/src/main/res/layout/activity_main.xml     |   1 +
 app/src/main/res/layout/activity_stats.xml    |  84 +++---
 app/src/main/res/values/colors.xml            |   3 +-
 app/src/main/res/values/dimens.xml            |   6 +-
 app/src/main/res/values/strings.xml           |   4 +-
 15 files changed, 340 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/layout-land/activity_stats.xml

diff --git a/app/build.gradle b/app/build.gradle
index fda1e60..df80765 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 8
+        versionCode 9
         versionName "2.0.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fac5c0d..84f94e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,7 +62,6 @@
             android:label="@string/activity_stats_title"
             android:launchMode="singleTask"
             android:parentActivityName=".MainActivity"
-            android:screenOrientation="portrait"
             tools:ignore="UnusedAttribute">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/me/angrybyte/contactsgenerator/ProgressActivity.java b/app/src/main/java/me/angrybyte/contactsgenerator/ProgressActivity.java
index c6244d0..9b10167 100644
--- a/app/src/main/java/me/angrybyte/contactsgenerator/ProgressActivity.java
+++ b/app/src/main/java/me/angrybyte/contactsgenerator/ProgressActivity.java
@@ -152,7 +152,8 @@ public void onGenerateProgress(@FloatRange(from = 0.0f, to = 1.0f) float progres
             if (person.getImage() != null) {
                 mContactPhotoView.setImageBitmap(person.getImage());
             } else {
-                int drawable = AVATARS[(int) Math.round(Math.random() * AVATARS.length)];
+                int randomIndex = (int) Math.round(Math.random() * (AVATARS.length - 1));
+                int drawable = AVATARS[randomIndex];
                 mContactPhotoView.setImageResource(drawable);
             }
         }
@@ -163,7 +164,7 @@ public void onGenerateProgress(@FloatRange(from = 0.0f, to = 1.0f) float progres
         }
 
         // initially views are hidden, so update visibilities only once here
-        if (mProgressBar.getVisibility() != View.VISIBLE) {
+        if (mContactInfoView.getVisibility() != View.VISIBLE) {
             mProgressBar.setVisibility(View.VISIBLE);
             mContactInfoView.setVisibility(View.VISIBLE);
             mCurrentCountView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/me/angrybyte/contactsgenerator/StatsActivity.java b/app/src/main/java/me/angrybyte/contactsgenerator/StatsActivity.java
index a2dcc3f..eb5ccfc 100644
--- a/app/src/main/java/me/angrybyte/contactsgenerator/StatsActivity.java
+++ b/app/src/main/java/me/angrybyte/contactsgenerator/StatsActivity.java
@@ -54,6 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // prepare the toolbar with title coloring
         Toolbar toolbar = (Toolbar) findViewById(R.id.stats_toolbar);
+        // noinspection ConstantConditions
         toolbar.setTitleTextColor(Color.WHITE);
     }
 
@@ -92,7 +93,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
             if (!serviceApi.isForceStopped() && (stats.requested == 0 || stats.generated < stats.requested)) {
                 mCheckDeviceView.setVisibility(View.VISIBLE);
             } else {
-                mCheckDeviceView.setVisibility(View.INVISIBLE);
+                mCheckDeviceView.setVisibility(View.GONE);
             }
 
             String requested = String.valueOf(stats.requested);
diff --git a/app/src/main/java/me/angrybyte/contactsgenerator/service/GeneratorService.java b/app/src/main/java/me/angrybyte/contactsgenerator/service/GeneratorService.java
index 0549894..eadcbef 100644
--- a/app/src/main/java/me/angrybyte/contactsgenerator/service/GeneratorService.java
+++ b/app/src/main/java/me/angrybyte/contactsgenerator/service/GeneratorService.java
@@ -118,7 +118,8 @@ private void showNotification() {
         Intent stopIntent = new Intent(this, GeneratorService.class);
         stopIntent.setAction(ServiceApi.STOP_GENERATING_ACTION);
         PendingIntent stopPendingIntent = PendingIntent.getService(this, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        NotificationCompat.Action action = new NotificationCompat.Action(android.R.drawable.ic_menu_close_clear_cancel, getString(R.string.progress_stop), stopPendingIntent);
+        NotificationCompat.Action action = new NotificationCompat.Action(android.R.drawable.ic_menu_close_clear_cancel,
+                getString(R.string.progress_stop), stopPendingIntent);
         mBuilder.addAction(action);
 
         Intent resultIntent = new Intent(this, ProgressActivity.class);
@@ -226,7 +227,8 @@ public boolean isDeleting() {
     }
 
     @Override
-    public void onGenerateProgress(@FloatRange(from = 0.0f, to = 1.0f) float progress, @IntRange(from = 0) int iStep, @IntRange(from = 0) int generated) {
+    public void onGenerateProgress(@FloatRange(from = 0.0f, to = 1.0f) float progress, @IntRange(from = 0) int iStep,
+            @IntRange(from = 0) int generated) {
         mBuilder.setProgress(mHowMany, iStep, false);
         mBuilder.setContentInfo(getCurrentPercentage(progress));
         mNotificationManager.notify(NOTIFICATION_ID, mBuilder.build());
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index e7ba888..3ec1d59 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -31,6 +31,7 @@
                 android:gravity="center"
                 android:maxWidth="280dp"
                 android:text="@string/how_many_contacts"
+                android:textColor="@color/primary"
                 android:textSize="24sp" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout-land/activity_progress.xml b/app/src/main/res/layout-land/activity_progress.xml
index 74e3f67..9f85df0 100644
--- a/app/src/main/res/layout-land/activity_progress.xml
+++ b/app/src/main/res/layout-land/activity_progress.xml
@@ -155,7 +155,7 @@
             android:background="?attr/colorPrimary"
             android:indeterminate="false"
             android:progress="0"
-            android:visibility="gone"
+            android:visibility="visible"
             tools:progress="30"
             tools:visibility="visible" />
 
@@ -177,13 +177,12 @@
         tools:ignore="UnusedAttribute" />
 
     <!-- Unused views for this device size, they stay below the Toolbar -->
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"
         android:elevation="0dp"
-        android:visibility="visible"
+        android:visibility="gone"
         tools:ignore="UnusedAttribute">
 
         <TextView
diff --git a/app/src/main/res/layout-land/activity_stats.xml b/app/src/main/res/layout-land/activity_stats.xml
new file mode 100644
index 0000000..929cc1e
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_stats.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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:animateLayoutChanges="true"
+    android:gravity="center_horizontal|top"
+    android:orientation="vertical"
+    tools:context="me.angrybyte.contactsgenerator.StatsActivity">
+
+    <TextView
+        android:id="@+id/stats_check_device"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="@dimen/spacing_normal"
+        android:gravity="center"
+        android:text="@string/stat_check_device"
+        android:textColor="@color/accent"
+        android:textSize="@dimen/text_size_small"
+        android:textStyle="bold"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:baselineAligned="false"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_large"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacing_huge"
+                    android:layout_marginRight="@dimen/spacing_huge"
+                    android:gravity="end"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/stats_generated_count"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary_lighter"
+                        android:textSize="@dimen/text_size_wow"
+                        android:textStyle="bold"
+                        tools:text="320" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/stat_total_generated"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary_lighter"
+                        android:textSize="@dimen/text_size_large" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="start"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/stats_requested_count"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_wow"
+                        android:textStyle="bold"
+                        tools:text="400" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/stat_total_requested"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_large" />
+                </LinearLayout>
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/stats_longest_generated_contact_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/stat_longest_contact"
+                android:textAllCaps="true"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/stats_longest_generated_contact_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_large"
+                android:gravity="center"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:visibility="gone"
+                tools:text="Martha Jones (2.9s)"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/stats_shortest_generated_contact_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/stat_shortest_contacts"
+                android:textAllCaps="true"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/stats_shortest_generated_contact_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal|top"
+                android:padding="2dp"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:visibility="gone"
+                tools:text="Captain Jack Harkness (2.0s)"
+                tools:visibility="visible" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:id="@+id/stats_generated_total_time_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/stat_total_time"
+                android:textAllCaps="true"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/stats_generated_total_time_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_large"
+                android:gravity="center"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                tools:text="62.3s" />
+
+            <TextView
+                android:id="@+id/stats_generated_average_time_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/stat_average_time"
+                android:textAllCaps="true"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/stats_generated_average_time_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_large"
+                android:gravity="center"
+                android:textColor="@color/primary"
+                android:textSize="@dimen/text_size_large"
+                tools:text="2.3s" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacing_large"
+                    android:layout_marginRight="@dimen/spacing_large"
+                    android:gravity="end"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@string/stat_males"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_large"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/stats_generated_males"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_large"
+                        tools:text="100" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="start"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="100dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/stat_females"
+                        android:textAllCaps="true"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_large"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/stats_generated_females"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_large"
+                        tools:text="220" />
+                </LinearLayout>
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/stats_toolbar"
+        style="@style/ContactsTheme.MainAppBarTheme"
+        android:layout_marginBottom="@dimen/spacing_large"
+        app:title="@string/stat_title" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/activity_main.xml b/app/src/main/res/layout-sw600dp-land/activity_main.xml
index 23d3ee9..e782704 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -60,6 +60,7 @@
                     android:gravity="center"
                     android:maxWidth="340dp"
                     android:text="@string/how_many_contacts"
+                    android:textColor="@color/primary"
                     android:textSize="24sp" />
 
                 <LinearLayout
diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
index 9216ddc..54d4f03 100644
--- a/app/src/main/res/layout-sw600dp/activity_main.xml
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -49,6 +49,7 @@
                 android:gravity="center"
                 android:maxWidth="340dp"
                 android:text="@string/how_many_contacts"
+                android:textColor="@color/primary"
                 android:textSize="24sp" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11f043a..33e9267 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,6 +28,7 @@
                 android:maxWidth="300dp"
                 android:padding="@dimen/activity_horizontal_margin"
                 android:text="@string/how_many_contacts"
+                android:textColor="@color/primary"
                 android:textSize="24sp" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index 8a88ccb..4243c50 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
     android:orientation="vertical"
     tools:context="me.angrybyte.contactsgenerator.StatsActivity">
 
@@ -16,25 +17,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <!-- Total requested and generated layout -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_huge"
-            android:animateLayoutChanges="true"
+            android:layout_marginTop="@dimen/spacing_large"
             android:gravity="center_horizontal|top"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_large"
                 android:orientation="horizontal">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginEnd="@dimen/spacing_huge"
+                    android:layout_marginRight="@dimen/spacing_huge"
                     android:gravity="end"
                     android:orientation="vertical">
 
@@ -44,7 +44,7 @@
                         android:layout_height="wrap_content"
                         android:textAllCaps="true"
                         android:textColor="@color/primary_lighter"
-                        android:textSize="@dimen/stats_activity_large_numbers_text_size"
+                        android:textSize="@dimen/text_size_omg"
                         android:textStyle="bold"
                         tools:text="320" />
 
@@ -54,7 +54,7 @@
                         android:text="@string/stat_total_generated"
                         android:textAllCaps="true"
                         android:textColor="@color/primary_lighter"
-                        android:textSize="@dimen/stats_activity_small_text_size" />
+                        android:textSize="@dimen/text_size_large" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -69,7 +69,7 @@
                         android:layout_height="wrap_content"
                         android:textAllCaps="true"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_large_numbers_text_size"
+                        android:textSize="@dimen/text_size_omg"
                         android:textStyle="bold"
                         tools:text="400" />
 
@@ -79,11 +79,10 @@
                         android:text="@string/stat_total_requested"
                         android:textAllCaps="true"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_small_text_size" />
+                        android:textSize="@dimen/text_size_large" />
                 </LinearLayout>
             </LinearLayout>
 
-            <!-- Connection error text -->
             <TextView
                 android:id="@+id/stats_check_device"
                 android:layout_width="wrap_content"
@@ -91,20 +90,21 @@
                 android:gravity="center"
                 android:text="@string/stat_check_device"
                 android:textColor="@color/accent"
-                android:textSize="12sp"
-                android:visibility="gone" />
+                android:textSize="@dimen/text_size_small"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-            <!-- Total time -->
             <TextView
                 android:id="@+id/stats_generated_total_time_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacing_huge"
+                android:layout_marginTop="@dimen/spacing_large"
                 android:gravity="center"
                 android:text="@string/stat_total_time"
                 android:textAllCaps="true"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
+                android:textSize="@dimen/text_size_large"
                 android:textStyle="bold" />
 
             <TextView
@@ -114,10 +114,9 @@
                 android:layout_marginBottom="@dimen/spacing_normal"
                 android:gravity="center"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
+                android:textSize="@dimen/text_size_large"
                 tools:text="62.3s" />
 
-            <!-- Average time -->
             <TextView
                 android:id="@+id/stats_generated_average_time_label"
                 android:layout_width="wrap_content"
@@ -126,7 +125,7 @@
                 android:text="@string/stat_average_time"
                 android:textAllCaps="true"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
+                android:textSize="@dimen/text_size_large"
                 android:textStyle="bold" />
 
             <TextView
@@ -136,33 +135,33 @@
                 android:layout_marginBottom="@dimen/spacing_normal"
                 android:gravity="center"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
+                android:textSize="@dimen/text_size_large"
                 tools:text="2.3s" />
 
-            <!-- Males and females layout -->
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/spacing_normal"
+                android:layout_marginLeft="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
                 android:orientation="horizontal">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginEnd="@dimen/spacing_large"
+                    android:layout_marginRight="@dimen/spacing_large"
                     android:gravity="end"
                     android:orientation="vertical">
 
-                    <!-- Male -->
                     <TextView
-                        android:layout_width="100dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
                         android:text="@string/stat_males"
                         android:textAllCaps="true"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_text_size"
+                        android:textSize="@dimen/text_size_large"
                         android:textStyle="bold" />
 
                     <TextView
@@ -170,7 +169,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_text_size"
+                        android:textSize="@dimen/text_size_large"
                         tools:text="100" />
                 </LinearLayout>
 
@@ -180,14 +179,13 @@
                     android:gravity="start"
                     android:orientation="vertical">
 
-                    <!-- Female -->
                     <TextView
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:text="@string/stat_females"
                         android:textAllCaps="true"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_text_size"
+                        android:textSize="@dimen/text_size_large"
                         android:textStyle="bold" />
 
                     <TextView
@@ -195,12 +193,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/primary"
-                        android:textSize="@dimen/stats_activity_text_size"
+                        android:textSize="@dimen/text_size_large"
                         tools:text="220" />
                 </LinearLayout>
             </LinearLayout>
 
-            <!-- Longest generation -->
             <TextView
                 android:id="@+id/stats_longest_generated_contact_label"
                 android:layout_width="wrap_content"
@@ -209,8 +206,10 @@
                 android:text="@string/stat_longest_contact"
                 android:textAllCaps="true"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
-                android:textStyle="bold" />
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/stats_longest_generated_contact_value"
@@ -219,10 +218,11 @@
                 android:layout_marginBottom="@dimen/spacing_normal"
                 android:gravity="center"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
-                tools:text="Martha Jones (2.9s)" />
+                android:textSize="@dimen/text_size_large"
+                android:visibility="gone"
+                tools:text="Martha Jones (2.9s)"
+                tools:visibility="visible" />
 
-            <!-- Quickest generation -->
             <TextView
                 android:id="@+id/stats_shortest_generated_contact_label"
                 android:layout_width="wrap_content"
@@ -231,8 +231,10 @@
                 android:text="@string/stat_shortest_contacts"
                 android:textAllCaps="true"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
-                android:textStyle="bold" />
+                android:textSize="@dimen/text_size_large"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/stats_shortest_generated_contact_value"
@@ -242,10 +244,12 @@
                 android:padding="2dp"
                 android:paddingBottom="@dimen/spacing_huge"
                 android:textColor="@color/primary"
-                android:textSize="@dimen/stats_activity_text_size"
-                tools:text="Captain Jack Harkness (2.0s)" />
-        </LinearLayout>
+                android:textSize="@dimen/text_size_large"
+                android:visibility="gone"
+                tools:text="Captain Jack Harkness (2.0s)"
+                tools:visibility="visible" />
 
+        </LinearLayout>
     </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 78859e4..a358a13 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,10 +3,9 @@
 
     <color name="primary">#2C3E50</color>
     <color name="primary_darker">#1E2B38</color>
-    <color name="primary_lighter">#2B5884</color>
+    <color name="primary_lighter">#3060A0</color>
     <color name="accent">#E74C3C</color>
     <color name="accent_lighter">#F97D6D</color>
-
     <color name="stop_text">@color/primary</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c72f127..63f0719 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,10 +3,6 @@
     <dimen name="activity_horizontal_margin">24dp</dimen>
     <dimen name="activity_vertical_margin">24dp</dimen>
 
-    <dimen name="stats_activity_text_size">18sp</dimen>
-    <dimen name="stats_activity_large_numbers_text_size">60sp</dimen>
-    <dimen name="stats_activity_small_text_size">14sp</dimen>
-
     <dimen name="action_button_size">48dp</dimen>
     <dimen name="small_app_bar_size">48dp</dimen>
     <dimen name="normal_app_bar_size">56dp</dimen>
@@ -27,5 +23,7 @@
     <dimen name="text_size_large">18sp</dimen>
     <dimen name="text_size_huge">22sp</dimen>
     <dimen name="text_size_crazy">26sp</dimen>
+    <dimen name="text_size_wow">50sp</dimen>
+    <dimen name="text_size_omg">60sp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b0cfb2..a0ebc1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,8 +42,8 @@
     <string name="stat_females">Females</string>
     <string name="stat_total_requested">Requested</string>
     <string name="stat_total_generated">Generated</string>
-    <string name="stat_total_time">Time spent</string>
-    <string name="stat_average_time">Contact average time</string>
+    <string name="stat_total_time">Total time spent</string>
+    <string name="stat_average_time">Time per contact</string>
     <string name="stat_longest_contact">Slowest generation</string>
     <string name="stat_shortest_contacts">Quickest generation</string>
     <string name="stat_check_device">Please verify that you have a\nreliable Internet connection</string>