From 13f052878b4f72e756dd9c2cab4d369f8c38e91a Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 9 Feb 2022 16:59:05 +0200
Subject: [PATCH] Merged all arrow images into one Removed unnecessary
 filterNotNull from getTileBaseImageLocation

---
 android/Images/OtherIcons/ArrowLeft.png           | Bin 564 -> 0 bytes
 android/Images/OtherIcons/Down.png                | Bin 441 -> 0 bytes
 android/Images/OtherIcons/Up.png                  | Bin 422 -> 0 bytes
 core/src/com/unciv/models/UnitAction.kt           |   5 +++--
 .../unciv/ui/cityscreen/CityConstructionsTable.kt |   5 ++---
 core/src/com/unciv/ui/tilegroups/TileGroup.kt     |  10 +++++-----
 core/src/com/unciv/ui/utils/IconCircleGroup.kt    |   2 ++
 core/src/com/unciv/ui/utils/ImageGetter.kt        |   9 +++++++++
 8 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 android/Images/OtherIcons/ArrowLeft.png
 delete mode 100644 android/Images/OtherIcons/Down.png
 delete mode 100644 android/Images/OtherIcons/Up.png

diff --git a/android/Images/OtherIcons/ArrowLeft.png b/android/Images/OtherIcons/ArrowLeft.png
deleted file mode 100644
index ce9045fdb4d79f23906d2d059bb5890459402ef9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-&H|6fVg?3oK@euFPl=xh6qG1&
zjVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn)H6+Sj{us)c*xVmF(jk$?e&d$mmOq|e>5%>
zI_jr#uVGDM;se$NGquF-F?>~(nDLuo?yhNmJ|1gUFbfHVWL?*rt2A|I=c?T%|Ns0i
z|DNutdi?0dwO95E?>+zG#>w~D-qVy^1X%o?t{j;jmF+(H<ddz}cA3lY`R~5_&Q*B-
zWev@z5!tn8wL3aK|NOJ}b?nwPN@;VPUCgiDn)teQs)%dKp2EEwLn2v}^!C;(iOypY
zzPRx9T<OqGha<^pelhvFB1$!a2qd%f`*AO?otIyK-M1}j?Q>Ug$z%qGbu9u{UhI;|
zUh6R_g^l6&-@5<R-!^NMKl09gyWUsOPC+S3Z~A+-=7T5iZcM)^EbwvhdqF3Ti+S5`
zXU?iSB^S;8vcyVXuKd#BNN&ak<#6X$M#o~r>Q0<F`6~B`>C!9a=k^-D-@A2&<;5uZ
zV}*YfY5={%&A@(a#{B5J*JeGkcxK`o$WbWfdNKDU>zO$M7oYo<yJp)?4(gjdfB#Z}
z$E)E;U2=1T&b?jtqE>nF2>vbGyLr;4881tI9shdll-W^+13O>WZvCU(*5RPJ^>tNr
w?wL6nOTVqzYA^7yJLuKa*S?Mdf875uF)|%Yi`>3j3>f1Kp00i_>zopr0OET3Hvj+t

diff --git a/android/Images/OtherIcons/Down.png b/android/Images/OtherIcons/Down.png
deleted file mode 100644
index 6cd06058c5680dad12c796b993125fc1c0119e48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|viBCmvi36sG_H0Y*tg
zK~!ko?U>7L!ax*752OJ@2UHNJ6gmhU(9t*@B+IN!1&JsiQkL0~RN!nzku}QTvFC#=
z-6PEk@SF26cOC{Igb+dqArjF5^$qIQwstaF-~#LmO6+aTHnm7+*Rg=ap;s@PNC%jV
z62_^ORip!6fGS~)3V8abPIi$Fcuyo#*=u!EMb-&Y<pgXaCED0jTqo$}J@7GcBU{^u
z=x7fW`OeVQ8hEpfh^amL>u)^waDQC_Wp?(xL)U8(2g)ChwnH&88{ixuaVRl140ZGD
z>EyL^>Nnz{)c6pxAvc;=fuGrx9_V}rSbse`gXb9W;+TOA9-Z0A_oH6TVazuH_r32m
z!^|)NNi=(jDKfK_7$eiL5UwTEX-WU_edo;0BX+9Hr;}Wpr9OSBdm>q%!rWyR`2v1`
jSLc)$LI@#*5TZQ4KosW1!LPE)00000NkvXXu0mjfg-Nr2

diff --git a/android/Images/OtherIcons/Up.png b/android/Images/OtherIcons/Up.png
deleted file mode 100644
index e813450d1ef3a23240cbc47d98075c9e624985e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pI^N03WhpZAi;Tm}Y4V^0^ykc@k8XWY#_WFX?kKbK(_
z<141b<}wzu46}sAEMf~@F}-9vz~<AinXz``QX7XHA@zeVtS{Ae<=lTfUs_$EMZk$e
z@rdw-jT22I3${*Ns%6N2j#rRbCuoX=iAs#jo6RX2`5rrdc)Kpjm{<_Fuc@W`k*LbN
zuw&|pK@&cD<}}zmICEy1&c<l}Ci}*zIh!ukytlnL?S{^VvqfjJ+drz5>@wc1D4fu6
z^@7lS2iXZ8xA$fxy4H&7%4ca$Wo-VfB6GSSwA5AM)y|vlQ!?@{7CY?!Jwquph4Z*|
z!Iv+wttDT?96zzt+-Q+|%2ZR9BOUrALwM(x7mL~U{W|qU@aI;}D}rHHPrhl>+kLg;
z`{G5XC0{BT9qVtY@epKQ<GzP&?b{iFuBSTxHKl0Q_;M)%{o3L3gZ&uWmxQFv<<-Ct
OW$<+Mb6Mw<&;$TNOsEY2

diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt
index c85ebc2e36..32dabb03eb 100644
--- a/core/src/com/unciv/models/UnitAction.kt
+++ b/core/src/com/unciv/models/UnitAction.kt
@@ -3,6 +3,7 @@ package com.unciv.models
 import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
+import com.badlogic.gdx.utils.Align
 import com.unciv.ui.utils.KeyCharAndCode
 import com.unciv.ui.utils.ImageGetter
 import com.unciv.Constants
@@ -149,7 +150,7 @@ enum class UnitActionType(
         // readability factories
         private fun imageGetStopMove() = ImageGetter.getStatIcon("Movement").apply { color = Color.RED }
         private fun imageGetPromote() = ImageGetter.getImage("OtherIcons/Star").apply { color = Color.GOLD }
-        private fun imageGetShowMore() = ImageGetter.getImage("OtherIcons/ArrowRight").apply { color = Color.BLACK }
-        private fun imageGetHideMore() = ImageGetter.getImage("OtherIcons/ArrowLeft").apply { color = Color.BLACK }
+        private fun imageGetShowMore() = ImageGetter.getArrowImage(Align.right).apply { color = Color.BLACK }
+        private fun imageGetHideMore() = ImageGetter.getArrowImage(Align.left).apply { color = Color.BLACK }
     }
 }
diff --git a/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt
index 6cf27207e8..8fd89b58ad 100644
--- a/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt
@@ -17,7 +17,6 @@ import com.unciv.models.stats.Stat
 import com.unciv.models.translations.tr
 import com.unciv.ui.utils.*
 import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip
-import kotlin.concurrent.thread
 import kotlin.math.max
 import kotlin.math.min
 import com.unciv.ui.utils.AutoScrollPane as ScrollPane
@@ -531,7 +530,7 @@ class CityConstructionsTable(private val cityScreen: CityScreen) {
     
     private fun getRaisePriorityButton(constructionQueueIndex: Int, name: String, city: CityInfo): Table {
         val tab = Table()
-        tab.add(ImageGetter.getImage("OtherIcons/Up").surroundWithCircle(40f))
+        tab.add(ImageGetter.getArrowImage(Align.top).apply { color = Color.BLACK }.surroundWithCircle(40f))
         if (cityScreen.canChangeState && !city.isPuppet) {
             tab.touchable = Touchable.enabled
             tab.onClick {
@@ -548,7 +547,7 @@ class CityConstructionsTable(private val cityScreen: CityScreen) {
 
     private fun getLowerPriorityButton(constructionQueueIndex: Int, name: String, city: CityInfo): Table {
         val tab = Table()
-        tab.add(ImageGetter.getImage("OtherIcons/Down").surroundWithCircle(40f))
+        tab.add(ImageGetter.getArrowImage(Align.bottom).apply { color = Color.BLACK }.surroundWithCircle(40f))
         if (cityScreen.canChangeState && !city.isPuppet) {
             tab.touchable = Touchable.enabled
             tab.onClick {
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index fa6b7bbd4e..5a50b75954 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -209,17 +209,17 @@ open class TileGroup(var tileInfo: TileInfo, val tileSetStrings:TileSetStrings,
         if (tileInfo.naturalWonder != null) return listOf(tileSetStrings.orFallback { getTile(tileInfo.naturalWonder!!) })
 
         val shownImprovement = tileInfo.getShownImprovement(viewingCiv)
-        val shouldShowImprovement = (shownImprovement != null && UncivGame.Current.settings.showPixelImprovements)
+        val shouldShowImprovement = shownImprovement != null && UncivGame.Current.settings.showPixelImprovements
 
         val shouldShowResource = UncivGame.Current.settings.showPixelImprovements && tileInfo.resource != null &&
                 (showEntireMap || viewingCiv == null || tileInfo.hasViewableResource(viewingCiv))
 
         val resourceAndImprovementSequence = sequence {
-            if (shouldShowResource)  yield(tileInfo.resource)
-            if (shouldShowImprovement) yield(shownImprovement)
-        }.filterNotNull()
+            if (shouldShowResource)  yield(tileInfo.resource!!)
+            if (shouldShowImprovement) yield(shownImprovement!!)
+        }
 
-        val terrainImages = (sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence()).filterNotNull()
+        val terrainImages = sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence()
         val allTogether = (terrainImages + resourceAndImprovementSequence).joinToString("+")
         val allTogetherLocation = tileSetStrings.getTile(allTogether)
 
diff --git a/core/src/com/unciv/ui/utils/IconCircleGroup.kt b/core/src/com/unciv/ui/utils/IconCircleGroup.kt
index 295212c1ad..fd7d486c3b 100644
--- a/core/src/com/unciv/ui/utils/IconCircleGroup.kt
+++ b/core/src/com/unciv/ui/utils/IconCircleGroup.kt
@@ -3,6 +3,7 @@ package com.unciv.ui.utils
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.Group
+import com.badlogic.gdx.utils.Align
 
 class IconCircleGroup(size: Float, val actor: Actor, resizeActor: Boolean = true, color: Color = Color.WHITE): Group(){
     val circle = ImageGetter.getCircle().apply {
@@ -16,6 +17,7 @@ class IconCircleGroup(size: Float, val actor: Actor, resizeActor: Boolean = true
         addActor(circle)
         if (resizeActor) actor.setSize(size * 0.75f, size * 0.75f)
         actor.center(this)
+        actor.setOrigin(Align.center)
         addActor(actor)
     }
 }
diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt
index cadc5b90b9..fca4e788a5 100644
--- a/core/src/com/unciv/ui/utils/ImageGetter.kt
+++ b/core/src/com/unciv/ui/utils/ImageGetter.kt
@@ -333,6 +333,15 @@ object ImageGetter {
         return redCross
     }
 
+    fun getArrowImage(align:Int = Align.right): Image {
+        val image = getImage("OtherIcons/ArrowRight")
+        image.setOrigin(Align.center)
+        if (align == Align.left) image.rotation = 180f
+        if (align == Align.bottom) image.rotation = -90f
+        if (align == Align.top) image.rotation = 90f
+        return image
+    }
+
     fun getResourceImage(resourceName: String, size: Float): IconCircleGroup {
         val iconGroup = getImage("ResourceIcons/$resourceName").surroundWithCircle(size)
         val resource = ruleset.tileResources[resourceName]