From 13be70615de35c54d7d7f0fc5045eca33ef905f9 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 19 Feb 2023 07:54:24 +0200 Subject: [PATCH] chore: more ui class reorg --- core/src/com/unciv/UncivGame.kt | 2 +- core/src/com/unciv/logic/files/MapSaver.kt | 2 +- core/src/com/unciv/logic/files/UncivFiles.kt | 2 +- core/src/com/unciv/models/ruleset/Ruleset.kt | 1 - core/src/com/unciv/models/ruleset/RulesetValidator.kt | 1 - .../{ui/components => models/ruleset}/TextSimilarity.kt | 2 +- .../basescreen}/TextureArraySpriteBatch.java | 2 +- core/src/com/unciv/ui/screens/basescreen/UncivStage.kt | 1 - .../com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt | 4 ++-- .../screens/multiplayerscreens/AddMultiplayerGameScreen.kt | 2 +- .../multiplayerscreens/EditMultiplayerGameInfoScreen.kt | 2 +- .../ui/screens/multiplayerscreens/MultiplayerHelpers.kt | 2 +- core/src/com/unciv/ui/{ => screens}/savescreens/Gzip.kt | 2 +- .../unciv/ui/{ => screens}/savescreens/LoadGameScreen.kt | 2 +- .../unciv/ui/{ => screens}/savescreens/LoadOrSaveScreen.kt | 2 +- .../com/unciv/ui/{ => screens}/savescreens/QuickSave.kt | 7 +++++-- .../unciv/ui/{ => screens}/savescreens/SaveGameScreen.kt | 2 +- .../savescreens/VerticalFileListScrollPane.kt | 2 +- core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt | 6 +++--- .../screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt | 4 ++-- core/src/com/unciv/utils/{concurrency => }/Concurrency.kt | 0 21 files changed, 25 insertions(+), 25 deletions(-) rename core/src/com/unciv/{ui/components => models/ruleset}/TextSimilarity.kt (99%) rename core/src/com/unciv/ui/{components => screens/basescreen}/TextureArraySpriteBatch.java (99%) rename core/src/com/unciv/ui/{ => screens}/savescreens/Gzip.kt (97%) rename core/src/com/unciv/ui/{ => screens}/savescreens/LoadGameScreen.kt (99%) rename core/src/com/unciv/ui/{ => screens}/savescreens/LoadOrSaveScreen.kt (99%) rename core/src/com/unciv/ui/{ => screens}/savescreens/QuickSave.kt (96%) rename core/src/com/unciv/ui/{ => screens}/savescreens/SaveGameScreen.kt (99%) rename core/src/com/unciv/ui/{ => screens}/savescreens/VerticalFileListScrollPane.kt (99%) rename core/src/com/unciv/utils/{concurrency => }/Concurrency.kt (100%) diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 9cff9df28e..9a37e27165 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -31,7 +31,7 @@ import com.unciv.ui.crashhandling.wrapCrashHandlingUnit import com.unciv.ui.images.ImageGetter import com.unciv.ui.popups.ConfirmPopup import com.unciv.ui.popups.Popup -import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.ui.components.BaseScreen import com.unciv.ui.components.extensions.center diff --git a/core/src/com/unciv/logic/files/MapSaver.kt b/core/src/com/unciv/logic/files/MapSaver.kt index 8d4be6efa1..69f236b3e2 100644 --- a/core/src/com/unciv/logic/files/MapSaver.kt +++ b/core/src/com/unciv/logic/files/MapSaver.kt @@ -5,7 +5,7 @@ import com.badlogic.gdx.files.FileHandle import com.unciv.json.json import com.unciv.logic.map.MapParameters import com.unciv.logic.map.TileMap -import com.unciv.ui.savescreens.Gzip +import com.unciv.ui.screens.savescreens.Gzip object MapSaver { diff --git a/core/src/com/unciv/logic/files/UncivFiles.kt b/core/src/com/unciv/logic/files/UncivFiles.kt index 32e14409b7..a3983831b9 100644 --- a/core/src/com/unciv/logic/files/UncivFiles.kt +++ b/core/src/com/unciv/logic/files/UncivFiles.kt @@ -12,7 +12,7 @@ import com.unciv.logic.* import com.unciv.models.metadata.GameSettings import com.unciv.models.metadata.doMigrations import com.unciv.models.metadata.isMigrationNecessary -import com.unciv.ui.savescreens.Gzip +import com.unciv.ui.screens.savescreens.Gzip import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.debug diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt index 5a79d6c781..f82711a79b 100644 --- a/core/src/com/unciv/models/ruleset/Ruleset.kt +++ b/core/src/com/unciv/models/ruleset/Ruleset.kt @@ -31,7 +31,6 @@ import com.unciv.models.stats.INamed import com.unciv.models.stats.NamedStats import com.unciv.models.translations.tr import com.unciv.ui.components.extensions.colorFromRGB -import com.unciv.ui.components.getRelativeTextDistance import com.unciv.utils.Log import com.unciv.utils.debug import kotlin.collections.set diff --git a/core/src/com/unciv/models/ruleset/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/RulesetValidator.kt index c215f9d974..ae18f57970 100644 --- a/core/src/com/unciv/models/ruleset/RulesetValidator.kt +++ b/core/src/com/unciv/models/ruleset/RulesetValidator.kt @@ -13,7 +13,6 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.INamed import com.unciv.models.stats.Stats -import com.unciv.ui.components.getRelativeTextDistance class RulesetValidator(val ruleset: Ruleset) { diff --git a/core/src/com/unciv/ui/components/TextSimilarity.kt b/core/src/com/unciv/models/ruleset/TextSimilarity.kt similarity index 99% rename from core/src/com/unciv/ui/components/TextSimilarity.kt rename to core/src/com/unciv/models/ruleset/TextSimilarity.kt index acdf3b688b..24c085f965 100644 --- a/core/src/com/unciv/ui/components/TextSimilarity.kt +++ b/core/src/com/unciv/models/ruleset/TextSimilarity.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.components +package com.unciv.models.ruleset /** * Algorithm: diff --git a/core/src/com/unciv/ui/components/TextureArraySpriteBatch.java b/core/src/com/unciv/ui/screens/basescreen/TextureArraySpriteBatch.java similarity index 99% rename from core/src/com/unciv/ui/components/TextureArraySpriteBatch.java rename to core/src/com/unciv/ui/screens/basescreen/TextureArraySpriteBatch.java index c42c18495b..38ffa5d570 100644 --- a/core/src/com/unciv/ui/components/TextureArraySpriteBatch.java +++ b/core/src/com/unciv/ui/screens/basescreen/TextureArraySpriteBatch.java @@ -1,4 +1,4 @@ -package com.unciv.ui.components; +package com.unciv.ui.screens.basescreen; import java.nio.IntBuffer; import java.util.Arrays; diff --git a/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt b/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt index 264ae871d8..2f0bb167c1 100644 --- a/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt +++ b/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt @@ -9,7 +9,6 @@ import com.badlogic.gdx.utils.viewport.Viewport import com.unciv.UncivGame import com.unciv.logic.event.Event import com.unciv.logic.event.EventBus -import com.unciv.ui.components.TextureArraySpriteBatch import com.unciv.ui.crashhandling.wrapCrashHandling import com.unciv.ui.crashhandling.wrapCrashHandlingUnit import com.unciv.utils.Log diff --git a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt index d466963a42..d6e9871b16 100644 --- a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt @@ -39,8 +39,8 @@ import com.unciv.ui.popups.ToastPopup import com.unciv.ui.popups.closeAllPopups import com.unciv.ui.popups.hasOpenPopups import com.unciv.ui.popups.popups -import com.unciv.ui.savescreens.LoadGameScreen -import com.unciv.ui.savescreens.QuickSave +import com.unciv.ui.screens.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.QuickSave import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.screens.newgamescreen.NewGameScreen import com.unciv.ui.screens.pickerscreens.ModManagementScreen diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt index 65ba98f723..1fb3c09a60 100644 --- a/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt @@ -7,7 +7,7 @@ import com.unciv.models.translations.tr import com.unciv.ui.screens.pickerscreens.PickerScreen import com.unciv.ui.popups.Popup import com.unciv.ui.popups.ToastPopup -import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen import com.unciv.ui.components.UncivTextField import com.unciv.ui.components.extensions.enable import com.unciv.ui.components.extensions.onClick diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt index 3ba5e66b39..d23aa67fc8 100644 --- a/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt @@ -8,7 +8,7 @@ import com.unciv.ui.screens.pickerscreens.PickerScreen import com.unciv.ui.popups.ConfirmPopup import com.unciv.ui.popups.Popup import com.unciv.ui.popups.ToastPopup -import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen import com.unciv.ui.components.UncivTextField import com.unciv.ui.components.extensions.disable import com.unciv.ui.components.extensions.enable diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt index 15ded74f03..f2531794af 100644 --- a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt @@ -6,7 +6,7 @@ import com.unciv.logic.multiplayer.OnlineMultiplayer import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.models.translations.tr import com.unciv.ui.popups.Popup -import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen import com.unciv.ui.components.BaseScreen import com.unciv.ui.components.extensions.formatShort import com.unciv.ui.components.extensions.toCheckBox diff --git a/core/src/com/unciv/ui/savescreens/Gzip.kt b/core/src/com/unciv/ui/screens/savescreens/Gzip.kt similarity index 97% rename from core/src/com/unciv/ui/savescreens/Gzip.kt rename to core/src/com/unciv/ui/screens/savescreens/Gzip.kt index 6838494c6d..42bc79be7c 100644 --- a/core/src/com/unciv/ui/savescreens/Gzip.kt +++ b/core/src/com/unciv/ui/screens/savescreens/Gzip.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.badlogic.gdx.utils.Base64Coder import java.io.BufferedReader diff --git a/core/src/com/unciv/ui/savescreens/LoadGameScreen.kt b/core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt similarity index 99% rename from core/src/com/unciv/ui/savescreens/LoadGameScreen.kt rename to core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt index f25293d692..d47dae6986 100644 --- a/core/src/com/unciv/ui/savescreens/LoadGameScreen.kt +++ b/core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle diff --git a/core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt b/core/src/com/unciv/ui/screens/savescreens/LoadOrSaveScreen.kt similarity index 99% rename from core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt rename to core/src/com/unciv/ui/screens/savescreens/LoadOrSaveScreen.kt index d3477ef4bd..eaa9bff61b 100644 --- a/core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt +++ b/core/src/com/unciv/ui/screens/savescreens/LoadOrSaveScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.scenes.scene2d.ui.CheckBox diff --git a/core/src/com/unciv/ui/savescreens/QuickSave.kt b/core/src/com/unciv/ui/screens/savescreens/QuickSave.kt similarity index 96% rename from core/src/com/unciv/ui/savescreens/QuickSave.kt rename to core/src/com/unciv/ui/screens/savescreens/QuickSave.kt index 0409e4feed..bcc04edb33 100644 --- a/core/src/com/unciv/ui/savescreens/QuickSave.kt +++ b/core/src/com/unciv/ui/screens/savescreens/QuickSave.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.unciv.Constants import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen @@ -77,7 +77,10 @@ object QuickSave { Log.error("Could not autoload game", ex) launchOnGLThread { loadingPopup.close() - val (message) = LoadGameScreen.getLoadExceptionMessage(ex, "Cannot resume game!") + val (message) = LoadGameScreen.getLoadExceptionMessage( + ex, + "Cannot resume game!" + ) ToastPopup(message, screen) } return@run diff --git a/core/src/com/unciv/ui/savescreens/SaveGameScreen.kt b/core/src/com/unciv/ui/screens/savescreens/SaveGameScreen.kt similarity index 99% rename from core/src/com/unciv/ui/savescreens/SaveGameScreen.kt rename to core/src/com/unciv/ui/screens/savescreens/SaveGameScreen.kt index b15cdc6e48..9e0573f781 100644 --- a/core/src/com/unciv/ui/savescreens/SaveGameScreen.kt +++ b/core/src/com/unciv/ui/screens/savescreens/SaveGameScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle diff --git a/core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt b/core/src/com/unciv/ui/screens/savescreens/VerticalFileListScrollPane.kt similarity index 99% rename from core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt rename to core/src/com/unciv/ui/screens/savescreens/VerticalFileListScrollPane.kt index 1c26125313..fff48a3897 100644 --- a/core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt +++ b/core/src/com/unciv/ui/screens/savescreens/VerticalFileListScrollPane.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.savescreens +package com.unciv.ui.screens.savescreens import com.badlogic.gdx.Input import com.badlogic.gdx.files.FileHandle diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt index 3ca8990683..c14401ed46 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt @@ -38,9 +38,9 @@ import com.unciv.ui.screens.pickerscreens.TechPickerScreen import com.unciv.ui.popups.Popup import com.unciv.ui.popups.ToastPopup import com.unciv.ui.popups.hasOpenPopups -import com.unciv.ui.savescreens.LoadGameScreen -import com.unciv.ui.savescreens.QuickSave -import com.unciv.ui.savescreens.SaveGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.QuickSave +import com.unciv.ui.screens.savescreens.SaveGameScreen import com.unciv.ui.components.BaseScreen import com.unciv.ui.components.KeyCharAndCode import com.unciv.ui.components.extensions.centerX diff --git a/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt index 239c65f794..af5eb358b2 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt @@ -10,8 +10,8 @@ import com.unciv.ui.popups.options.addMusicCurrentlyPlaying import com.unciv.ui.popups.options.addMusicPauseSlider import com.unciv.ui.popups.options.addMusicVolumeSlider import com.unciv.ui.popups.Popup -import com.unciv.ui.savescreens.LoadGameScreen -import com.unciv.ui.savescreens.SaveGameScreen +import com.unciv.ui.screens.savescreens.LoadGameScreen +import com.unciv.ui.screens.savescreens.SaveGameScreen import com.unciv.ui.screens.victoryscreen.VictoryScreen import com.unciv.ui.screens.worldscreen.WorldScreen diff --git a/core/src/com/unciv/utils/concurrency/Concurrency.kt b/core/src/com/unciv/utils/Concurrency.kt similarity index 100% rename from core/src/com/unciv/utils/concurrency/Concurrency.kt rename to core/src/com/unciv/utils/Concurrency.kt