From 20994cb908ee0c85add23d55a2e8fd81461bbfb9 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 6 Dec 2018 20:19:16 +0200
Subject: [PATCH] Dev: Save & Load screens put into separate package

---
 core/src/com/unciv/ui/cityscreen/CityScreen.kt                  | 2 +-
 core/src/com/unciv/ui/{ => saves}/Gzip.kt                       | 2 +-
 core/src/com/unciv/ui/{ => saves}/LoadScreen.kt                 | 2 +-
 core/src/com/unciv/ui/{ => saves}/SaveScreen.kt                 | 2 +-
 .../ui/worldscreen/optionstable/WorldScreenOptionsTable.kt      | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename core/src/com/unciv/ui/{ => saves}/Gzip.kt (97%)
 rename core/src/com/unciv/ui/{ => saves}/LoadScreen.kt (99%)
 rename core/src/com/unciv/ui/{ => saves}/SaveScreen.kt (98%)

diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
index a20a622ae0..d8b29282d0 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
@@ -233,7 +233,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
         statsTable.defaults().pad(2f)
         for (entry in stats.toHashMap().filterNot { it.value==0f }) {
             statsTable.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f)
-            statsTable.add(Label(Math.round(entry.value).toString() + "", CameraStageBaseScreen.skin))
+            statsTable.add(Label(Math.round(entry.value).toString(), CameraStageBaseScreen.skin))
             statsTable.row()
         }
         tileTable.add(statsTable).row()
diff --git a/core/src/com/unciv/ui/Gzip.kt b/core/src/com/unciv/ui/saves/Gzip.kt
similarity index 97%
rename from core/src/com/unciv/ui/Gzip.kt
rename to core/src/com/unciv/ui/saves/Gzip.kt
index f66330cd63..d74e26364f 100644
--- a/core/src/com/unciv/ui/Gzip.kt
+++ b/core/src/com/unciv/ui/saves/Gzip.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui
+package com.unciv.ui.saves
 
 import com.badlogic.gdx.utils.Base64Coder
 import java.io.BufferedReader
diff --git a/core/src/com/unciv/ui/LoadScreen.kt b/core/src/com/unciv/ui/saves/LoadScreen.kt
similarity index 99%
rename from core/src/com/unciv/ui/LoadScreen.kt
rename to core/src/com/unciv/ui/saves/LoadScreen.kt
index 2775831958..82015d5f55 100644
--- a/core/src/com/unciv/ui/LoadScreen.kt
+++ b/core/src/com/unciv/ui/saves/LoadScreen.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui
+package com.unciv.ui.saves
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
diff --git a/core/src/com/unciv/ui/SaveScreen.kt b/core/src/com/unciv/ui/saves/SaveScreen.kt
similarity index 98%
rename from core/src/com/unciv/ui/SaveScreen.kt
rename to core/src/com/unciv/ui/saves/SaveScreen.kt
index 516a406974..dac5ef96fd 100644
--- a/core/src/com/unciv/ui/SaveScreen.kt
+++ b/core/src/com/unciv/ui/saves/SaveScreen.kt
@@ -1,4 +1,4 @@
-package com.unciv.ui
+package com.unciv.ui.saves
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.scenes.scene2d.ui.Label
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
index c8781ce24c..c616e18aa7 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
@@ -3,6 +3,8 @@ package com.unciv.ui.worldscreen.optionstable
 import com.unciv.UnCivGame
 import com.unciv.ui.*
 import com.unciv.ui.pickerscreens.PolicyPickerScreen
+import com.unciv.ui.saves.LoadScreen
+import com.unciv.ui.saves.SaveScreen
 import com.unciv.ui.utils.center
 import com.unciv.ui.utils.tr