From fcc14ab0933d5285d05679a654ad8fc3ba1ae704 Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 15 Apr 2020 22:17:03 +0200
Subject: [PATCH] EmpireOverview: A little color on the Stats page (#2419)

* EmpireOverview: A little color on the Stats page

* EmpireOverview: Align numbers on the Stats page
---
 core/src/com/unciv/ui/EmpireOverviewScreen.kt | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
index 962d356887..b906ab1dec 100644
--- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
@@ -143,17 +143,20 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
     private fun getHappinessTable(): Table {
         val happinessTable = Table(skin)
         happinessTable.defaults().pad(5f)
-        happinessTable.add("Happiness".toLabel(fontSize = 24)).colspan(2).row()
+        val happinessHeader = Table(skin)
+        happinessHeader.add(ImageGetter.getStatIcon("Happiness")).pad(5f,0f,5f,12f).size(20f)
+        happinessHeader.add("Happiness".toLabel(fontSize = 24)).padTop(5f)
+        happinessTable.add(happinessHeader).colspan(2).row()
         happinessTable.addSeparator()
 
         val happinessBreakdown = viewingPlayer.stats().getHappinessBreakdown()
 
         for (entry in happinessBreakdown.filterNot { it.value.roundToInt()==0 }) {
             happinessTable.add(entry.key.tr())
-            happinessTable.add(entry.value.roundToInt().toString()).row()
+            happinessTable.add(entry.value.roundToInt().toString()).right().row()
         }
         happinessTable.add("Total".tr())
-        happinessTable.add(happinessBreakdown.values.sum().roundToInt().toString())
+        happinessTable.add(happinessBreakdown.values.sum().roundToInt().toString()).right()
         happinessTable.pack()
         return happinessTable
     }
@@ -161,17 +164,20 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
     private fun getGoldTable(): Table {
         val goldTable = Table(skin)
         goldTable.defaults().pad(5f)
-        goldTable.add("Gold".toLabel(fontSize = 24)).colspan(2).row()
+        val goldHeader = Table(skin)
+        goldHeader.add(ImageGetter.getStatIcon("Gold")).pad(5f,0f,5f,12f).size(20f)
+        goldHeader.add("Gold".toLabel(fontSize = 24)).padTop(5f)
+        goldTable.add(goldHeader).colspan(2).row()
         goldTable.addSeparator()
         var total=0f
         for (entry in viewingPlayer.stats().getStatMapForNextTurn()) {
             if(entry.value.gold==0f) continue
             goldTable.add(entry.key.tr())
-            goldTable.add(entry.value.gold.roundToInt().toString()).row()
+            goldTable.add(entry.value.gold.roundToInt().toString()).right().row()
             total += entry.value.gold
         }
         goldTable.add("Total".tr())
-        goldTable.add(total.roundToInt().toString())
+        goldTable.add(total.roundToInt().toString()).right()
         goldTable.pack()
         return goldTable
     }
@@ -180,16 +186,19 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
     private fun getScienceTable(): Table {
         val scienceTable = Table(skin)
         scienceTable.defaults().pad(5f)
-        scienceTable.add("Science".toLabel(fontSize = 24)).colspan(2).row()
+        val scienceHeader = Table(skin)
+        scienceHeader.add(ImageGetter.getStatIcon("Science")).pad(5f,0f,5f,12f).size(20f)
+        scienceHeader.add("Science".toLabel(fontSize = 24)).padTop(5f)
+        scienceTable.add(scienceHeader).colspan(2).row()
         scienceTable.addSeparator()
         val scienceStats = viewingPlayer.stats().getStatMapForNextTurn()
                 .filter { it.value.science!=0f }
         for (entry in scienceStats) {
             scienceTable.add(entry.key.tr())
-            scienceTable.add(entry.value.science.roundToInt().toString()).row()
+            scienceTable.add(entry.value.science.roundToInt().toString()).right().row()
         }
         scienceTable.add("Total".tr())
-        scienceTable.add(scienceStats.values.map { it.science }.sum().roundToInt().toString())
+        scienceTable.add(scienceStats.values.map { it.science }.sum().roundToInt().toString()).right()
         scienceTable.pack()
         return scienceTable
     }
@@ -203,7 +212,12 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
         val pointsToGreatPerson = viewingPlayer.greatPeople.pointsForNextGreatPerson
 
         greatPeopleTable.defaults().pad(5f)
-        greatPeopleTable.add("Great person points".toLabel(fontSize = 24)).colspan(3).row()
+        val greatPeopleHeader = Table(skin)
+        val greatPeopleIcon = ImageGetter.getStatIcon("Specialist")
+        greatPeopleIcon.color = Color.ROYAL
+        greatPeopleHeader.add(greatPeopleIcon).padRight(12f).size(30f)
+        greatPeopleHeader.add("Great person points".toLabel(fontSize = 24)).padTop(5f)
+        greatPeopleTable.add(greatPeopleHeader).colspan(3).row()
         greatPeopleTable.addSeparator()
         greatPeopleTable.add()
         greatPeopleTable.add("Current points".tr())