chore: Moved TranslatedSelectBox to its own file in ui.components - see #10031

core/src/com/unciv/models/metadata/ModCategories.kt

@@ -2,7 +2,7 @@ package com.unciv.models.metadata
 
 import com.badlogic.gdx.Gdx
 import com.unciv.json.json
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.screens.pickerscreens.Github
 
 

core/src/com/unciv/ui/components/TranslatedSelectBox.kt

@@ -0,0 +1,27 @@
+package com.unciv.ui.components
+
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
+import com.badlogic.gdx.scenes.scene2d.ui.Skin
+import com.badlogic.gdx.utils.Array
+import com.unciv.models.translations.tr
+
+class TranslatedSelectBox(values : Collection<String>, default:String, skin: Skin) : SelectBox<TranslatedSelectBox.TranslatedString>(skin) {
+    class TranslatedString(val value: String) {
+        val translation = value.tr()
+        override fun toString() = translation
+        // Equality contract needs to be implemented else TranslatedSelectBox.setSelected won't work properly
+        override fun equals(other: Any?): Boolean = other is TranslatedString && value == other.value
+        override fun hashCode() = value.hashCode()
+    }
+
+    init {
+        val array = Array<TranslatedString>()
+        values.forEach { array.add(TranslatedString(it)) }
+        items = array
+        selected = array.firstOrNull { it.value == default } ?: array.first()
+    }
+
+    fun setSelected(newValue: String) {
+        selected = items.firstOrNull { it == TranslatedString(newValue) } ?: return
+    }
+}

core/src/com/unciv/ui/popups/options/DisplayTab.kt

@@ -23,7 +23,7 @@ import com.unciv.ui.components.extensions.toTextButton
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.popups.ConfirmPopup
 import com.unciv.ui.screens.basescreen.BaseScreen
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.screens.worldscreen.NotificationsScroll
 import com.unciv.utils.Display
 import com.unciv.utils.ScreenMode

core/src/com/unciv/ui/popups/options/ModCheckTab.kt

@@ -23,7 +23,7 @@ import com.unciv.ui.components.input.onClick
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.popups.ToastPopup
 import com.unciv.ui.screens.basescreen.BaseScreen
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.utils.Concurrency
 import com.unciv.utils.Log
 import com.unciv.utils.debug

core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorModsTab.kt

@@ -10,7 +10,7 @@ import com.unciv.models.ruleset.RulesetCache
 import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen
 import com.unciv.ui.screens.mapeditorscreen.TileInfoNormalizer
 import com.unciv.ui.screens.newgamescreen.ModCheckboxTable
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.popups.Popup
 import com.unciv.ui.screens.basescreen.BaseScreen
 import com.unciv.ui.components.TabbedPager

core/src/com/unciv/ui/screens/modmanager/ModManagementOptions.kt

@@ -17,7 +17,7 @@ import com.unciv.ui.components.input.onActivation
 import com.unciv.ui.components.input.onChange
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.basescreen.BaseScreen
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import kotlin.math.sign
 
 /**

core/src/com/unciv/ui/screens/newgamescreen/GameOptionsTable.kt

@@ -19,6 +19,7 @@ import com.unciv.ui.audio.MusicMood
 import com.unciv.ui.audio.MusicTrackChooserFlags
 import com.unciv.ui.components.AutoScrollPane
 import com.unciv.ui.components.ExpanderTab
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.components.UncivSlider
 import com.unciv.ui.components.extensions.pad
 import com.unciv.ui.components.extensions.toCheckBox

core/src/com/unciv/ui/screens/newgamescreen/MapOptionsTable.kt

@@ -2,6 +2,7 @@ package com.unciv.ui.screens.newgamescreen
 
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.logic.map.MapGeneratedMainType
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.components.extensions.toLabel
 import com.unciv.ui.components.input.onChange
 import com.unciv.ui.screens.basescreen.BaseScreen

core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt

@@ -15,6 +15,7 @@ import com.unciv.logic.map.MapSize
 import com.unciv.logic.map.MapSizeNew
 import com.unciv.logic.map.MapType
 import com.unciv.ui.components.ExpanderTab
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.components.UncivSlider
 import com.unciv.ui.components.UncivTextField
 import com.unciv.ui.components.WrappableLabel

core/src/com/unciv/ui/screens/newgamescreen/NewGameScreen.kt

@@ -2,10 +2,7 @@ package com.unciv.ui.screens.newgamescreen
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
-import com.badlogic.gdx.scenes.scene2d.ui.Skin
 import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
-import com.badlogic.gdx.utils.Array
 import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.GameInfo
@@ -411,23 +408,3 @@ class NewGameScreen(
     override fun recreate(): BaseScreen = NewGameScreen(gameSetupInfo)
 }
 
-class TranslatedSelectBox(values : Collection<String>, default:String, skin: Skin) : SelectBox<TranslatedSelectBox.TranslatedString>(skin) {
-    class TranslatedString(val value: String) {
-        val translation = value.tr()
-        override fun toString() = translation
-        // Equality contract needs to be implemented else TranslatedSelectBox.setSelected won't work properly
-        override fun equals(other: Any?): Boolean = other is TranslatedString && value == other.value
-        override fun hashCode() = value.hashCode()
-    }
-
-    init {
-        val array = Array<TranslatedString>()
-        values.forEach { array.add(TranslatedString(it)) }
-        items = array
-        selected = array.firstOrNull { it.value == default } ?: array.first()
-    }
-
-    fun setSelected(newValue: String) {
-        selected = items.firstOrNull { it == TranslatedString(newValue) } ?: return
-    }
-}

core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt

@@ -14,7 +14,7 @@ import com.unciv.ui.components.extensions.packIfNeeded
 import com.unciv.ui.components.input.OnClickListener
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.basescreen.BaseScreen
-import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox
+import com.unciv.ui.components.TranslatedSelectBox
 import com.unciv.ui.screens.victoryscreen.VictoryScreenCivGroup.DefeatedPlayerStyle
 import com.unciv.ui.screens.worldscreen.WorldScreen