From 70f81d165758508628dacd27e1d20e32472cd48a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 19 Feb 2023 07:47:29 +0200 Subject: [PATCH] chore: huge code reorg for ui classes Separated into screens, popups, and UI components, with screen-specific components located together with their screens --- core/src/com/unciv/UncivGame.kt | 23 +++---- core/src/com/unciv/UncivGameParameters.kt | 6 +- .../com/unciv/logic/automation/Automation.kt | 2 +- .../unciv/logic/automation/ai/TacticalAI.kt | 2 +- .../civilization/BarbarianManager.kt | 2 +- .../civilization/NextTurnAutomation.kt | 2 +- .../automation/unit/SpecificUnitAutomation.kt | 4 +- .../logic/automation/unit/UnitAutomation.kt | 6 +- .../logic/automation/unit/WorkerAutomation.kt | 2 +- core/src/com/unciv/logic/battle/Battle.kt | 2 +- .../com/unciv/logic/battle/BattleDamage.kt | 2 +- .../com/unciv/logic/battle/CityCombatant.kt | 2 +- .../com/unciv/logic/city/CityConstructions.kt | 12 ++-- core/src/com/unciv/logic/city/CityStats.kt | 2 +- .../city/managers/CityExpansionManager.kt | 6 +- .../city/managers/CityPopulationManager.kt | 6 +- .../city/managers/CityReligionManager.kt | 2 +- .../unciv/logic/civilization/Civilization.kt | 4 +- .../unciv/logic/civilization/Notification.kt | 10 +-- .../diplomacy/CityStateFunctions.kt | 2 +- .../diplomacy/DiplomacyManager.kt | 2 +- .../civilization/managers/GoldenAgeManager.kt | 2 +- .../civilization/managers/PolicyManager.kt | 2 +- .../civilization/managers/QuestManager.kt | 4 +- .../civilization/managers/ReligionManager.kt | 2 +- .../civilization/managers/TechManager.kt | 6 +- .../civilization/managers/TurnManager.kt | 2 +- .../transients/CivInfoStatsForNextTurn.kt | 2 +- core/src/com/unciv/logic/files/MapSaver.kt | 2 +- core/src/com/unciv/logic/files/UncivFiles.kt | 2 +- core/src/com/unciv/logic/map/TileMap.kt | 2 +- .../logic/map/mapgenerator/MapGenerator.kt | 4 +- .../logic/map/mapgenerator/MapRegions.kt | 2 +- .../com/unciv/logic/map/mapunit/MapUnit.kt | 2 +- .../logic/map/mapunit/UnitUpgradeManager.kt | 2 +- .../unciv/logic/map/tile/TileDescription.kt | 4 +- .../map/tile/TileInfoImprovementFunctions.kt | 5 -- .../unciv/logic/map/tile/TileStatFunctions.kt | 2 +- .../logic/multiplayer/OnlineMultiplayer.kt | 2 +- .../multiplayer/OnlineMultiplayerGame.kt | 3 +- .../logic/multiplayer/storage/DropBox.kt | 3 +- .../com/unciv/logic/trade/TradeEvaluation.kt | 4 +- core/src/com/unciv/logic/trade/TradeOffer.kt | 2 +- core/src/com/unciv/models/UnitAction.kt | 2 +- .../com/unciv/models/metadata/GameSettings.kt | 2 +- core/src/com/unciv/models/ruleset/Belief.kt | 4 +- core/src/com/unciv/models/ruleset/Building.kt | 10 +-- .../com/unciv/models/ruleset/IConstruction.kt | 4 +- core/src/com/unciv/models/ruleset/Policy.kt | 4 +- core/src/com/unciv/models/ruleset/Ruleset.kt | 4 +- .../com/unciv/models/ruleset/RulesetObject.kt | 4 +- .../unciv/models/ruleset/RulesetValidator.kt | 2 +- core/src/com/unciv/models/ruleset/Speed.kt | 4 +- core/src/com/unciv/models/ruleset/Victory.kt | 2 +- .../models/ruleset/nation/CityStateType.kt | 2 +- .../unciv/models/ruleset/nation/Difficulty.kt | 6 +- .../com/unciv/models/ruleset/nation/Nation.kt | 26 +++++--- core/src/com/unciv/models/ruleset/tech/Era.kt | 6 +- .../unciv/models/ruleset/tech/Technology.kt | 4 +- .../com/unciv/models/ruleset/tile/Terrain.kt | 4 +- .../models/ruleset/tile/TileImprovement.kt | 8 +-- .../unciv/models/ruleset/tile/TileResource.kt | 2 +- .../ruleset/unique/UniqueParameterType.kt | 2 +- .../ruleset/unique/UniqueTriggerActivation.kt | 4 +- .../com/unciv/models/ruleset/unit/BaseUnit.kt | 8 +-- .../unciv/models/ruleset/unit/BaseUnitCost.kt | 2 +- .../ruleset/unit/BaseUnitDescriptions.kt | 8 +-- .../unciv/models/ruleset/unit/Promotion.kt | 2 +- core/src/com/unciv/models/stats/Stat.kt | 4 +- .../AudioExceptionHelper.kt | 2 +- .../{utils => components}/AutoScrollPane.kt | 2 +- .../ui/{utils => components}/BorderedTable.kt | 2 +- .../ui/{utils => components}/ExpanderTab.kt | 6 +- .../unciv/ui/{utils => components}/Fonts.kt | 2 +- .../GeneralPlatformSpecificHelpers.kt | 2 +- .../{utils => components}/KeyCharAndCode.kt | 2 +- .../ui/{utils => components}/LanguageTable.kt | 12 ++-- .../ui/{utils => components}/MayaCalendar.kt | 10 +-- .../ui/{utils => components}/TabbedPager.kt | 20 +++--- .../{utils => components}/TextSimilarity.kt | 2 +- .../TextureArraySpriteBatch.java | 3 +- .../ui/{utils => components}/UncivSlider.kt | 8 +-- .../{utils => components}/UncivTextField.kt | 14 ++-- .../ui/{utils => components}/UncivTooltip.kt | 4 +- .../ui/{utils => components}/UnitGroup.kt | 14 ++-- .../{utils => components}/WrappableLabel.kt | 4 +- .../ZoomGestureListener.kt | 2 +- .../ZoomableScrollPane.kt | 2 +- .../extensions/CollectionExtensions.kt | 2 +- .../extensions/FormattingExtensions.kt | 2 +- .../extensions/Scene2dExtensions.kt | 12 ++-- .../extensions/TimeExtensions.kt | 2 +- .../{ => components}/tilegroups/CityButton.kt | 32 ++++----- .../tilegroups/CityTileGroup.kt | 12 ++-- .../{ => components}/tilegroups/TileGroup.kt | 18 ++--- .../tilegroups/TileGroupMap.kt | 23 +++---- .../tilegroups/TileSetStrings.kt | 2 +- .../tilegroups/WorldTileGroup.kt | 8 +-- .../{ => components}/tilegroups/YieldGroup.kt | 8 +-- .../tilegroups/layers/TileLayer.kt | 6 +- .../tilegroups/layers/TileLayerBorders.kt | 4 +- .../tilegroups/layers/TileLayerCityButton.kt | 8 +-- .../tilegroups/layers/TileLayerFeatures.kt | 4 +- .../tilegroups/layers/TileLayerMisc.kt | 18 ++--- .../tilegroups/layers/TileLayerOverlay.kt | 4 +- .../tilegroups/layers/TileLayerTerrain.kt | 6 +- .../tilegroups/layers/TileLayerUnitArt.kt | 4 +- .../tilegroups/layers/TileLayerUnitFlag.kt | 12 ++-- .../com/unciv/ui/crashhandling/CrashScreen.kt | 14 ++-- .../com/unciv/ui/images/IconCircleGroup.kt | 2 +- .../src/com/unciv/ui/images/IconTextButton.kt | 4 +- .../src/com/unciv/ui/images/ImageAttempter.kt | 4 +- core/src/com/unciv/ui/images/ImageGetter.kt | 4 +- core/src/com/unciv/ui/images/Portrait.kt | 14 ++-- .../ui/{popup => popups}/AskNumberPopup.kt | 14 ++-- .../ui/{popup => popups}/AskTextPopup.kt | 11 ++-- .../ui/{popup => popups}/ConfirmPopup.kt | 8 +-- .../com/unciv/ui/{popup => popups}/Popup.kt | 25 ++++--- .../unciv/ui/{popup => popups}/ToastPopup.kt | 6 +- .../unciv/ui/{ => popups}/options/AboutTab.kt | 6 +- .../ui/{ => popups}/options/AdvancedTab.kt | 34 +++++----- .../unciv/ui/{ => popups}/options/DebugTab.kt | 16 ++--- .../ui/{ => popups}/options/DisplayTab.kt | 22 +++---- .../ui/{ => popups}/options/GameplayTab.kt | 8 +-- .../ui/{ => popups}/options/LanguageTab.kt | 8 +-- .../ui/{ => popups}/options/ModCheckTab.kt | 22 +++---- .../ui/{ => popups}/options/MultiplayerTab.kt | 33 +++++----- .../ui/{ => popups}/options/OptionsPopup.kt | 22 +++---- .../unciv/ui/{ => popups}/options/SoundTab.kt | 16 ++--- .../unciv/ui/{saves => savescreens}/Gzip.kt | 4 +- .../{saves => savescreens}/LoadGameScreen.kt | 29 ++++---- .../LoadOrSaveScreen.kt | 32 ++++----- .../ui/{saves => savescreens}/QuickSave.kt | 11 ++-- .../{saves => savescreens}/SaveGameScreen.kt | 26 ++++---- .../VerticalFileListScrollPane.kt | 10 +-- .../ui/{ => screens}/LanguagePickerScreen.kt | 16 ++--- .../unciv/ui/{ => screens}/LoadingScreen.kt | 10 +-- .../basescreen}/BaseScreen.kt | 16 ++--- .../basescreen}/TutorialController.kt | 40 ++++++++++- .../ui/{ => screens/basescreen}/UncivStage.kt | 4 +- .../cityscreen/CitizenManagementTable.kt | 10 +-- .../cityscreen/CityConstructionsTable.kt | 46 ++++++------- .../{ => screens}/cityscreen/CityMapHolder.kt | 8 +-- .../cityscreen/CityReligionInfoTable.kt | 22 +++---- .../ui/{ => screens}/cityscreen/CityScreen.kt | 36 +++++----- .../cityscreen/CityScreenCityPickerTable.kt | 10 +-- .../cityscreen/CityScreenTileTable.kt | 36 +++++----- .../cityscreen/CityStatsTable.kt | 30 ++++----- .../cityscreen/ConstructionInfoTable.kt | 20 +++--- .../cityscreen/DetailedStatsPopup.kt | 22 +++---- .../cityscreen/SpecialistAllocationTable.kt | 21 +++--- .../CivilopediaCategories.kt | 10 +-- .../civilopediascreen}/CivilopediaScreen.kt | 22 +++---- .../civilopediascreen}/FormattedLine.kt | 8 +-- .../civilopediascreen}/ICivilopediaText.kt | 2 +- .../civilopediascreen}/MarkupRenderer.kt | 8 +-- .../SimpleCivilopediaText.kt | 2 +- .../diplomacyscreen}/DiplomacyScreen.kt | 38 +++++------ .../diplomacyscreen}/LeaderIntroTable.kt | 6 +- .../diplomacyscreen}/OfferColumnsTable.kt | 10 +-- .../diplomacyscreen}/OffersListScroll.kt | 12 ++-- .../diplomacyscreen}/TradeTable.kt | 10 +-- .../mainmenuscreen}/EasterEggRulesets.kt | 4 +- .../screens/mainmenuscreen}/MainMenuScreen.kt | 61 ++++++++--------- .../mapeditorscreen}/EditorMapHolder.kt | 16 ++--- .../mapeditorscreen}/MapEditorFilesTable.kt | 12 ++-- .../mapeditorscreen}/MapEditorMainTabs.kt | 20 +++--- .../mapeditorscreen}/MapEditorScreen.kt | 22 +++---- .../mapeditorscreen}/MapEditorToolsDrawer.kt | 6 +- .../mapeditorscreen}/MapGeneratorSteps.kt | 2 +- .../mapeditorscreen}/TileInfoNormalizer.kt | 2 +- .../tabs/MapEditorEditSubTabs.kt | 42 +++++++----- .../mapeditorscreen}/tabs/MapEditorEditTab.kt | 42 ++++++------ .../tabs/MapEditorGenerateTab.kt | 34 +++++----- .../mapeditorscreen}/tabs/MapEditorLoadTab.kt | 28 ++++---- .../mapeditorscreen}/tabs/MapEditorModsTab.kt | 28 ++++---- .../tabs/MapEditorOptionsTab.kt | 28 ++++---- .../mapeditorscreen}/tabs/MapEditorSaveTab.kt | 34 +++++----- .../mapeditorscreen}/tabs/MapEditorViewTab.kt | 32 ++++----- .../multiplayerscreens}/AddFriendScreen.kt | 16 ++--- .../AddMultiplayerGameScreen.kt | 20 +++--- .../multiplayerscreens}/EditFriendScreen.kt | 18 ++--- .../EditMultiplayerGameInfoScreen.kt | 24 +++---- .../multiplayerscreens}/FriendPickerList.kt | 8 +-- .../multiplayerscreens}/GameList.kt | 8 +-- .../multiplayerscreens}/MultiplayerHelpers.kt | 13 ++-- .../multiplayerscreens}/MultiplayerScreen.kt | 18 ++--- .../ViewFriendsListScreen.kt | 16 ++--- .../newgamescreen/FriendTable.kt | 6 +- .../newgamescreen/GameOptionsTable.kt | 36 +++++----- .../newgamescreen/IPreviousScreen.kt | 6 +- .../newgamescreen/MapOptionsTable.kt | 13 ++-- .../newgamescreen/MapParametersTable.kt | 22 +++---- .../newgamescreen/ModCheckboxTable.kt | 14 ++-- .../newgamescreen/MultiCheckboxTable.kt | 10 +-- .../newgamescreen/NationTable.kt | 12 ++-- .../newgamescreen/NewGameScreen.kt | 34 +++++----- .../newgamescreen/PlayerPickerTable.kt | 16 ++--- .../overviewscreen/CityOverviewTable.kt | 31 +++++---- .../EmpireOverviewCategories.kt | 6 +- .../overviewscreen/EmpireOverviewScreen.kt | 12 ++-- .../overviewscreen/EmpireOverviewTab.kt | 10 +-- .../overviewscreen/EspionageOverviewScreen.kt | 24 +++---- .../GlobalPoliticsOverviewTable.kt | 26 ++++---- .../NotificationsOverviewTable.kt | 14 ++-- .../overviewscreen/ReligionOverviewTable.kt | 18 ++--- .../overviewscreen/ResourcesOverviewTable.kt | 22 +++---- .../overviewscreen/StatsOverviewTable.kt | 8 +-- .../overviewscreen/TradesOverviewTable.kt | 8 +-- .../overviewscreen/UnitOverviewTable.kt | 32 ++++----- .../overviewscreen/WonderOverviewTable.kt | 10 +-- .../pickerscreens/CityRenamePopup.kt | 7 +- .../DiplomaticVotePickerScreen.kt | 11 +++- .../DiplomaticVoteResultScreen.kt | 8 +-- .../ui/{ => screens}/pickerscreens/GitHub.kt | 10 +-- .../pickerscreens/GreatPersonPickerScreen.kt | 11 ++-- .../pickerscreens/ImprovementPickerScreen.kt | 16 ++--- .../pickerscreens/ModManagementOptions.kt | 28 ++++---- .../pickerscreens/ModManagementScreen.kt | 56 ++++++++-------- .../pickerscreens/PantheonPickerScreen.kt | 2 +- .../{ => screens}/pickerscreens/PickerPane.kt | 16 ++--- .../pickerscreens/PickerScreen.kt | 10 +-- .../pickerscreens/PolicyPickerScreen.kt | 39 ++++++----- .../pickerscreens/PromotionPickerScreen.kt | 24 +++---- .../ReligionPickerScreenCommon.kt | 21 +++--- .../ReligiousBeliefsPickerScreen.kt | 24 +++---- .../{ => screens}/pickerscreens/TechButton.kt | 18 ++--- .../pickerscreens/TechPickerScreen.kt | 24 +++---- .../pickerscreens/UnitRenamePopup.kt | 8 +-- .../victoryscreen/RankingType.kt | 2 +- .../victoryscreen/VictoryScreen.kt | 18 ++--- .../{ => screens}/worldscreen/AlertPopup.kt | 22 +++---- .../worldscreen/BackgroundActor.kt | 2 +- .../worldscreen/NotificationsScroll.kt | 12 ++-- .../worldscreen/PlayerReadyScreen.kt | 10 ++- .../worldscreen/TechPolicyDiplomacyButtons.kt | 22 +++---- .../{ => screens}/worldscreen/TradePopup.kt | 18 ++--- .../worldscreen/WorldMapHolder.kt | 39 +++++------ .../{ => screens}/worldscreen/WorldScreen.kt | 66 +++++++++---------- .../worldscreen/WorldScreenTopBar.kt | 40 +++++------ .../worldscreen/ZoomButtonPair.kt | 10 +-- .../worldscreen/bottombar/BattleTable.kt | 26 ++++---- .../bottombar/BattleTableHelpers.kt | 4 +- .../worldscreen/bottombar/TileInfoTable.kt | 16 ++--- .../mainmenu/WorldScreenMenuPopup.kt | 22 +++---- .../minimap/MapOverlayToggleButton.kt | 6 +- .../worldscreen/minimap/Minimap.kt | 8 +-- .../worldscreen/minimap/MinimapHolder.kt | 6 +- .../worldscreen/minimap/MinimapTile.kt | 6 +- .../status/MultiplayerStatusButton.kt | 8 +-- .../status/MultiplayerStatusPopup.kt | 14 ++-- .../worldscreen/status/NextTurnButton.kt | 36 +++++----- .../worldscreen/status/StatusButtons.kt | 2 +- .../worldscreen/unit/IdleUnitButton.kt | 8 +-- .../worldscreen/unit/UnitTable.kt | 28 ++++---- .../worldscreen/unit/actions/UnitActions.kt | 16 ++--- .../unit/actions/UnitActionsGreatPerson.kt | 4 +- .../unit/actions/UnitActionsPillage.kt | 8 +-- .../unit/actions/UnitActionsReligion.kt | 4 +- .../unit/actions/UnitActionsTable.kt | 14 ++-- .../unit/actions/UnitActionsUpgrade.kt | 2 +- .../com/unciv/ui/tutorials/TutorialRender.kt | 37 ----------- .../com/unciv/app/desktop/DesktopLauncher.kt | 2 +- .../com/unciv/app/desktop/HardenGdxAudio.kt | 2 +- .../unciv/app/desktop/NativeFontDesktop.kt | 4 +- .../desktop/PlatformSpecificHelpersDesktop.kt | 2 +- .../src/com/unciv/dev/FasterUIDevelopment.kt | 12 ++-- .../com/unciv/uniques/GlobalUniquesTests.kt | 2 +- .../src/com/unciv/uniques/UnitUniquesTests.kt | 2 +- 269 files changed, 1660 insertions(+), 1651 deletions(-) rename core/src/com/unciv/ui/{utils => components}/AudioExceptionHelper.kt (85%) rename core/src/com/unciv/ui/{utils => components}/AutoScrollPane.kt (98%) rename core/src/com/unciv/ui/{utils => components}/BorderedTable.kt (98%) rename core/src/com/unciv/ui/{utils => components}/ExpanderTab.kt (97%) rename core/src/com/unciv/ui/{utils => components}/Fonts.kt (99%) rename core/src/com/unciv/ui/{utils => components}/GeneralPlatformSpecificHelpers.kt (98%) rename core/src/com/unciv/ui/{utils => components}/KeyCharAndCode.kt (99%) rename core/src/com/unciv/ui/{utils => components}/LanguageTable.kt (92%) rename core/src/com/unciv/ui/{utils => components}/MayaCalendar.kt (94%) rename core/src/com/unciv/ui/{utils => components}/TabbedPager.kt (98%) rename core/src/com/unciv/ui/{utils => components}/TextSimilarity.kt (99%) rename core/src/com/unciv/ui/{utils => components}/TextureArraySpriteBatch.java (99%) rename core/src/com/unciv/ui/{utils => components}/UncivSlider.kt (98%) rename core/src/com/unciv/ui/{utils => components}/UncivTextField.kt (93%) rename core/src/com/unciv/ui/{utils => components}/UncivTooltip.kt (99%) rename core/src/com/unciv/ui/{utils => components}/UnitGroup.kt (95%) rename core/src/com/unciv/ui/{utils => components}/WrappableLabel.kt (96%) rename core/src/com/unciv/ui/{utils => components}/ZoomGestureListener.kt (98%) rename core/src/com/unciv/ui/{utils => components}/ZoomableScrollPane.kt (99%) rename core/src/com/unciv/ui/{utils => components}/extensions/CollectionExtensions.kt (98%) rename core/src/com/unciv/ui/{utils => components}/extensions/FormattingExtensions.kt (98%) rename core/src/com/unciv/ui/{utils => components}/extensions/Scene2dExtensions.kt (98%) rename core/src/com/unciv/ui/{utils => components}/extensions/TimeExtensions.kt (84%) rename core/src/com/unciv/ui/{ => components}/tilegroups/CityButton.kt (96%) rename core/src/com/unciv/ui/{ => components}/tilegroups/CityTileGroup.kt (93%) rename core/src/com/unciv/ui/{ => components}/tilegroups/TileGroup.kt (88%) rename core/src/com/unciv/ui/{ => components}/tilegroups/TileGroupMap.kt (92%) rename core/src/com/unciv/ui/{ => components}/tilegroups/TileSetStrings.kt (99%) rename core/src/com/unciv/ui/{ => components}/tilegroups/WorldTileGroup.kt (89%) rename core/src/com/unciv/ui/{ => components}/tilegroups/YieldGroup.kt (93%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayer.kt (89%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerBorders.kt (98%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerCityButton.kt (90%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerFeatures.kt (96%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerMisc.kt (96%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerOverlay.kt (95%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerTerrain.kt (98%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerUnitArt.kt (96%) rename core/src/com/unciv/ui/{ => components}/tilegroups/layers/TileLayerUnitFlag.kt (94%) rename core/src/com/unciv/ui/{popup => popups}/AskNumberPopup.kt (94%) rename core/src/com/unciv/ui/{popup => popups}/AskTextPopup.kt (90%) rename core/src/com/unciv/ui/{popup => popups}/ConfirmPopup.kt (92%) rename core/src/com/unciv/ui/{popup => popups}/Popup.kt (94%) rename core/src/com/unciv/ui/{popup => popups}/ToastPopup.kt (91%) rename core/src/com/unciv/ui/{ => popups}/options/AboutTab.kt (83%) rename core/src/com/unciv/ui/{ => popups}/options/AdvancedTab.kt (93%) rename core/src/com/unciv/ui/{ => popups}/options/DebugTab.kt (92%) rename core/src/com/unciv/ui/{ => popups}/options/DisplayTab.kt (95%) rename core/src/com/unciv/ui/{ => popups}/options/GameplayTab.kt (94%) rename core/src/com/unciv/ui/{ => popups}/options/LanguageTab.kt (82%) rename core/src/com/unciv/ui/{ => popups}/options/ModCheckTab.kt (95%) rename core/src/com/unciv/ui/{ => popups}/options/MultiplayerTab.kt (93%) rename core/src/com/unciv/ui/{ => popups}/options/OptionsPopup.kt (94%) rename core/src/com/unciv/ui/{ => popups}/options/SoundTab.kt (93%) rename core/src/com/unciv/ui/{saves => savescreens}/Gzip.kt (97%) rename core/src/com/unciv/ui/{saves => savescreens}/LoadGameScreen.kt (94%) rename core/src/com/unciv/ui/{saves => savescreens}/LoadOrSaveScreen.kt (85%) rename core/src/com/unciv/ui/{saves => savescreens}/QuickSave.kt (95%) rename core/src/com/unciv/ui/{saves => savescreens}/SaveGameScreen.kt (87%) rename core/src/com/unciv/ui/{saves => savescreens}/VerticalFileListScrollPane.kt (96%) rename core/src/com/unciv/ui/{ => screens}/LanguagePickerScreen.kt (76%) rename core/src/com/unciv/ui/{ => screens}/LoadingScreen.kt (90%) rename core/src/com/unciv/ui/{utils => screens/basescreen}/BaseScreen.kt (94%) rename core/src/com/unciv/ui/{tutorials => screens/basescreen}/TutorialController.kt (70%) rename core/src/com/unciv/ui/{ => screens/basescreen}/UncivStage.kt (97%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CitizenManagementTable.kt (93%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityConstructionsTable.kt (96%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityMapHolder.kt (77%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityReligionInfoTable.kt (87%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityScreen.kt (95%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityScreenCityPickerTable.kt (93%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityScreenTileTable.kt (85%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/CityStatsTable.kt (95%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/ConstructionInfoTable.kt (91%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/DetailedStatsPopup.kt (94%) rename core/src/com/unciv/ui/{ => screens}/cityscreen/SpecialistAllocationTable.kt (91%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/CivilopediaCategories.kt (96%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/CivilopediaScreen.kt (96%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/FormattedLine.kt (98%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/ICivilopediaText.kt (99%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/MarkupRenderer.kt (93%) rename core/src/com/unciv/ui/{civilopedia => screens/civilopediascreen}/SimpleCivilopediaText.kt (91%) rename core/src/com/unciv/ui/{trade => screens/diplomacyscreen}/DiplomacyScreen.kt (97%) rename core/src/com/unciv/ui/{trade => screens/diplomacyscreen}/LeaderIntroTable.kt (93%) rename core/src/com/unciv/ui/{trade => screens/diplomacyscreen}/OfferColumnsTable.kt (95%) rename core/src/com/unciv/ui/{trade => screens/diplomacyscreen}/OffersListScroll.kt (94%) rename core/src/com/unciv/ui/{trade => screens/diplomacyscreen}/TradeTable.kt (91%) rename core/src/com/unciv/ui/{tutorials => screens/mainmenuscreen}/EasterEggRulesets.kt (98%) rename core/src/com/unciv/{ => ui/screens/mainmenuscreen}/MainMenuScreen.kt (87%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/EditorMapHolder.kt (94%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/MapEditorFilesTable.kt (92%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/MapEditorMainTabs.kt (74%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/MapEditorScreen.kt (93%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/MapEditorToolsDrawer.kt (96%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/MapGeneratorSteps.kt (98%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/TileInfoNormalizer.kt (98%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorEditSubTabs.kt (94%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorEditTab.kt (91%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorGenerateTab.kt (91%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorLoadTab.kt (90%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorModsTab.kt (88%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorOptionsTab.kt (81%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorSaveTab.kt (84%) rename core/src/com/unciv/ui/{mapeditor => screens/mapeditorscreen}/tabs/MapEditorViewTab.kt (91%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/AddFriendScreen.kt (87%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/AddMultiplayerGameScreen.kt (83%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/EditFriendScreen.kt (88%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/EditMultiplayerGameInfoScreen.kt (87%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/FriendPickerList.kt (86%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/GameList.kt (96%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/MultiplayerHelpers.kt (91%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/MultiplayerScreen.kt (93%) rename core/src/com/unciv/ui/{multiplayer => screens/multiplayerscreens}/ViewFriendsListScreen.kt (87%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/FriendTable.kt (91%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/GameOptionsTable.kt (96%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/IPreviousScreen.kt (66%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/MapOptionsTable.kt (95%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/MapParametersTable.kt (97%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/ModCheckboxTable.kt (94%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/MultiCheckboxTable.kt (86%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/NationTable.kt (93%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/NewGameScreen.kt (95%) rename core/src/com/unciv/ui/{ => screens}/newgamescreen/PlayerPickerTable.kt (98%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/CityOverviewTable.kt (92%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/EmpireOverviewCategories.kt (96%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/EmpireOverviewScreen.kt (91%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/EmpireOverviewTab.kt (92%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/EspionageOverviewScreen.kt (91%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/GlobalPoliticsOverviewTable.kt (96%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/NotificationsOverviewTable.kt (92%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/ReligionOverviewTable.kt (93%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/ResourcesOverviewTable.kt (94%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/StatsOverviewTable.kt (97%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/TradesOverviewTable.kt (94%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/UnitOverviewTable.kt (92%) rename core/src/com/unciv/ui/{ => screens}/overviewscreen/WonderOverviewTable.kt (97%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/CityRenamePopup.kt (76%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/DiplomaticVotePickerScreen.kt (77%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/DiplomaticVoteResultScreen.kt (90%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/GitHub.kt (98%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/GreatPersonPickerScreen.kt (84%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/ImprovementPickerScreen.kt (96%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/ModManagementOptions.kt (94%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/ModManagementScreen.kt (95%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/PantheonPickerScreen.kt (96%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/PickerPane.kt (90%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/PickerScreen.kt (88%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/PolicyPickerScreen.kt (95%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/PromotionPickerScreen.kt (96%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/ReligionPickerScreenCommon.kt (90%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/ReligiousBeliefsPickerScreen.kt (94%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/TechButton.kt (93%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/TechPickerScreen.kt (96%) rename core/src/com/unciv/ui/{ => screens}/pickerscreens/UnitRenamePopup.kt (81%) rename core/src/com/unciv/ui/{ => screens}/victoryscreen/RankingType.kt (94%) rename core/src/com/unciv/ui/{ => screens}/victoryscreen/VictoryScreen.kt (96%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/AlertPopup.kt (97%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/BackgroundActor.kt (98%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/NotificationsScroll.kt (95%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/PlayerReadyScreen.kt (75%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/TechPolicyDiplomacyButtons.kt (90%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/TradePopup.kt (90%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/WorldMapHolder.kt (97%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/WorldScreen.kt (95%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/WorldScreenTopBar.kt (93%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/ZoomButtonPair.kt (76%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/bottombar/BattleTable.kt (96%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/bottombar/BattleTableHelpers.kt (97%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/bottombar/TileInfoTable.kt (81%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/mainmenu/WorldScreenMenuPopup.kt (83%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/minimap/MapOverlayToggleButton.kt (92%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/minimap/Minimap.kt (97%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/minimap/MinimapHolder.kt (96%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/minimap/MinimapTile.kt (96%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/status/MultiplayerStatusButton.kt (97%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/status/MultiplayerStatusPopup.kt (79%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/status/NextTurnButton.kt (90%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/status/StatusButtons.kt (94%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/IdleUnitButton.kt (90%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/UnitTable.kt (95%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActions.kt (98%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActionsGreatPerson.kt (98%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActionsPillage.kt (96%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActionsReligion.kt (98%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActionsTable.kt (86%) rename core/src/com/unciv/ui/{ => screens}/worldscreen/unit/actions/UnitActionsUpgrade.kt (98%) delete mode 100644 core/src/com/unciv/ui/tutorials/TutorialRender.kt diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 6ae4c8641d..9cff9df28e 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -19,8 +19,8 @@ import com.unciv.models.ruleset.RulesetCache import com.unciv.models.skins.SkinCache import com.unciv.models.tilesets.TileSetCache import com.unciv.models.translations.Translations -import com.unciv.ui.LanguagePickerScreen -import com.unciv.ui.LoadingScreen +import com.unciv.ui.screens.LanguagePickerScreen +import com.unciv.ui.screens.LoadingScreen import com.unciv.ui.audio.GameSounds import com.unciv.ui.audio.MusicController import com.unciv.ui.audio.MusicMood @@ -29,13 +29,14 @@ import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.crashhandling.CrashScreen import com.unciv.ui.crashhandling.wrapCrashHandlingUnit import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.worldscreen.PlayerReadyScreen -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.Popup +import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.center +import com.unciv.ui.screens.worldscreen.PlayerReadyScreen +import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread @@ -200,7 +201,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { val isLoadingSameGame = worldScreen != null && prevGameInfo != null && prevGameInfo.gameId == newGameInfo.gameId val worldScreenRestoreState = if (isLoadingSameGame) worldScreen!!.getRestoreState() else null - lateinit var loadingScreen:LoadingScreen + lateinit var loadingScreen: LoadingScreen withGLContext { // this is not merged with the below GL context block so that our loading screen gets a chance to show - otherwise @@ -330,7 +331,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { /** Resets the game to the stored world screen and automatically [disposes][Screen.dispose] all other screens. */ fun resetToWorldScreen(): WorldScreen { - for (screen in screenStack.filter { it !is WorldScreen}) screen.dispose() + for (screen in screenStack.filter { it !is WorldScreen }) screen.dispose() screenStack.removeAll { it !is WorldScreen } val worldScreen= screenStack.last() as WorldScreen diff --git a/core/src/com/unciv/UncivGameParameters.kt b/core/src/com/unciv/UncivGameParameters.kt index db9e96ddce..0950e9c7a4 100644 --- a/core/src/com/unciv/UncivGameParameters.kt +++ b/core/src/com/unciv/UncivGameParameters.kt @@ -2,9 +2,9 @@ package com.unciv import com.unciv.logic.files.CustomFileLocationHelper import com.unciv.ui.crashhandling.CrashReportSysInfo -import com.unciv.ui.utils.AudioExceptionHelper -import com.unciv.ui.utils.GeneralPlatformSpecificHelpers -import com.unciv.ui.utils.NativeFontImplementation +import com.unciv.ui.components.AudioExceptionHelper +import com.unciv.ui.components.GeneralPlatformSpecificHelpers +import com.unciv.ui.components.NativeFontImplementation class UncivGameParameters(val crashReportSysInfo: CrashReportSysInfo? = null, val cancelDiscordEvent: (() -> Unit)? = null, diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index e783932f65..e1222f87fd 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -17,7 +17,7 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats -import com.unciv.ui.victoryscreen.RankingType +import com.unciv.ui.screens.victoryscreen.RankingType object Automation { diff --git a/core/src/com/unciv/logic/automation/ai/TacticalAI.kt b/core/src/com/unciv/logic/automation/ai/TacticalAI.kt index 64b2d996e7..98878ba6d3 100644 --- a/core/src/com/unciv/logic/automation/ai/TacticalAI.kt +++ b/core/src/com/unciv/logic/automation/ai/TacticalAI.kt @@ -6,7 +6,7 @@ import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.toGroup +import com.unciv.ui.components.extensions.toGroup import com.unciv.utils.Log class TacticalAI : IsPartOfGameInfoSerialization { diff --git a/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt b/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt index ecaa25a9c6..accbf6e8c1 100644 --- a/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt +++ b/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt @@ -8,7 +8,7 @@ import com.unciv.logic.civilization.NotificationIcon import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.TileMap import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.randomWeighted +import com.unciv.ui.components.extensions.randomWeighted import java.util.* import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt index 47d7f6b9b0..f945b636e8 100644 --- a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt @@ -44,7 +44,7 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.translations.tr -import com.unciv.ui.victoryscreen.RankingType +import com.unciv.ui.screens.victoryscreen.RankingType import kotlin.math.min object NextTurnAutomation { diff --git a/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt index 7d2f7963dc..d9d3aa00b0 100644 --- a/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt @@ -16,8 +16,8 @@ import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat -import com.unciv.ui.worldscreen.unit.actions.UnitActions -import com.unciv.ui.worldscreen.unit.actions.UnitActionsReligion +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsReligion import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt index 8ec53f9171..6e3666ad07 100644 --- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt @@ -15,9 +15,9 @@ import com.unciv.logic.civilization.managers.ReligionState import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.worldscreen.unit.actions.UnitActions -import com.unciv.ui.worldscreen.unit.actions.UnitActionsPillage -import com.unciv.ui.worldscreen.unit.actions.UnitActionsUpgrade +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsPillage +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade object UnitAutomation { diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt index 6b746789ec..df51220aa8 100644 --- a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt @@ -18,7 +18,7 @@ import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions import com.unciv.utils.Log import com.unciv.utils.debug diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 23a7fc3ea3..2fd50e8342 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -26,7 +26,7 @@ import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import com.unciv.utils.debug import java.util.* import kotlin.math.max diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index a45712741d..3333da0ac4 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -7,7 +7,7 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import java.util.* import kotlin.collections.set import kotlin.math.max diff --git a/core/src/com/unciv/logic/battle/CityCombatant.kt b/core/src/com/unciv/logic/battle/CityCombatant.kt index ff3bfd084d..cc7706eaa3 100644 --- a/core/src/com/unciv/logic/battle/CityCombatant.kt +++ b/core/src/com/unciv/logic/battle/CityCombatant.kt @@ -7,7 +7,7 @@ import com.unciv.models.UncivSound import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.UnitType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 488b4885a9..fd3c3899e6 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -21,12 +21,12 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.withItem -import com.unciv.ui.utils.extensions.withoutItem -import com.unciv.ui.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.withItem +import com.unciv.ui.components.extensions.withoutItem +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions import kotlin.math.ceil import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 9e78176975..5975bf9686 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -16,7 +16,7 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.StatMap import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.min diff --git a/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt b/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt index 1df09970ef..ecd3b3d17f 100644 --- a/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt @@ -10,9 +10,9 @@ import com.unciv.logic.civilization.NotificationIcon import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.LocalUniqueCache import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.utils.extensions.withItem -import com.unciv.ui.utils.extensions.withoutItem +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.components.extensions.withItem +import com.unciv.ui.components.extensions.withoutItem import kotlin.math.max import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt index def0efa59f..02a2c4c1fc 100644 --- a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt @@ -10,9 +10,9 @@ import com.unciv.logic.map.tile.Tile import com.unciv.models.Counter import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.utils.extensions.withItem -import com.unciv.ui.utils.extensions.withoutItem +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.components.extensions.withItem +import com.unciv.ui.components.extensions.withoutItem import kotlin.math.ceil import kotlin.math.floor import kotlin.math.pow diff --git a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt index f73a79b363..2d01ffba37 100644 --- a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt @@ -9,7 +9,7 @@ import com.unciv.models.Counter import com.unciv.models.Religion import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent class CityReligionManager : IsPartOfGameInfoSerialization { @Transient diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt index d0ff05c063..7084748f45 100644 --- a/core/src/com/unciv/logic/civilization/Civilization.kt +++ b/core/src/com/unciv/logic/civilization/Civilization.kt @@ -50,8 +50,8 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.victoryscreen.RankingType +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.screens.victoryscreen.RankingType import java.util.* import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/civilization/Notification.kt b/core/src/com/unciv/logic/civilization/Notification.kt index 909f49f504..d43c9774f2 100644 --- a/core/src/com/unciv/logic/civilization/Notification.kt +++ b/core/src/com/unciv/logic/civilization/Notification.kt @@ -5,12 +5,12 @@ import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.models.ruleset.Ruleset -import com.unciv.ui.cityscreen.CityScreen +import com.unciv.ui.screens.cityscreen.CityScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.TechPickerScreen -import com.unciv.ui.trade.DiplomacyScreen -import com.unciv.ui.utils.MayaCalendar -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.pickerscreens.TechPickerScreen +import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen +import com.unciv.ui.components.MayaCalendar +import com.unciv.ui.screens.worldscreen.WorldScreen object NotificationIcon { // Remember: The typical white-on-transparency icon will not be visible on Notifications diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt index c8d2abfe75..9f56ade8eb 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt @@ -21,7 +21,7 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat -import com.unciv.ui.victoryscreen.RankingType +import com.unciv.ui.screens.victoryscreen.RankingType import java.util.* import kotlin.math.min import kotlin.math.pow diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 0cde2ac7a1..71fff776b5 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -15,7 +15,7 @@ import com.unciv.logic.trade.TradeType import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.ceil import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt b/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt index 65dbf9dbe1..7be640dd30 100644 --- a/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt @@ -7,7 +7,7 @@ import com.unciv.logic.civilization.NotificationCategory import com.unciv.logic.civilization.PopupAlert import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent class GoldenAgeManager : IsPartOfGameInfoSerialization { @Transient diff --git a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt index 3bc8ac7bdd..2cfc7a3675 100644 --- a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt @@ -12,7 +12,7 @@ import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/civilization/managers/QuestManager.kt b/core/src/com/unciv/logic/civilization/managers/QuestManager.kt index d269b09375..a61fb4cfae 100644 --- a/core/src/com/unciv/logic/civilization/managers/QuestManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/QuestManager.kt @@ -26,8 +26,8 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.tr -import com.unciv.ui.utils.extensions.randomWeighted -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.randomWeighted +import com.unciv.ui.components.extensions.toPercent import kotlin.math.max import kotlin.random.Random diff --git a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt index ea5139bfe5..bc8f258081 100644 --- a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt @@ -11,7 +11,7 @@ import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import java.lang.Integer.max import java.lang.Integer.min import kotlin.random.Random diff --git a/core/src/com/unciv/logic/civilization/managers/TechManager.kt b/core/src/com/unciv/logic/civilization/managers/TechManager.kt index ac4739d1cb..36490536d0 100644 --- a/core/src/com/unciv/logic/civilization/managers/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/TechManager.kt @@ -20,9 +20,9 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit -import com.unciv.ui.utils.MayaCalendar -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.utils.extensions.withItem +import com.unciv.ui.components.MayaCalendar +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.components.extensions.withItem import java.util.* import kotlin.math.ceil import kotlin.math.max diff --git a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt index b0758aa631..9243e44490 100644 --- a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt @@ -17,7 +17,7 @@ import com.unciv.logic.trade.TradeEvaluation import com.unciv.models.ruleset.ModOptionsConstants import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.endTurn -import com.unciv.ui.utils.MayaCalendar +import com.unciv.ui.components.MayaCalendar import java.util.* import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/civilization/transients/CivInfoStatsForNextTurn.kt b/core/src/com/unciv/logic/civilization/transients/CivInfoStatsForNextTurn.kt index 498112e27e..b9260f0cbe 100644 --- a/core/src/com/unciv/logic/civilization/transients/CivInfoStatsForNextTurn.kt +++ b/core/src/com/unciv/logic/civilization/transients/CivInfoStatsForNextTurn.kt @@ -13,7 +13,7 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.StatMap import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.max import kotlin.math.min import kotlin.math.pow diff --git a/core/src/com/unciv/logic/files/MapSaver.kt b/core/src/com/unciv/logic/files/MapSaver.kt index f0e513b745..8d4be6efa1 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.saves.Gzip +import com.unciv.ui.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 4a3aeb0256..32e14409b7 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.saves.Gzip +import com.unciv.ui.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/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt index da175c6219..fa6e4a52d4 100644 --- a/core/src/com/unciv/logic/map/TileMap.kt +++ b/core/src/com/unciv/logic/map/TileMap.kt @@ -16,7 +16,7 @@ import com.unciv.models.ruleset.unique.UniqueType import java.lang.Integer.max import kotlin.math.abs -/** An Unciv map with all properties as produced by the [map editor][com.unciv.ui.mapeditor.MapEditorScreen] +/** An Unciv map with all properties as produced by the [map editor][com.unciv.ui.screens.mapeditorscreen.MapEditorScreen] * or [MapGenerator][com.unciv.logic.map.mapgenerator.MapGenerator]; or as part of a running [game][GameInfo]. * * Note: Will be Serialized -> Take special care with lateinit and lazy! diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt index 7512663453..beba03bdb5 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt @@ -17,8 +17,8 @@ import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TerrainType import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.mapeditor.MapGeneratorSteps -import com.unciv.ui.mapeditor.TileInfoNormalizer +import com.unciv.ui.screens.mapeditorscreen.MapGeneratorSteps +import com.unciv.ui.screens.mapeditorscreen.TileInfoNormalizer import com.unciv.utils.Log import com.unciv.utils.debug import kotlin.math.abs diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt b/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt index 950cba0d6f..3e9dea4775 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt @@ -20,7 +20,7 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.translations.equalsPlaceholderText import com.unciv.models.translations.getPlaceholderParameters -import com.unciv.ui.utils.extensions.randomWeighted +import com.unciv.ui.components.extensions.randomWeighted import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index 8edd0ebe78..7c75f28d96 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -23,7 +23,7 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.UnitType import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.filterAndLogic +import com.unciv.ui.components.extensions.filterAndLogic import java.text.DecimalFormat import kotlin.math.pow diff --git a/core/src/com/unciv/logic/map/mapunit/UnitUpgradeManager.kt b/core/src/com/unciv/logic/map/mapunit/UnitUpgradeManager.kt index 8a75d97da8..12dfa0d781 100644 --- a/core/src/com/unciv/logic/map/mapunit/UnitUpgradeManager.kt +++ b/core/src/com/unciv/logic/map/mapunit/UnitUpgradeManager.kt @@ -4,7 +4,7 @@ import com.unciv.logic.city.RejectionReasonType import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow class UnitUpgradeManager(val unit:MapUnit) { diff --git a/core/src/com/unciv/logic/map/tile/TileDescription.kt b/core/src/com/unciv/logic/map/tile/TileDescription.kt index 34a3d01750..7ec694d5c7 100644 --- a/core/src/com/unciv/logic/map/tile/TileDescription.kt +++ b/core/src/com/unciv/logic/map/tile/TileDescription.kt @@ -5,8 +5,8 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts object TileDescription { diff --git a/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt index 99e534da39..a554d4634e 100644 --- a/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileInfoImprovementFunctions.kt @@ -1,15 +1,10 @@ package com.unciv.logic.map.tile import com.unciv.Constants -import com.unciv.logic.city.City import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.tile.TileImprovement -import com.unciv.models.ruleset.unique.LocalUniqueCache import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.models.stats.Stat -import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.toPercent enum class ImprovementBuildingProblem { diff --git a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt index 6a619452c3..f9788cf652 100644 --- a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt @@ -9,7 +9,7 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent class TileStatFunctions(val tile: Tile) { diff --git a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt index 00a1d2bc67..cece2e67cc 100644 --- a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt +++ b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt @@ -11,7 +11,7 @@ import com.unciv.logic.event.EventBus import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached import com.unciv.logic.multiplayer.storage.MultiplayerFileNotFoundException import com.unciv.logic.multiplayer.storage.OnlineMultiplayerFiles -import com.unciv.ui.utils.extensions.isLargerThan +import com.unciv.ui.components.extensions.isLargerThan import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.Dispatcher import com.unciv.utils.concurrency.launchOnThreadPool diff --git a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerGame.kt b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerGame.kt index abbc7aff86..9ae0f0497b 100644 --- a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerGame.kt +++ b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerGame.kt @@ -9,12 +9,11 @@ import com.unciv.logic.multiplayer.GameUpdateResult.Type.FAILURE import com.unciv.logic.multiplayer.GameUpdateResult.Type.UNCHANGED import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached import com.unciv.logic.multiplayer.storage.OnlineMultiplayerFiles -import com.unciv.ui.utils.extensions.isLargerThan +import com.unciv.ui.components.extensions.isLargerThan import com.unciv.utils.concurrency.launchOnGLThread import com.unciv.utils.concurrency.withGLContext import com.unciv.utils.debug import kotlinx.coroutines.coroutineScope -import java.io.FileNotFoundException import java.time.Duration import java.time.Instant import java.util.concurrent.atomic.AtomicReference diff --git a/core/src/com/unciv/logic/multiplayer/storage/DropBox.kt b/core/src/com/unciv/logic/multiplayer/storage/DropBox.kt index 7f64202438..ed80a39069 100644 --- a/core/src/com/unciv/logic/multiplayer/storage/DropBox.kt +++ b/core/src/com/unciv/logic/multiplayer/storage/DropBox.kt @@ -1,12 +1,11 @@ package com.unciv.logic.multiplayer.storage import com.unciv.json.json -import com.unciv.ui.utils.extensions.UncivDateFormat.parseDate +import com.unciv.ui.components.extensions.UncivDateFormat.parseDate import com.unciv.utils.Log import com.unciv.utils.debug import java.io.BufferedReader import java.io.DataOutputStream -import java.io.FileNotFoundException import java.io.InputStream import java.io.InputStreamReader import java.net.HttpURLConnection diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt index dac6d7a8f1..b959e6323d 100644 --- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt +++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt @@ -10,8 +10,8 @@ import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.ModOptionsConstants import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.victoryscreen.RankingType +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.screens.victoryscreen.RankingType import kotlin.math.min import kotlin.math.sqrt diff --git a/core/src/com/unciv/logic/trade/TradeOffer.kt b/core/src/com/unciv/logic/trade/TradeOffer.kt index 6a97ceef20..fac1ea2f81 100644 --- a/core/src/com/unciv/logic/trade/TradeOffer.kt +++ b/core/src/com/unciv/logic/trade/TradeOffer.kt @@ -6,7 +6,7 @@ import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.logic.trade.TradeType.TradeTypeNumberType import com.unciv.models.ruleset.Speed import com.unciv.models.translations.tr -import com.unciv.ui.utils.Fonts +import com.unciv.ui.components.Fonts data class TradeOffer(val name: String, val type: TradeType, var amount: Int = 1, var duration: Int) : IsPartOfGameInfoSerialization { diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt index cc9d4690b3..460a9925c5 100644 --- a/core/src/com/unciv/models/UnitAction.kt +++ b/core/src/com/unciv/models/UnitAction.kt @@ -5,7 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor import com.unciv.Constants import com.unciv.models.translations.getPlaceholderParameters import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.KeyCharAndCode +import com.unciv.ui.components.KeyCharAndCode /** Unit Actions - class - carries dynamic data and actual execution. diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt index 727c29a139..134eeb97ba 100644 --- a/core/src/com/unciv/models/metadata/GameSettings.kt +++ b/core/src/com/unciv/models/metadata/GameSettings.kt @@ -6,7 +6,7 @@ import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.multiplayer.FriendList import com.unciv.models.UncivSound -import com.unciv.ui.utils.Fonts +import com.unciv.ui.components.Fonts import java.text.Collator import java.time.Duration import java.util.* diff --git a/core/src/com/unciv/models/ruleset/Belief.kt b/core/src/com/unciv/models/ruleset/Belief.kt index a8220d09e7..fae0d1dd6f 100644 --- a/core/src/com/unciv/models/ruleset/Belief.kt +++ b/core/src/com/unciv/models/ruleset/Belief.kt @@ -5,8 +5,8 @@ import com.unciv.UncivGame import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen.Companion.showReligionInCivilopedia -import com.unciv.ui.civilopedia.FormattedLine +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen.Companion.showReligionInCivilopedia +import com.unciv.ui.screens.civilopediascreen.FormattedLine import kotlin.collections.ArrayList class Belief() : RulesetObject() { diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index cb8323f385..87228f0734 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -21,11 +21,11 @@ import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.getConsumesAmountString -import com.unciv.ui.utils.extensions.getNeedMoreAmountString -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.getConsumesAmountString +import com.unciv.ui.components.extensions.getNeedMoreAmountString +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow diff --git a/core/src/com/unciv/models/ruleset/IConstruction.kt b/core/src/com/unciv/models/ruleset/IConstruction.kt index ec41e109fe..25dd80040b 100644 --- a/core/src/com/unciv/models/ruleset/IConstruction.kt +++ b/core/src/com/unciv/models/ruleset/IConstruction.kt @@ -6,8 +6,8 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.INamed import com.unciv.models.stats.Stat -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/models/ruleset/Policy.kt b/core/src/com/unciv/models/ruleset/Policy.kt index c497167469..9c5d74c814 100644 --- a/core/src/com/unciv/models/ruleset/Policy.kt +++ b/core/src/com/unciv/models/ruleset/Policy.kt @@ -1,13 +1,11 @@ package com.unciv.models.ruleset -import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.getPlaceholderText import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.utils.Log +import com.unciv.ui.screens.civilopediascreen.FormattedLine open class Policy : RulesetObject() { lateinit var branch: PolicyBranch // not in json - added in gameBasics diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt index df81978345..5a79d6c781 100644 --- a/core/src/com/unciv/models/ruleset/Ruleset.kt +++ b/core/src/com/unciv/models/ruleset/Ruleset.kt @@ -30,8 +30,8 @@ import com.unciv.models.ruleset.unit.UnitType import com.unciv.models.stats.INamed import com.unciv.models.stats.NamedStats import com.unciv.models.translations.tr -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.getRelativeTextDistance +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/RulesetObject.kt b/core/src/com/unciv/models/ruleset/RulesetObject.kt index 735c32e2b5..fa25fd542f 100644 --- a/core/src/com/unciv/models/ruleset/RulesetObject.kt +++ b/core/src/com/unciv/models/ruleset/RulesetObject.kt @@ -5,8 +5,8 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.stats.INamed import com.unciv.models.stats.NamedStats -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.ICivilopediaText +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.ICivilopediaText interface IRulesetObject: INamed, IHasUniques, ICivilopediaText diff --git a/core/src/com/unciv/models/ruleset/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/RulesetValidator.kt index f37bf282a1..c215f9d974 100644 --- a/core/src/com/unciv/models/ruleset/RulesetValidator.kt +++ b/core/src/com/unciv/models/ruleset/RulesetValidator.kt @@ -13,7 +13,7 @@ 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.utils.getRelativeTextDistance +import com.unciv.ui.components.getRelativeTextDistance class RulesetValidator(val ruleset: Ruleset) { diff --git a/core/src/com/unciv/models/ruleset/Speed.kt b/core/src/com/unciv/models/ruleset/Speed.kt index e797e17ec5..3ff231b4b0 100644 --- a/core/src/com/unciv/models/ruleset/Speed.kt +++ b/core/src/com/unciv/models/ruleset/Speed.kt @@ -4,8 +4,8 @@ import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.stats.Stat import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts import kotlin.math.abs class Speed : RulesetObject(), IsPartOfGameInfoSerialization { diff --git a/core/src/com/unciv/models/ruleset/Victory.kt b/core/src/com/unciv/models/ruleset/Victory.kt index 0becc4e376..8a007bc711 100644 --- a/core/src/com/unciv/models/ruleset/Victory.kt +++ b/core/src/com/unciv/models/ruleset/Victory.kt @@ -8,7 +8,7 @@ import com.unciv.models.Counter import com.unciv.models.stats.INamed import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.getPlaceholderText -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.extensions.toTextButton enum class MilestoneType(val text: String) { diff --git a/core/src/com/unciv/models/ruleset/nation/CityStateType.kt b/core/src/com/unciv/models/ruleset/nation/CityStateType.kt index 25bca2043f..0d2620708f 100644 --- a/core/src/com/unciv/models/ruleset/nation/CityStateType.kt +++ b/core/src/com/unciv/models/ruleset/nation/CityStateType.kt @@ -4,7 +4,7 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.stats.INamed -import com.unciv.ui.utils.extensions.colorFromRGB +import com.unciv.ui.components.extensions.colorFromRGB class CityStateType: INamed { override var name = "" diff --git a/core/src/com/unciv/models/ruleset/nation/Difficulty.kt b/core/src/com/unciv/models/ruleset/nation/Difficulty.kt index 77bedcb085..564c8a175e 100644 --- a/core/src/com/unciv/models/ruleset/nation/Difficulty.kt +++ b/core/src/com/unciv/models/ruleset/nation/Difficulty.kt @@ -3,9 +3,9 @@ package com.unciv.models.ruleset.nation import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.ICivilopediaText -import com.unciv.ui.utils.Fonts +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.ICivilopediaText +import com.unciv.ui.components.Fonts class Difficulty: INamed, ICivilopediaText { override lateinit var name: String diff --git a/core/src/com/unciv/models/ruleset/nation/Nation.kt b/core/src/com/unciv/models/ruleset/nation/Nation.kt index 04b3795cb4..4ed10a3634 100644 --- a/core/src/com/unciv/models/ruleset/nation/Nation.kt +++ b/core/src/com/unciv/models/ruleset/nation/Nation.kt @@ -9,10 +9,10 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.squareBraceRegex import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen.Companion.showReligionInCivilopedia -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.colorFromRGB +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen.Companion.showReligionInCivilopedia +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.colorFromRGB import kotlin.math.pow class Nation : RulesetObject() { @@ -249,15 +249,19 @@ import kotlin.math.pow yield(FormattedLine(unique.text.tr(), indent = 1)) } for (unique in originalUnit.uniqueObjects.filterNot { it.text in unit.uniques || it.hasFlag(UniqueFlag.HiddenToUsers) }) { - yield(FormattedLine("Lost ability".tr() + " (" + "vs [${originalUnit.name}]".tr() + "): " + - unique.text.tr(), indent = 1)) + yield( + FormattedLine("Lost ability".tr() + " (" + "vs [${originalUnit.name}]".tr() + "): " + + unique.text.tr(), indent = 1) + ) } for (promotion in unit.promotions.filter { it !in originalUnit.promotions }) { val effect = ruleset.unitPromotions[promotion]!!.uniques // "{$promotion} ({$effect})" won't work as effect may contain [] and tr() does not support that kind of nesting - yield(FormattedLine( + yield( + FormattedLine( "${promotion.tr()} (${effect.joinToString(",") { it.tr() }})", - link = "Promotion/$promotion", indent = 1 )) + link = "Promotion/$promotion", indent = 1 ) + ) } } else if (unit.replaces != null) { yield(FormattedLine("Replaces [${unit.replaces}], which is not found in the ruleset!", indent = 1)) @@ -279,8 +283,10 @@ import kotlin.math.pow yield(FormattedLine(improvement.cloneStats().toString(), indent = 1)) // = (improvement as Stats).toString minus import plus copy overhead if (improvement.terrainsCanBeBuiltOn.isNotEmpty()) { improvement.terrainsCanBeBuiltOn.withIndex().forEach { - yield(FormattedLine(if (it.index == 0) "{Can be built on} {${it.value}}" else "or [${it.value}]", - link = "Terrain/${it.value}", indent = if (it.index == 0) 1 else 2)) + yield( + FormattedLine(if (it.index == 0) "{Can be built on} {${it.value}}" else "or [${it.value}]", + link = "Terrain/${it.value}", indent = if (it.index == 0) 1 else 2) + ) } } for (unique in improvement.uniques) diff --git a/core/src/com/unciv/models/ruleset/tech/Era.kt b/core/src/com/unciv/models/ruleset/tech/Era.kt index ccb2b5e76e..34b0a15f43 100644 --- a/core/src/com/unciv/models/ruleset/tech/Era.kt +++ b/core/src/com/unciv/models/ruleset/tech/Era.kt @@ -7,9 +7,9 @@ import com.unciv.models.ruleset.RulesetObject import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.colorFromRGB +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.colorFromRGB class Era : RulesetObject() { var eraNumber: Int = -1 diff --git a/core/src/com/unciv/models/ruleset/tech/Technology.kt b/core/src/com/unciv/models/ruleset/tech/Technology.kt index 1e15aa0411..b940b783fa 100644 --- a/core/src/com/unciv/models/ruleset/tech/Technology.kt +++ b/core/src/com/unciv/models/ruleset/tech/Technology.kt @@ -11,8 +11,8 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts class Technology: RulesetObject() { diff --git a/core/src/com/unciv/models/ruleset/tile/Terrain.kt b/core/src/com/unciv/models/ruleset/tile/Terrain.kt index af7a509d5e..e6bb9e8f47 100644 --- a/core/src/com/unciv/models/ruleset/tile/Terrain.kt +++ b/core/src/com/unciv/models/ruleset/tile/Terrain.kt @@ -8,8 +8,8 @@ import com.unciv.models.ruleset.RulesetStatsObject import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.extensions.colorFromRGB +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.extensions.colorFromRGB class Terrain : RulesetStatsObject() { diff --git a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt index fb00661f20..ef1f33a103 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt @@ -13,10 +13,10 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen.Companion.showReligionInCivilopedia -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.extensions.toPercent -import com.unciv.ui.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen.Companion.showReligionInCivilopedia +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.extensions.toPercent +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions import kotlin.math.roundToInt class TileImprovement : RulesetStatsObject() { diff --git a/core/src/com/unciv/models/ruleset/tile/TileResource.kt b/core/src/com/unciv/models/ruleset/tile/TileResource.kt index ddfd00b255..de38f5dbda 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileResource.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileResource.kt @@ -8,7 +8,7 @@ import com.unciv.models.ruleset.RulesetStatsObject import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stats -import com.unciv.ui.civilopedia.FormattedLine +import com.unciv.ui.screens.civilopediascreen.FormattedLine class TileResource : RulesetStatsObject() { diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 14d10c53d8..014991446f 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -9,7 +9,7 @@ import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.unique.UniqueParameterType.Companion.guessTypeForTranslationWriter import com.unciv.models.stats.Stat import com.unciv.models.translations.TranslationFileWriter -import com.unciv.ui.utils.extensions.filterCompositeLogic +import com.unciv.ui.components.extensions.filterCompositeLogic // 'region' names beginning with an underscore are used here for a prettier "Structure window" - they go in front ot the rest. diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index a8b4a1eec4..9dfa838853 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -19,8 +19,8 @@ import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.hasPlaceholderParameters -import com.unciv.ui.utils.MayaCalendar -import com.unciv.ui.worldscreen.unit.actions.UnitActionsUpgrade +import com.unciv.ui.components.MayaCalendar +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade import kotlin.math.roundToInt import kotlin.random.Random diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 9f8159dbdb..9dabecc72d 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -12,10 +12,10 @@ import com.unciv.models.ruleset.RulesetObject import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.extensions.filterAndLogic -import com.unciv.ui.utils.extensions.getNeedMoreAmountString -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.extensions.filterAndLogic +import com.unciv.ui.components.extensions.getNeedMoreAmountString +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow // This is BaseUnit because Unit is already a base Kotlin class and to avoid mixing the two up diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnitCost.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnitCost.kt index 7814226518..2b43c687f4 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnitCost.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnitCost.kt @@ -5,7 +5,7 @@ import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent class BaseUnitCost(val baseUnit: BaseUnit) { diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnitDescriptions.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnitDescriptions.kt index 56d2fa33f4..c54dfed8e4 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnitDescriptions.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnitDescriptions.kt @@ -6,10 +6,10 @@ import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.getConsumesAmountString -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.getConsumesAmountString +import com.unciv.ui.components.extensions.toPercent import kotlin.math.pow object BaseUnitDescriptions { diff --git a/core/src/com/unciv/models/ruleset/unit/Promotion.kt b/core/src/com/unciv/models/ruleset/unit/Promotion.kt index 98cdd3a7db..fe802f7dc7 100644 --- a/core/src/com/unciv/models/ruleset/unit/Promotion.kt +++ b/core/src/com/unciv/models/ruleset/unit/Promotion.kt @@ -6,7 +6,7 @@ import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine +import com.unciv.ui.screens.civilopediascreen.FormattedLine class Promotion : RulesetObject() { diff --git a/core/src/com/unciv/models/stats/Stat.kt b/core/src/com/unciv/models/stats/Stat.kt index 77d5055c86..c10d78b94d 100644 --- a/core/src/com/unciv/models/stats/Stat.kt +++ b/core/src/com/unciv/models/stats/Stat.kt @@ -3,8 +3,8 @@ package com.unciv.models.stats import com.badlogic.gdx.graphics.Color import com.unciv.logic.civilization.NotificationIcon import com.unciv.models.UncivSound -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.colorFromHex +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.colorFromHex enum class Stat( val notificationIcon: String, diff --git a/core/src/com/unciv/ui/utils/AudioExceptionHelper.kt b/core/src/com/unciv/ui/components/AudioExceptionHelper.kt similarity index 85% rename from core/src/com/unciv/ui/utils/AudioExceptionHelper.kt rename to core/src/com/unciv/ui/components/AudioExceptionHelper.kt index 6ff5ad1f43..0833291a33 100644 --- a/core/src/com/unciv/ui/utils/AudioExceptionHelper.kt +++ b/core/src/com/unciv/ui/components/AudioExceptionHelper.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.audio.Music diff --git a/core/src/com/unciv/ui/utils/AutoScrollPane.kt b/core/src/com/unciv/ui/components/AutoScrollPane.kt similarity index 98% rename from core/src/com/unciv/ui/utils/AutoScrollPane.kt rename to core/src/com/unciv/ui/components/AutoScrollPane.kt index d3699fd9b5..d23d081ec8 100644 --- a/core/src/com/unciv/ui/utils/AutoScrollPane.kt +++ b/core/src/com/unciv/ui/components/AutoScrollPane.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.InputEvent diff --git a/core/src/com/unciv/ui/utils/BorderedTable.kt b/core/src/com/unciv/ui/components/BorderedTable.kt similarity index 98% rename from core/src/com/unciv/ui/utils/BorderedTable.kt rename to core/src/com/unciv/ui/components/BorderedTable.kt index 7d923d02bf..873bf5baad 100644 --- a/core/src/com/unciv/ui/utils/BorderedTable.kt +++ b/core/src/com/unciv/ui/components/BorderedTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.Batch diff --git a/core/src/com/unciv/ui/utils/ExpanderTab.kt b/core/src/com/unciv/ui/components/ExpanderTab.kt similarity index 97% rename from core/src/com/unciv/ui/utils/ExpanderTab.kt rename to core/src/com/unciv/ui/components/ExpanderTab.kt index 196553339e..108c6b1a79 100644 --- a/core/src/com/unciv/ui/utils/ExpanderTab.kt +++ b/core/src/com/unciv/ui/components/ExpanderTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Interpolation @@ -10,8 +10,8 @@ import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.UncivGame import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel /** * A widget with a header that when clicked shows/hides a sub-Table. diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/components/Fonts.kt similarity index 99% rename from core/src/com/unciv/ui/utils/Fonts.kt rename to core/src/com/unciv/ui/components/Fonts.kt index c239dc0cdc..9d3b471c45 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/components/Fonts.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Pixmap diff --git a/core/src/com/unciv/ui/utils/GeneralPlatformSpecificHelpers.kt b/core/src/com/unciv/ui/components/GeneralPlatformSpecificHelpers.kt similarity index 98% rename from core/src/com/unciv/ui/utils/GeneralPlatformSpecificHelpers.kt rename to core/src/com/unciv/ui/components/GeneralPlatformSpecificHelpers.kt index 53b1a7bef8..a4270eab1e 100644 --- a/core/src/com/unciv/ui/utils/GeneralPlatformSpecificHelpers.kt +++ b/core/src/com/unciv/ui/components/GeneralPlatformSpecificHelpers.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.unciv.models.metadata.GameSettings diff --git a/core/src/com/unciv/ui/utils/KeyCharAndCode.kt b/core/src/com/unciv/ui/components/KeyCharAndCode.kt similarity index 99% rename from core/src/com/unciv/ui/utils/KeyCharAndCode.kt rename to core/src/com/unciv/ui/components/KeyCharAndCode.kt index 02c507e2cf..c20763f0f0 100644 --- a/core/src/com/unciv/ui/utils/KeyCharAndCode.kt +++ b/core/src/com/unciv/ui/components/KeyCharAndCode.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input diff --git a/core/src/com/unciv/ui/utils/LanguageTable.kt b/core/src/com/unciv/ui/components/LanguageTable.kt similarity index 92% rename from core/src/com/unciv/ui/utils/LanguageTable.kt rename to core/src/com/unciv/ui/components/LanguageTable.kt index 9446124dbd..662057cc7a 100644 --- a/core/src/com/unciv/ui/utils/LanguageTable.kt +++ b/core/src/com/unciv/ui/components/LanguageTable.kt @@ -1,17 +1,15 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants import com.unciv.UncivGame -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.utils.Log +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.toLabel import java.util.* -import kotlin.Comparator import kotlin.collections.ArrayList /** Represents a row in the Language picker, used both in OptionsPopup and in LanguagePickerScreen */ diff --git a/core/src/com/unciv/ui/utils/MayaCalendar.kt b/core/src/com/unciv/ui/components/MayaCalendar.kt similarity index 94% rename from core/src/com/unciv/ui/utils/MayaCalendar.kt rename to core/src/com/unciv/ui/components/MayaCalendar.kt index 653af3d8af..415c08d397 100644 --- a/core/src/com/unciv/ui/utils/MayaCalendar.kt +++ b/core/src/com/unciv/ui/components/MayaCalendar.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.unciv.Constants @@ -6,10 +6,10 @@ import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.KeyCharAndCode.Companion.makeChar -import com.unciv.ui.utils.KeyCharAndCode.Companion.toCode -import com.unciv.ui.utils.extensions.addSeparator +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.KeyCharAndCode.Companion.makeChar +import com.unciv.ui.components.KeyCharAndCode.Companion.toCode +import com.unciv.ui.components.extensions.addSeparator import kotlin.math.abs object MayaCalendar { diff --git a/core/src/com/unciv/ui/utils/TabbedPager.kt b/core/src/com/unciv/ui/components/TabbedPager.kt similarity index 98% rename from core/src/com/unciv/ui/utils/TabbedPager.kt rename to core/src/com/unciv/ui/components/TabbedPager.kt index 60ee972b35..3887bad8f6 100644 --- a/core/src/com/unciv/ui/utils/TabbedPager.kt +++ b/core/src/com/unciv/ui/components/TabbedPager.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -17,15 +17,15 @@ import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.UncivGame import com.unciv.ui.images.IconTextButton -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.packIfNeeded -import com.unciv.ui.utils.extensions.pad +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.packIfNeeded +import com.unciv.ui.components.extensions.pad //TODO If keys are assigned, the widget is in a popup not filling stage width, and a button is // partially visible on the right end, the key tooltip will show outside the parent. diff --git a/core/src/com/unciv/ui/utils/TextSimilarity.kt b/core/src/com/unciv/ui/components/TextSimilarity.kt similarity index 99% rename from core/src/com/unciv/ui/utils/TextSimilarity.kt rename to core/src/com/unciv/ui/components/TextSimilarity.kt index 6439baa804..acdf3b688b 100644 --- a/core/src/com/unciv/ui/utils/TextSimilarity.kt +++ b/core/src/com/unciv/ui/components/TextSimilarity.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components /** * Algorithm: diff --git a/core/src/com/unciv/ui/utils/TextureArraySpriteBatch.java b/core/src/com/unciv/ui/components/TextureArraySpriteBatch.java similarity index 99% rename from core/src/com/unciv/ui/utils/TextureArraySpriteBatch.java rename to core/src/com/unciv/ui/components/TextureArraySpriteBatch.java index 91524c06b3..c42c18495b 100644 --- a/core/src/com/unciv/ui/utils/TextureArraySpriteBatch.java +++ b/core/src/com/unciv/ui/components/TextureArraySpriteBatch.java @@ -1,4 +1,4 @@ -package com.unciv.ui.utils; +package com.unciv.ui.components; import java.nio.IntBuffer; import java.util.Arrays; @@ -20,7 +20,6 @@ import com.badlogic.gdx.math.Affine2; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.utils.BufferUtils; -import com.unciv.utils.Log; /** Draws batched quads using indices. *

diff --git a/core/src/com/unciv/ui/utils/UncivSlider.kt b/core/src/com/unciv/ui/components/UncivSlider.kt similarity index 98% rename from core/src/com/unciv/ui/utils/UncivSlider.kt rename to core/src/com/unciv/ui/components/UncivSlider.kt index b83b0ef6c0..1f3abcb916 100644 --- a/core/src/com/unciv/ui/utils/UncivSlider.kt +++ b/core/src/com/unciv/ui/components/UncivSlider.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input @@ -22,9 +22,9 @@ import com.unciv.Constants import com.unciv.models.UncivSound import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.IconCircleGroup -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel import kotlin.math.abs import kotlin.math.sign diff --git a/core/src/com/unciv/ui/utils/UncivTextField.kt b/core/src/com/unciv/ui/components/UncivTextField.kt similarity index 93% rename from core/src/com/unciv/ui/utils/UncivTextField.kt rename to core/src/com/unciv/ui/components/UncivTextField.kt index 912d05d7f0..2a3810b145 100644 --- a/core/src/com/unciv/ui/utils/UncivTextField.kt +++ b/core/src/com/unciv/ui/components/UncivTextField.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.scenes.scene2d.Actor @@ -7,12 +7,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.badlogic.gdx.scenes.scene2d.utils.FocusListener import com.unciv.UncivGame import com.unciv.models.translations.tr -import com.unciv.ui.UncivStage -import com.unciv.ui.utils.extensions.getAscendant -import com.unciv.ui.utils.extensions.getOverlap -import com.unciv.ui.utils.extensions.right -import com.unciv.ui.utils.extensions.stageBoundingBox -import com.unciv.ui.utils.extensions.top +import com.unciv.ui.screens.basescreen.UncivStage +import com.unciv.ui.components.extensions.getAscendant +import com.unciv.ui.components.extensions.getOverlap +import com.unciv.ui.components.extensions.right +import com.unciv.ui.components.extensions.stageBoundingBox +import com.unciv.ui.components.extensions.top object UncivTextField { /** diff --git a/core/src/com/unciv/ui/utils/UncivTooltip.kt b/core/src/com/unciv/ui/components/UncivTooltip.kt similarity index 99% rename from core/src/com/unciv/ui/utils/UncivTooltip.kt rename to core/src/com/unciv/ui/components/UncivTooltip.kt index a2ddbca80c..d8e75cc0da 100644 --- a/core/src/com/unciv/ui/utils/UncivTooltip.kt +++ b/core/src/com/unciv/ui/components/UncivTooltip.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Interpolation @@ -15,7 +15,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Tooltip import com.badlogic.gdx.utils.Align import com.unciv.models.translations.tr -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.toLabel /** * A **Replacement** for Gdx [Tooltip], placement does not follow the mouse. diff --git a/core/src/com/unciv/ui/utils/UnitGroup.kt b/core/src/com/unciv/ui/components/UnitGroup.kt similarity index 95% rename from core/src/com/unciv/ui/utils/UnitGroup.kt rename to core/src/com/unciv/ui/components/UnitGroup.kt index 9bc56bfe49..b2275d4600 100644 --- a/core/src/com/unciv/ui/utils/UnitGroup.kt +++ b/core/src/com/unciv/ui/components/UnitGroup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.Batch @@ -11,12 +11,12 @@ import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.map.mapunit.MapUnit import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.addToCenter -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.setSize -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.surroundWithThinCircle +import com.unciv.ui.components.extensions.addToCenter +import com.unciv.ui.components.extensions.centerX +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.setSize +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.surroundWithThinCircle class FlagBackground(drawable: TextureRegionDrawable, size: Float): Image(drawable) { diff --git a/core/src/com/unciv/ui/utils/WrappableLabel.kt b/core/src/com/unciv/ui/components/WrappableLabel.kt similarity index 96% rename from core/src/com/unciv/ui/utils/WrappableLabel.kt rename to core/src/com/unciv/ui/components/WrappableLabel.kt index 46c371c1c1..ac0522d59a 100644 --- a/core/src/com/unciv/ui/utils/WrappableLabel.kt +++ b/core/src/com/unciv/ui/components/WrappableLabel.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Label @@ -40,7 +40,7 @@ class WrappableLabel( private fun getMeasuredWidth(): Float = if (wrap) _measuredWidth else super.getPrefWidth() - override fun getMinWidth() = 48f // ~ 2 chars + override fun getMinWidth() = 48f // ~ 2 chars override fun getPrefWidth() = minOf(getMeasuredWidth(), expectedWidth, optimizedWidth) override fun getMaxWidth() = getMeasuredWidth() diff --git a/core/src/com/unciv/ui/utils/ZoomGestureListener.kt b/core/src/com/unciv/ui/components/ZoomGestureListener.kt similarity index 98% rename from core/src/com/unciv/ui/utils/ZoomGestureListener.kt rename to core/src/com/unciv/ui/components/ZoomGestureListener.kt index 0b37e24b6c..ae0faadb32 100644 --- a/core/src/com/unciv/ui/utils/ZoomGestureListener.kt +++ b/core/src/com/unciv/ui/components/ZoomGestureListener.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.input.GestureDetector import com.badlogic.gdx.math.Vector2 diff --git a/core/src/com/unciv/ui/utils/ZoomableScrollPane.kt b/core/src/com/unciv/ui/components/ZoomableScrollPane.kt similarity index 99% rename from core/src/com/unciv/ui/utils/ZoomableScrollPane.kt rename to core/src/com/unciv/ui/components/ZoomableScrollPane.kt index 2203134b91..c016078fb3 100644 --- a/core/src/com/unciv/ui/utils/ZoomableScrollPane.kt +++ b/core/src/com/unciv/ui/components/ZoomableScrollPane.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.g2d.Batch diff --git a/core/src/com/unciv/ui/utils/extensions/CollectionExtensions.kt b/core/src/com/unciv/ui/components/extensions/CollectionExtensions.kt similarity index 98% rename from core/src/com/unciv/ui/utils/extensions/CollectionExtensions.kt rename to core/src/com/unciv/ui/components/extensions/CollectionExtensions.kt index 92f6f21c3a..b56ff70d19 100644 --- a/core/src/com/unciv/ui/utils/extensions/CollectionExtensions.kt +++ b/core/src/com/unciv/ui/components/extensions/CollectionExtensions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils.extensions +package com.unciv.ui.components.extensions import com.badlogic.gdx.utils.Array import kotlin.random.Random diff --git a/core/src/com/unciv/ui/utils/extensions/FormattingExtensions.kt b/core/src/com/unciv/ui/components/extensions/FormattingExtensions.kt similarity index 98% rename from core/src/com/unciv/ui/utils/extensions/FormattingExtensions.kt rename to core/src/com/unciv/ui/components/extensions/FormattingExtensions.kt index e664ed6964..c390fb08dc 100644 --- a/core/src/com/unciv/ui/utils/extensions/FormattingExtensions.kt +++ b/core/src/com/unciv/ui/components/extensions/FormattingExtensions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils.extensions +package com.unciv.ui.components.extensions import com.unciv.models.translations.tr import java.text.SimpleDateFormat diff --git a/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt b/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt similarity index 98% rename from core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt rename to core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt index a0b53dc21c..7cbd24fe3b 100644 --- a/core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt +++ b/core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils.extensions +package com.unciv.ui.components.extensions import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input @@ -29,13 +29,13 @@ import com.unciv.Constants import com.unciv.models.UncivSound import com.unciv.models.translations.tr import com.unciv.ui.audio.SoundPlayer +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.KeyShortcut +import com.unciv.ui.components.KeyShortcutDispatcher import com.unciv.ui.images.IconCircleGroup import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.KeyShortcut -import com.unciv.ui.utils.KeyShortcutDispatcher import com.unciv.utils.concurrency.Concurrency /** diff --git a/core/src/com/unciv/ui/utils/extensions/TimeExtensions.kt b/core/src/com/unciv/ui/components/extensions/TimeExtensions.kt similarity index 84% rename from core/src/com/unciv/ui/utils/extensions/TimeExtensions.kt rename to core/src/com/unciv/ui/components/extensions/TimeExtensions.kt index 521a5f9a50..8348c2bbb0 100644 --- a/core/src/com/unciv/ui/utils/extensions/TimeExtensions.kt +++ b/core/src/com/unciv/ui/components/extensions/TimeExtensions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils.extensions +package com.unciv.ui.components.extensions import java.time.Duration import java.time.Instant diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/components/tilegroups/CityButton.kt similarity index 96% rename from core/src/com/unciv/ui/tilegroups/CityButton.kt rename to core/src/com/unciv/ui/components/tilegroups/CityButton.kt index 71ff674009..59ef0da6ab 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/components/tilegroups/CityButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.Batch @@ -17,22 +17,22 @@ import com.unciv.logic.city.PerpetualConstruction import com.unciv.logic.civilization.diplomacy.RelationshipLevel import com.unciv.models.TutorialTrigger import com.unciv.models.translations.tr -import com.unciv.ui.cityscreen.CityReligionInfoTable -import com.unciv.ui.cityscreen.CityScreen +import com.unciv.ui.screens.cityscreen.CityReligionInfoTable +import com.unciv.ui.screens.cityscreen.CityScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.Popup -import com.unciv.ui.trade.DiplomacyScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.BorderedTable -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.BorderedTable +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.centerX +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.WorldScreen import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt b/core/src/com/unciv/ui/components/tilegroups/CityTileGroup.kt similarity index 93% rename from core/src/com/unciv/ui/tilegroups/CityTileGroup.kt rename to core/src/com/unciv/ui/components/tilegroups/CityTileGroup.kt index fefd124290..b394604864 100644 --- a/core/src/com/unciv/ui/tilegroups/CityTileGroup.kt +++ b/core/src/com/unciv/ui/components/tilegroups/CityTileGroup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -10,11 +10,11 @@ import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.models.stats.Stat import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.addToCenter -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.setFontColor -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.addToCenter +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.setFontColor +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel enum class CityTileState { NONE, diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/components/tilegroups/TileGroup.kt similarity index 88% rename from core/src/com/unciv/ui/tilegroups/TileGroup.kt rename to core/src/com/unciv/ui/components/tilegroups/TileGroup.kt index 5a273325ca..e3c49a72ac 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/components/tilegroups/TileGroup.kt @@ -1,18 +1,18 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Group import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile -import com.unciv.ui.tilegroups.layers.TileLayerBorders -import com.unciv.ui.tilegroups.layers.TileLayerCityButton -import com.unciv.ui.tilegroups.layers.TileLayerFeatures -import com.unciv.ui.tilegroups.layers.TileLayerMisc -import com.unciv.ui.tilegroups.layers.TileLayerOverlay -import com.unciv.ui.tilegroups.layers.TileLayerTerrain -import com.unciv.ui.tilegroups.layers.TileLayerUnitArt -import com.unciv.ui.tilegroups.layers.TileLayerUnitFlag +import com.unciv.ui.components.tilegroups.layers.TileLayerBorders +import com.unciv.ui.components.tilegroups.layers.TileLayerCityButton +import com.unciv.ui.components.tilegroups.layers.TileLayerFeatures +import com.unciv.ui.components.tilegroups.layers.TileLayerMisc +import com.unciv.ui.components.tilegroups.layers.TileLayerOverlay +import com.unciv.ui.components.tilegroups.layers.TileLayerTerrain +import com.unciv.ui.components.tilegroups.layers.TileLayerUnitArt +import com.unciv.ui.components.tilegroups.layers.TileLayerUnitFlag import kotlin.math.pow import kotlin.math.sqrt diff --git a/core/src/com/unciv/ui/tilegroups/TileGroupMap.kt b/core/src/com/unciv/ui/components/tilegroups/TileGroupMap.kt similarity index 92% rename from core/src/com/unciv/ui/tilegroups/TileGroupMap.kt rename to core/src/com/unciv/ui/components/tilegroups/TileGroupMap.kt index 4c4877a24d..1a6717d09b 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroupMap.kt +++ b/core/src/com/unciv/ui/components/tilegroups/TileGroupMap.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.math.Rectangle @@ -7,15 +7,15 @@ import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Group import com.unciv.logic.map.HexMath import com.unciv.logic.map.TileMap -import com.unciv.ui.tilegroups.layers.TileLayerBorders -import com.unciv.ui.tilegroups.layers.TileLayerCityButton -import com.unciv.ui.tilegroups.layers.TileLayerFeatures -import com.unciv.ui.tilegroups.layers.TileLayerMisc -import com.unciv.ui.tilegroups.layers.TileLayerOverlay -import com.unciv.ui.tilegroups.layers.TileLayerTerrain -import com.unciv.ui.tilegroups.layers.TileLayerUnitArt -import com.unciv.ui.tilegroups.layers.TileLayerUnitFlag -import com.unciv.ui.utils.ZoomableScrollPane +import com.unciv.ui.components.tilegroups.layers.TileLayerBorders +import com.unciv.ui.components.tilegroups.layers.TileLayerCityButton +import com.unciv.ui.components.tilegroups.layers.TileLayerFeatures +import com.unciv.ui.components.tilegroups.layers.TileLayerMisc +import com.unciv.ui.components.tilegroups.layers.TileLayerOverlay +import com.unciv.ui.components.tilegroups.layers.TileLayerTerrain +import com.unciv.ui.components.tilegroups.layers.TileLayerUnitArt +import com.unciv.ui.components.tilegroups.layers.TileLayerUnitFlag +import com.unciv.ui.components.ZoomableScrollPane import kotlin.math.max import kotlin.math.min @@ -70,7 +70,8 @@ class TileGroupMap( } tileGroup.setPosition(positionalVector.x * 0.8f * groupSize, - positionalVector.y * 0.8f * groupSize) + positionalVector.y * 0.8f * groupSize + ) topX = if (worldWrap) diff --git a/core/src/com/unciv/ui/tilegroups/TileSetStrings.kt b/core/src/com/unciv/ui/components/tilegroups/TileSetStrings.kt similarity index 99% rename from core/src/com/unciv/ui/tilegroups/TileSetStrings.kt rename to core/src/com/unciv/ui/components/tilegroups/TileSetStrings.kt index e9a20944a5..006302bbbd 100644 --- a/core/src/com/unciv/ui/tilegroups/TileSetStrings.kt +++ b/core/src/com/unciv/ui/components/tilegroups/TileSetStrings.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/components/tilegroups/WorldTileGroup.kt similarity index 89% rename from core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt rename to core/src/com/unciv/ui/components/tilegroups/WorldTileGroup.kt index 8ef7bbf8af..f7c2d9ae14 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/components/tilegroups/WorldTileGroup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -6,9 +6,9 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.screens.worldscreen.WorldScreen class WorldTileGroup(internal val worldScreen: WorldScreen, tile: Tile, tileSetStrings: TileSetStrings) diff --git a/core/src/com/unciv/ui/tilegroups/YieldGroup.kt b/core/src/com/unciv/ui/components/tilegroups/YieldGroup.kt similarity index 93% rename from core/src/com/unciv/ui/tilegroups/YieldGroup.kt rename to core/src/com/unciv/ui/components/tilegroups/YieldGroup.kt index f5f2f3c608..9b426b925c 100644 --- a/core/src/com/unciv/ui/tilegroups/YieldGroup.kt +++ b/core/src/com/unciv/ui/components/tilegroups/YieldGroup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups +package com.unciv.ui.components.tilegroups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group @@ -7,9 +7,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.models.stats.Stats import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.addToCenter -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.addToCenter +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel class YieldGroup : HorizontalGroup() { init { diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayer.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayer.kt similarity index 89% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayer.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayer.kt index 01a214c7cf..12a6774b67 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayer.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayer.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.Touchable @@ -6,8 +6,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.models.tilesets.TileSetCache -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings abstract class TileLayer(val tileGroup: TileGroup, size: Float) : Group() { diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerBorders.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerBorders.kt similarity index 98% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerBorders.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerBorders.kt index d9ae6ddb24..0c7c9ce2dd 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerBorders.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerBorders.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Image import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileGroup import kotlin.math.PI import kotlin.math.atan diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerCityButton.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt similarity index 90% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerCityButton.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt index 265afe79f7..992e2c71ef 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerCityButton.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Actor @@ -6,9 +6,9 @@ import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization -import com.unciv.ui.tilegroups.CityButton -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.WorldTileGroup +import com.unciv.ui.components.tilegroups.CityButton +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.WorldTileGroup class TileLayerCityButton(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, size) { diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerFeatures.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerFeatures.kt similarity index 96% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerFeatures.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerFeatures.kt index a4ade19301..3f5ec20fad 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerFeatures.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerFeatures.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Image @@ -6,7 +6,7 @@ import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.RoadStatus import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileGroup import kotlin.math.atan2 diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerMisc.kt similarity index 96% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerMisc.kt index 6355c31315..9351b52a2f 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerMisc.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerMisc.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Vector2 @@ -14,14 +14,14 @@ import com.unciv.models.helpers.MiscArrowTypes import com.unciv.models.helpers.TintedMapArrow import com.unciv.models.helpers.UnitMovementMemoryType import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.CityTileGroup -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.tilegroups.WorldTileGroup -import com.unciv.ui.tilegroups.YieldGroup -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.tilegroups.CityTileGroup +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.tilegroups.WorldTileGroup +import com.unciv.ui.components.tilegroups.YieldGroup +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.centerX +import com.unciv.ui.components.extensions.toLabel import kotlin.math.atan2 import kotlin.math.min import kotlin.math.pow diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerOverlay.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerOverlay.kt similarity index 95% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerOverlay.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerOverlay.kt index 572db96b0e..ca5d25c25e 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerOverlay.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerOverlay.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -6,7 +6,7 @@ import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileGroup class TileLayerOverlay(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, size) { diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerTerrain.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt similarity index 98% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerTerrain.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt index 317c297942..25dcb842b4 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerTerrain.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -7,8 +7,8 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.utils.BaseScreen +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.BaseScreen import kotlin.random.Random class TileLayerTerrain(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, size) { diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitArt.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitArt.kt similarity index 96% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitArt.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitArt.kt index 836efbc201..c03f71a621 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitArt.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitArt.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Group @@ -6,7 +6,7 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.mapunit.MapUnit import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileGroup private class UnitArtSlot : Group() { var imageLocation = "" diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitFlag.kt similarity index 94% rename from core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt rename to core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitFlag.kt index ed2170f34e..9562aa968f 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerUnitFlag.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tilegroups.layers +package com.unciv.ui.components.tilegroups.layers import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -7,11 +7,11 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.mapunit.MapUnit import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UnitGroup -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UnitGroup +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.toLabel class TileLayerUnitFlag(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, size) { diff --git a/core/src/com/unciv/ui/crashhandling/CrashScreen.kt b/core/src/com/unciv/ui/crashhandling/CrashScreen.kt index 7cb107350b..c7ac364ac0 100644 --- a/core/src/com/unciv/ui/crashhandling/CrashScreen.kt +++ b/core/src/com/unciv/ui/crashhandling/CrashScreen.kt @@ -10,15 +10,15 @@ import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.files.UncivFiles import com.unciv.models.ruleset.RulesetCache +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addBorder +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addBorder -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.ToastPopup import java.io.PrintWriter import java.io.StringWriter diff --git a/core/src/com/unciv/ui/images/IconCircleGroup.kt b/core/src/com/unciv/ui/images/IconCircleGroup.kt index 64d45787f5..1a80403379 100644 --- a/core/src/com/unciv/ui/images/IconCircleGroup.kt +++ b/core/src/com/unciv/ui/images/IconCircleGroup.kt @@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.utils.Align -import com.unciv.ui.utils.extensions.center +import com.unciv.ui.components.extensions.center class IconCircleGroup(size: Float, val actor: Actor, resizeActor: Boolean = true, color: Color = Color.WHITE, circleImage:String = "OtherIcons/Circle"): Group(){ diff --git a/core/src/com/unciv/ui/images/IconTextButton.kt b/core/src/com/unciv/ui/images/IconTextButton.kt index 58079a78c3..c754789e80 100644 --- a/core/src/com/unciv/ui/images/IconTextButton.kt +++ b/core/src/com/unciv/ui/images/IconTextButton.kt @@ -7,8 +7,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Cell import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.utils.Align import com.unciv.Constants -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.toLabel /** * Translate a [String] and make a [Button] widget from it, with control over font size, font colour, an optional icon, and custom formatting. diff --git a/core/src/com/unciv/ui/images/ImageAttempter.kt b/core/src/com/unciv/ui/images/ImageAttempter.kt index 2ffd802fcc..2110378735 100644 --- a/core/src/com/unciv/ui/images/ImageAttempter.kt +++ b/core/src/com/unciv/ui/images/ImageAttempter.kt @@ -1,7 +1,7 @@ package com.unciv.ui.images import com.unciv.logic.civilization.Civilization -import com.unciv.ui.tilegroups.TileSetStrings +import com.unciv.ui.components.tilegroups.TileSetStrings /** * Metaprogrammy class for short-circuitingly finding the first existing of multiple image options according to [ImageGetter.imageExists]. @@ -56,7 +56,7 @@ class ImageAttempter(val scope: T) { * [locationToCheck]: the beginning of the filename to check * [style]: an optional string to load a civ- or style-specific sprite * */ - fun tryEraImage(civInfo: Civilization, locationToCheck: String, style: String?, tileSetStrings:TileSetStrings): ImageAttempter { + fun tryEraImage(civInfo: Civilization, locationToCheck: String, style: String?, tileSetStrings: TileSetStrings): ImageAttempter { return tryImages( (civInfo.getEraNumber() downTo 0).asSequence().map { { diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt index 11b57e9f4f..327aec6689 100644 --- a/core/src/com/unciv/ui/images/ImageGetter.kt +++ b/core/src/com/unciv/ui/images/ImageGetter.kt @@ -24,8 +24,8 @@ import com.unciv.models.ruleset.nation.Nation import com.unciv.models.ruleset.Ruleset import com.unciv.models.skins.SkinCache import com.unciv.models.tilesets.TileSetCache -import com.unciv.ui.utils.* -import com.unciv.ui.utils.extensions.* +import com.unciv.ui.components.* +import com.unciv.ui.components.extensions.* import com.unciv.utils.debug import kotlin.math.atan2 import kotlin.math.max diff --git a/core/src/com/unciv/ui/images/Portrait.kt b/core/src/com/unciv/ui/images/Portrait.kt index da4c2dea60..01ac6470c0 100644 --- a/core/src/com/unciv/ui/images/Portrait.kt +++ b/core/src/com/unciv/ui/images/Portrait.kt @@ -7,13 +7,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.models.ruleset.Ruleset import com.unciv.models.stats.Stats -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.centerX +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel open class Portrait(val type: Type, val imageName: String, val size: Float, val borderSize: Float = 2f) : Group() { diff --git a/core/src/com/unciv/ui/popup/AskNumberPopup.kt b/core/src/com/unciv/ui/popups/AskNumberPopup.kt similarity index 94% rename from core/src/com/unciv/ui/popup/AskNumberPopup.kt rename to core/src/com/unciv/ui/popups/AskNumberPopup.kt index 89a5b16f03..976cd9ed64 100644 --- a/core/src/com/unciv/ui/popup/AskNumberPopup.kt +++ b/core/src/com/unciv/ui/popups/AskNumberPopup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.popup +package com.unciv.ui.popups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -6,12 +6,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.unciv.ui.images.IconCircleGroup import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel /** Simple class for showing a prompt for a positive integer to the user * @param screen The previous screen the user was on diff --git a/core/src/com/unciv/ui/popup/AskTextPopup.kt b/core/src/com/unciv/ui/popups/AskTextPopup.kt similarity index 90% rename from core/src/com/unciv/ui/popup/AskTextPopup.kt rename to core/src/com/unciv/ui/popups/AskTextPopup.kt index 01ccef9701..eca64f30ac 100644 --- a/core/src/com/unciv/ui/popup/AskTextPopup.kt +++ b/core/src/com/unciv/ui/popups/AskTextPopup.kt @@ -1,15 +1,14 @@ -package com.unciv.ui.popup +package com.unciv.ui.popups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextField -import com.unciv.ui.images.IconCircleGroup import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel /** Simple class for showing a prompt for a string to the user * @param screen The previous screen the user was on diff --git a/core/src/com/unciv/ui/popup/ConfirmPopup.kt b/core/src/com/unciv/ui/popups/ConfirmPopup.kt similarity index 92% rename from core/src/com/unciv/ui/popup/ConfirmPopup.kt rename to core/src/com/unciv/ui/popups/ConfirmPopup.kt index f31cc0b0eb..bec84f8dce 100644 --- a/core/src/com/unciv/ui/popup/ConfirmPopup.kt +++ b/core/src/com/unciv/ui/popups/ConfirmPopup.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.popup +package com.unciv.ui.popups import com.badlogic.gdx.scenes.scene2d.Stage import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle import com.badlogic.gdx.utils.Align -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.toLabel /** Variant of [Popup] pre-populated with one label, plus confirm and cancel buttons * @param question The text for the label diff --git a/core/src/com/unciv/ui/popup/Popup.kt b/core/src/com/unciv/ui/popups/Popup.kt similarity index 94% rename from core/src/com/unciv/ui/popup/Popup.kt rename to core/src/com/unciv/ui/popups/Popup.kt index ac4b3ef941..5eef797d32 100644 --- a/core/src/com/unciv/ui/popup/Popup.kt +++ b/core/src/com/unciv/ui/popups/Popup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.popup +package com.unciv.ui.popups import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Rectangle @@ -15,18 +15,17 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.logic.event.EventBus -import com.unciv.ui.UncivStage -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.basescreen.UncivStage +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton /** * Base class for all Popups, i.e. Tables that get rendered in the middle of a screen and on top of everything else diff --git a/core/src/com/unciv/ui/popup/ToastPopup.kt b/core/src/com/unciv/ui/popups/ToastPopup.kt similarity index 91% rename from core/src/com/unciv/ui/popup/ToastPopup.kt rename to core/src/com/unciv/ui/popups/ToastPopup.kt index dd182394d7..0fccad5c0f 100644 --- a/core/src/com/unciv/ui/popup/ToastPopup.kt +++ b/core/src/com/unciv/ui/popups/ToastPopup.kt @@ -1,8 +1,8 @@ -package com.unciv.ui.popup +package com.unciv.ui.popups import com.badlogic.gdx.scenes.scene2d.Stage -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlinx.coroutines.delay diff --git a/core/src/com/unciv/ui/options/AboutTab.kt b/core/src/com/unciv/ui/popups/options/AboutTab.kt similarity index 83% rename from core/src/com/unciv/ui/options/AboutTab.kt rename to core/src/com/unciv/ui/popups/options/AboutTab.kt index 408c72a7e6..57a19dcf45 100644 --- a/core/src/com/unciv/ui/options/AboutTab.kt +++ b/core/src/com/unciv/ui/popups/options/AboutTab.kt @@ -1,9 +1,9 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer fun aboutTab(): Table { val versionAnchor = UncivGame.VERSION.text.replace(".", "") diff --git a/core/src/com/unciv/ui/options/AdvancedTab.kt b/core/src/com/unciv/ui/popups/options/AdvancedTab.kt similarity index 93% rename from core/src/com/unciv/ui/options/AdvancedTab.kt rename to core/src/com/unciv/ui/popups/options/AdvancedTab.kt index 8f8514da39..d4ab3639e6 100644 --- a/core/src/com/unciv/ui/options/AdvancedTab.kt +++ b/core/src/com/unciv/ui/popups/options/AdvancedTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -18,22 +18,22 @@ import com.unciv.models.metadata.GameSettings import com.unciv.models.metadata.ScreenSize import com.unciv.models.translations.TranslationFileWriter import com.unciv.models.translations.tr -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.FontFamilyData -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontColor -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.utils.extensions.withoutItem +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.FontFamilyData +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontColor +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.components.extensions.withoutItem import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlinx.coroutines.CoroutineScope diff --git a/core/src/com/unciv/ui/options/DebugTab.kt b/core/src/com/unciv/ui/popups/options/DebugTab.kt similarity index 92% rename from core/src/com/unciv/ui/options/DebugTab.kt rename to core/src/com/unciv/ui/popups/options/DebugTab.kt index c29f49ddbb..d7640bf3ea 100644 --- a/core/src/com/unciv/ui/options/DebugTab.kt +++ b/core/src/com/unciv/ui/popups/options/DebugTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame @@ -6,13 +6,13 @@ import com.unciv.logic.files.UncivFiles import com.unciv.logic.files.MapSaver import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.tile.ResourceType -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton fun debugTab() = Table(BaseScreen.skin).apply { pad(10f) diff --git a/core/src/com/unciv/ui/options/DisplayTab.kt b/core/src/com/unciv/ui/popups/options/DisplayTab.kt similarity index 95% rename from core/src/com/unciv/ui/options/DisplayTab.kt rename to core/src/com/unciv/ui/popups/options/DisplayTab.kt index 392ab629df..f5039276df 100644 --- a/core/src/com/unciv/ui/options/DisplayTab.kt +++ b/core/src/com/unciv/ui/popups/options/DisplayTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -14,16 +14,16 @@ import com.unciv.models.skins.SkinCache import com.unciv.models.tilesets.TileSetCache import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.newgamescreen.TranslatedSelectBox -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton private val resolutionArray = com.badlogic.gdx.utils.Array(arrayOf("750x500", "900x600", "1050x700", "1200x800", "1500x1000")) diff --git a/core/src/com/unciv/ui/options/GameplayTab.kt b/core/src/com/unciv/ui/popups/options/GameplayTab.kt similarity index 94% rename from core/src/com/unciv/ui/options/GameplayTab.kt rename to core/src/com/unciv/ui/popups/options/GameplayTab.kt index 12dc62ddc7..e9cad4124a 100644 --- a/core/src/com/unciv/ui/options/GameplayTab.kt +++ b/core/src/com/unciv/ui/popups/options/GameplayTab.kt @@ -1,12 +1,12 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame import com.unciv.logic.civilization.PlayerType import com.unciv.models.metadata.GameSettings -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.extensions.toLabel fun gameplayTab( optionsPopup: OptionsPopup diff --git a/core/src/com/unciv/ui/options/LanguageTab.kt b/core/src/com/unciv/ui/popups/options/LanguageTab.kt similarity index 82% rename from core/src/com/unciv/ui/options/LanguageTab.kt rename to core/src/com/unciv/ui/popups/options/LanguageTab.kt index 4cd66c0a1f..16f64f3a7b 100644 --- a/core/src/com/unciv/ui/options/LanguageTab.kt +++ b/core/src/com/unciv/ui/popups/options/LanguageTab.kt @@ -1,10 +1,10 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.LanguageTable.Companion.addLanguageTables -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.LanguageTable.Companion.addLanguageTables +import com.unciv.ui.components.extensions.onClick fun languageTab( optionsPopup: OptionsPopup, diff --git a/core/src/com/unciv/ui/options/ModCheckTab.kt b/core/src/com/unciv/ui/popups/options/ModCheckTab.kt similarity index 95% rename from core/src/com/unciv/ui/options/ModCheckTab.kt rename to core/src/com/unciv/ui/popups/options/ModCheckTab.kt index c812519361..4c645cbb7e 100644 --- a/core/src/com/unciv/ui/options/ModCheckTab.kt +++ b/core/src/com/unciv/ui/popups/options/ModCheckTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -14,16 +14,16 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.newgamescreen.TranslatedSelectBox -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/options/MultiplayerTab.kt b/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt similarity index 93% rename from core/src/com/unciv/ui/options/MultiplayerTab.kt rename to core/src/com/unciv/ui/popups/options/MultiplayerTab.kt index eb48b66da8..d44c06a746 100644 --- a/core/src/com/unciv/ui/options/MultiplayerTab.kt +++ b/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -12,19 +12,18 @@ import com.unciv.models.metadata.GameSetting import com.unciv.models.metadata.GameSettings import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.format -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toGdxArray -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.format +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toGdxArray +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import java.time.Duration @@ -79,13 +78,15 @@ fun multiplayerTab( createNotificationSoundOptions(), GameSetting.MULTIPLAYER_CURRENT_GAME_TURN_NOTIFICATION_SOUND, settings - )) + ) + ) addSelectAsSeparateTable(tab, SettingsSelect("Sound notification for when it's your turn in any other game:", createNotificationSoundOptions(), GameSetting.MULTIPLAYER_OTHER_GAME_TURN_NOTIFICATION_SOUND, settings - )) + ) + ) addSeparator(tab) diff --git a/core/src/com/unciv/ui/options/OptionsPopup.kt b/core/src/com/unciv/ui/popups/options/OptionsPopup.kt similarity index 94% rename from core/src/com/unciv/ui/options/OptionsPopup.kt rename to core/src/com/unciv/ui/popups/options/OptionsPopup.kt index 17120855ac..d965ec44e9 100644 --- a/core/src/com/unciv/ui/options/OptionsPopup.kt +++ b/core/src/com/unciv/ui/popups/options/OptionsPopup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input @@ -8,7 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.SelectBox import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener import com.badlogic.gdx.utils.Array -import com.unciv.MainMenuScreen +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.UncivGame import com.unciv.logic.event.EventBus import com.unciv.models.UncivSound @@ -20,15 +20,15 @@ import com.unciv.models.metadata.SettingsPropertyUncivSoundChanged import com.unciv.models.ruleset.RulesetCache import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toGdxArray -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toGdxArray +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.withGLContext import kotlin.reflect.KMutableProperty0 diff --git a/core/src/com/unciv/ui/options/SoundTab.kt b/core/src/com/unciv/ui/popups/options/SoundTab.kt similarity index 93% rename from core/src/com/unciv/ui/options/SoundTab.kt rename to core/src/com/unciv/ui/popups/options/SoundTab.kt index 952a2e6772..979cb802d0 100644 --- a/core/src/com/unciv/ui/options/SoundTab.kt +++ b/core/src/com/unciv/ui/popups/options/SoundTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.options +package com.unciv.ui.popups.options import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -8,13 +8,13 @@ import com.unciv.models.metadata.GameSettings import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicController import com.unciv.ui.audio.MusicTrackChooserFlags -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlin.math.floor diff --git a/core/src/com/unciv/ui/saves/Gzip.kt b/core/src/com/unciv/ui/savescreens/Gzip.kt similarity index 97% rename from core/src/com/unciv/ui/saves/Gzip.kt rename to core/src/com/unciv/ui/savescreens/Gzip.kt index cbf7d51dd8..6838494c6d 100644 --- a/core/src/com/unciv/ui/saves/Gzip.kt +++ b/core/src/com/unciv/ui/savescreens/Gzip.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.badlogic.gdx.utils.Base64Coder import java.io.BufferedReader @@ -47,4 +47,4 @@ object Gzip { private fun decoder(base64Str: String): ByteArray{ return Base64Coder.decode(base64Str) } -} \ No newline at end of file +} diff --git a/core/src/com/unciv/ui/saves/LoadGameScreen.kt b/core/src/com/unciv/ui/savescreens/LoadGameScreen.kt similarity index 94% rename from core/src/com/unciv/ui/saves/LoadGameScreen.kt rename to core/src/com/unciv/ui/savescreens/LoadGameScreen.kt index 8d31636263..f25293d692 100644 --- a/core/src/com/unciv/ui/saves/LoadGameScreen.kt +++ b/core/src/com/unciv/ui/savescreens/LoadGameScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle @@ -12,20 +12,19 @@ import com.unciv.logic.files.UncivFiles import com.unciv.logic.UncivShowableException import com.unciv.models.ruleset.RulesetCache import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.Github -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.Github +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/saves/LoadOrSaveScreen.kt b/core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt similarity index 85% rename from core/src/com/unciv/ui/saves/LoadOrSaveScreen.kt rename to core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt index 2d4f924ff9..d3477ef4bd 100644 --- a/core/src/com/unciv/ui/saves/LoadOrSaveScreen.kt +++ b/core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.scenes.scene2d.ui.CheckBox @@ -7,21 +7,21 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.UncivGame import com.unciv.Constants import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.UncivDateFormat.formatDate -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.UncivDateFormat.formatDate +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onDoubleClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import java.util.* diff --git a/core/src/com/unciv/ui/saves/QuickSave.kt b/core/src/com/unciv/ui/savescreens/QuickSave.kt similarity index 95% rename from core/src/com/unciv/ui/saves/QuickSave.kt rename to core/src/com/unciv/ui/savescreens/QuickSave.kt index 720f18aae0..0409e4feed 100644 --- a/core/src/com/unciv/ui/saves/QuickSave.kt +++ b/core/src/com/unciv/ui/savescreens/QuickSave.kt @@ -1,14 +1,13 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.unciv.Constants -import com.unciv.MainMenuScreen +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.UncivShowableException -import com.unciv.ui.multiplayer.MultiplayerHelpers -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import com.unciv.utils.Log diff --git a/core/src/com/unciv/ui/saves/SaveGameScreen.kt b/core/src/com/unciv/ui/savescreens/SaveGameScreen.kt similarity index 87% rename from core/src/com/unciv/ui/saves/SaveGameScreen.kt rename to core/src/com/unciv/ui/savescreens/SaveGameScreen.kt index 83f297e299..b15cdc6e48 100644 --- a/core/src/com/unciv/ui/saves/SaveGameScreen.kt +++ b/core/src/com/unciv/ui/savescreens/SaveGameScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle @@ -8,18 +8,18 @@ import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.files.UncivFiles import com.unciv.models.translations.tr -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt b/core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt similarity index 96% rename from core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt rename to core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt index 6aaee63fd0..1c26125313 100644 --- a/core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt +++ b/core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.saves +package com.unciv.ui.savescreens import com.badlogic.gdx.Input import com.badlogic.gdx.files.FileHandle @@ -9,10 +9,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align import com.unciv.logic.files.UncivFiles import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onClick import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/LanguagePickerScreen.kt b/core/src/com/unciv/ui/screens/LanguagePickerScreen.kt similarity index 76% rename from core/src/com/unciv/ui/LanguagePickerScreen.kt rename to core/src/com/unciv/ui/screens/LanguagePickerScreen.kt index 1f046e7fbc..b4d254c4bf 100644 --- a/core/src/com/unciv/ui/LanguagePickerScreen.kt +++ b/core/src/com/unciv/ui/screens/LanguagePickerScreen.kt @@ -1,14 +1,14 @@ -package com.unciv.ui +package com.unciv.ui.screens import com.unciv.Constants -import com.unciv.MainMenuScreen import com.unciv.models.translations.tr -import com.unciv.ui.options.OptionsPopup -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.utils.LanguageTable -import com.unciv.ui.utils.LanguageTable.Companion.addLanguageTables -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.popups.options.OptionsPopup +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.components.LanguageTable +import com.unciv.ui.components.LanguageTable.Companion.addLanguageTables +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen /** A [PickerScreen] to select a language, used once on the initial run after a fresh install. * After that, [OptionsPopup] provides the functionality. diff --git a/core/src/com/unciv/ui/LoadingScreen.kt b/core/src/com/unciv/ui/screens/LoadingScreen.kt similarity index 90% rename from core/src/com/unciv/ui/LoadingScreen.kt rename to core/src/com/unciv/ui/screens/LoadingScreen.kt index d354430d90..24d229ecdf 100644 --- a/core/src/com/unciv/ui/LoadingScreen.kt +++ b/core/src/com/unciv/ui/screens/LoadingScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui +package com.unciv.ui.screens import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Pixmap @@ -7,10 +7,10 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.unciv.Constants import com.unciv.ui.images.ImageWithCustomSize -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.popups -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.popups +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.toLabel /** A loading screen that creates a screenshot of the current screen and adds a "Loading..." popup on top of that */ class LoadingScreen( diff --git a/core/src/com/unciv/ui/utils/BaseScreen.kt b/core/src/com/unciv/ui/screens/basescreen/BaseScreen.kt similarity index 94% rename from core/src/com/unciv/ui/utils/BaseScreen.kt rename to core/src/com/unciv/ui/screens/basescreen/BaseScreen.kt index bb77268f56..038505e15a 100644 --- a/core/src/com/unciv/ui/utils/BaseScreen.kt +++ b/core/src/com/unciv/ui/screens/basescreen/BaseScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.utils +package com.unciv.ui.components import com.badlogic.gdx.Gdx import com.badlogic.gdx.Screen @@ -18,15 +18,15 @@ import com.badlogic.gdx.utils.viewport.ExtendViewport import com.unciv.UncivGame import com.unciv.models.TutorialTrigger import com.unciv.models.skins.SkinStrings -import com.unciv.ui.UncivStage +import com.unciv.ui.screens.basescreen.UncivStage import com.unciv.ui.images.ImageGetter -import com.unciv.ui.options.OptionsPopup -import com.unciv.ui.popup.activePopup +import com.unciv.ui.popups.options.OptionsPopup +import com.unciv.ui.popups.activePopup import com.unciv.ui.tutorials.TutorialController -import com.unciv.ui.utils.extensions.DispatcherVetoResult -import com.unciv.ui.utils.extensions.DispatcherVetoer -import com.unciv.ui.utils.extensions.installShortcutDispatcher -import com.unciv.ui.utils.extensions.isNarrowerThan4to3 +import com.unciv.ui.components.extensions.DispatcherVetoResult +import com.unciv.ui.components.extensions.DispatcherVetoer +import com.unciv.ui.components.extensions.installShortcutDispatcher +import com.unciv.ui.components.extensions.isNarrowerThan4to3 abstract class BaseScreen : Screen { diff --git a/core/src/com/unciv/ui/tutorials/TutorialController.kt b/core/src/com/unciv/ui/screens/basescreen/TutorialController.kt similarity index 70% rename from core/src/com/unciv/ui/tutorials/TutorialController.kt rename to core/src/com/unciv/ui/screens/basescreen/TutorialController.kt index fe997922c1..df94f2d7ba 100644 --- a/core/src/com/unciv/ui/tutorials/TutorialController.kt +++ b/core/src/com/unciv/ui/screens/basescreen/TutorialController.kt @@ -1,5 +1,7 @@ package com.unciv.ui.tutorials +import com.badlogic.gdx.Gdx +import com.unciv.Constants import com.unciv.UncivGame import com.unciv.json.fromJsonFile import com.unciv.json.json @@ -7,9 +9,12 @@ import com.unciv.models.TutorialTrigger import com.unciv.models.ruleset.Tutorial import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.INamed -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.SimpleCivilopediaText -import com.unciv.ui.utils.BaseScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.images.ImageGetter +import com.unciv.ui.popups.Popup +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.SimpleCivilopediaText class TutorialController(screen: BaseScreen) { @@ -86,3 +91,32 @@ class TutorialController(screen: BaseScreen) { return civilopediaTutorials } } + + +data class TutorialForRender(val tutorial: TutorialTrigger, val texts: List) + +class TutorialRender(private val screen: BaseScreen) { + + fun showTutorial(tutorial: TutorialForRender, closeAction: () -> Unit) { + showDialog(tutorial.tutorial.name, tutorial.texts, closeAction) + } + + private fun showDialog(tutorialName: String, texts: List, closeAction: () -> Unit) { + if (texts.isEmpty()) return closeAction() + + val tutorialPopup = Popup(screen) + tutorialPopup.name = Constants.tutorialPopupNamePrefix + tutorialName + + if (Gdx.files.internal("ExtraImages/$tutorialName").exists()) { + tutorialPopup.add(ImageGetter.getExternalImage(tutorialName)).row() + } + + tutorialPopup.addGoodSizedLabel(texts[0]).row() + + tutorialPopup.addCloseButton(additionalKey = KeyCharAndCode.SPACE) { + tutorialPopup.remove() + showDialog(tutorialName, texts.subList(1, texts.size), closeAction) + } + tutorialPopup.open() + } +} diff --git a/core/src/com/unciv/ui/UncivStage.kt b/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt similarity index 97% rename from core/src/com/unciv/ui/UncivStage.kt rename to core/src/com/unciv/ui/screens/basescreen/UncivStage.kt index 1fc104e3e5..264ae871d8 100644 --- a/core/src/com/unciv/ui/UncivStage.kt +++ b/core/src/com/unciv/ui/screens/basescreen/UncivStage.kt @@ -1,4 +1,4 @@ -package com.unciv.ui +package com.unciv.ui.screens.basescreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.g2d.Batch @@ -9,9 +9,9 @@ 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.ui.utils.TextureArraySpriteBatch import com.unciv.utils.Log diff --git a/core/src/com/unciv/ui/cityscreen/CitizenManagementTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CitizenManagementTable.kt similarity index 93% rename from core/src/com/unciv/ui/cityscreen/CitizenManagementTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CitizenManagementTable.kt index 75645ee612..0054d28d18 100644 --- a/core/src/com/unciv/ui/cityscreen/CitizenManagementTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CitizenManagementTable.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants import com.unciv.logic.city.CityFocus -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel class CitizenManagementTable(val cityScreen: CityScreen) : Table(BaseScreen.skin) { val city = cityScreen.city diff --git a/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt similarity index 96% rename from core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt index 2a04686417..b57b84e801 100644 --- a/core/src/com/unciv/ui/cityscreen/CityConstructionsTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group @@ -24,32 +24,32 @@ import com.unciv.models.stats.Stat import com.unciv.models.translations.tr import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.closeAllPopups -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addBorder -import com.unciv.ui.utils.extensions.addCell -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.getConsumesAmountString -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.packIfNeeded -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.closeAllPopups +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addBorder +import com.unciv.ui.components.extensions.addCell +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.getConsumesAmountString +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.packIfNeeded +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlin.math.max import kotlin.math.min -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane private class ConstructionButtonDTO( val construction: IConstruction, diff --git a/core/src/com/unciv/ui/cityscreen/CityMapHolder.kt b/core/src/com/unciv/ui/screens/cityscreen/CityMapHolder.kt similarity index 77% rename from core/src/com/unciv/ui/cityscreen/CityMapHolder.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityMapHolder.kt index 6fc6b37680..872e59a39c 100644 --- a/core/src/com/unciv/ui/cityscreen/CityMapHolder.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityMapHolder.kt @@ -1,8 +1,8 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen -import com.unciv.ui.UncivStage -import com.unciv.ui.tilegroups.TileGroupMap -import com.unciv.ui.utils.ZoomableScrollPane +import com.unciv.ui.screens.basescreen.UncivStage +import com.unciv.ui.components.tilegroups.TileGroupMap +import com.unciv.ui.components.ZoomableScrollPane class CityMapHolder : ZoomableScrollPane(20f, 20f) { diff --git a/core/src/com/unciv/ui/cityscreen/CityReligionInfoTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityReligionInfoTable.kt similarity index 87% rename from core/src/com/unciv/ui/cityscreen/CityReligionInfoTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityReligionInfoTable.kt index 4bb52400b0..6f0a8c5643 100644 --- a/core/src/com/unciv/ui/cityscreen/CityReligionInfoTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityReligionInfoTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -6,18 +6,18 @@ import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.city.managers.CityReligionManager import com.unciv.models.Religion -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.Portrait -import com.unciv.ui.overviewscreen.EmpireOverviewCategories -import com.unciv.ui.overviewscreen.EmpireOverviewScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.overviewscreen.EmpireOverviewCategories +import com.unciv.ui.screens.overviewscreen.EmpireOverviewScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel class CityReligionInfoTable( private val religionManager: CityReligionManager, diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/screens/cityscreen/CityScreen.kt similarity index 95% rename from core/src/com/unciv/ui/cityscreen/CityScreen.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityScreen.kt index 67820daa3b..07252656f4 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color @@ -21,23 +21,23 @@ import com.unciv.models.translations.tr import com.unciv.ui.audio.CityAmbiencePlayer import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.tilegroups.TileGroupMap -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.tilegroups.CityTileGroup -import com.unciv.ui.tilegroups.CityTileState -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.packIfNeeded -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.tilegroups.TileGroupMap +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.tilegroups.CityTileGroup +import com.unciv.ui.components.tilegroups.CityTileState +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.packIfNeeded +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.worldscreen.WorldScreen class CityScreen( internal val city: City, diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityScreenCityPickerTable.kt similarity index 93% rename from core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityScreenCityPickerTable.kt index b114788fa5..f36e2add8f 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityScreenCityPickerTable.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.CityRenamePopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.pickerscreens.CityRenamePopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel /** Widget for the City Screen - * the panel at bottom center showing the city name and offering arrows to cycle through the cities. */ diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityScreenTileTable.kt similarity index 85% rename from core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityScreenTileTable.kt index 87b28021ad..2fed0f91fe 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityScreenTileTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -10,22 +10,22 @@ import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr import com.unciv.ui.audio.SoundPlayer -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.civilopedia.FormattedLine.IconDisplay -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.FormattedLine.IconDisplay +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.closeAllPopups -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.closeAllPopups +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.roundToInt class CityScreenTileTable(private val cityScreen: CityScreen): Table() { @@ -100,7 +100,9 @@ class CityScreenTileTable(private val cityScreen: CityScreen): Table() { } } if (selectedTile.isCityCenter() && selectedTile.getCity() != city && selectedTile.getCity()!!.civ == city.civ) - innerTable.add("Move to city".toTextButton().onClick { cityScreen.game.replaceCurrentScreen(CityScreen(selectedTile.getCity()!!)) }) + innerTable.add("Move to city".toTextButton().onClick { cityScreen.game.replaceCurrentScreen( + CityScreen(selectedTile.getCity()!!) + ) }) innerTable.pack() pack() diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityStatsTable.kt similarity index 95% rename from core/src/com/unciv/ui/cityscreen/CityStatsTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/CityStatsTable.kt index 0dda332230..9c0f700609 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityStatsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -15,23 +15,23 @@ import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.ceil import kotlin.math.round -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane class CityStatsTable(val cityScreen: CityScreen): Table() { private val innerTable = Table() // table within this Table. Slightly smaller creates border diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt b/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt similarity index 91% rename from core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt index a0031240a5..8b19b5801e 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -13,16 +13,16 @@ import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.IRulesetObject import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.closeAllPopups -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.closeAllPopups +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toTextButton class ConstructionInfoTable(val cityScreen: CityScreen): Table() { private val selectedConstructionTable = Table() diff --git a/core/src/com/unciv/ui/cityscreen/DetailedStatsPopup.kt b/core/src/com/unciv/ui/screens/cityscreen/DetailedStatsPopup.kt similarity index 94% rename from core/src/com/unciv/ui/cityscreen/DetailedStatsPopup.kt rename to core/src/com/unciv/ui/screens/cityscreen/DetailedStatsPopup.kt index e465e8e51c..ececcfe7d4 100644 --- a/core/src/com/unciv/ui/cityscreen/DetailedStatsPopup.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/DetailedStatsPopup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Stage @@ -10,16 +10,16 @@ import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr import com.unciv.ui.images.IconCircleGroup -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel import java.text.DecimalFormat class DetailedStatsPopup(val cityScreen: CityScreen, stageToShowOn: Stage) : Popup( diff --git a/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt b/core/src/com/unciv/ui/screens/cityscreen/SpecialistAllocationTable.kt similarity index 91% rename from core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt rename to core/src/com/unciv/ui/screens/cityscreen/SpecialistAllocationTable.kt index f63f10b5d9..a80844e9ec 100644 --- a/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/SpecialistAllocationTable.kt @@ -1,6 +1,5 @@ -package com.unciv.ui.cityscreen +package com.unciv.ui.screens.cityscreen -import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -8,15 +7,15 @@ import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.UncivGame import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.addBorder -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.addBorder +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel class SpecialistAllocationTable(val cityScreen: CityScreen) : Table(BaseScreen.skin) { val cityInfo = cityScreen.city diff --git a/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaCategories.kt similarity index 96% rename from core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaCategories.kt index 41b59e6f4e..161a2ad016 100644 --- a/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaCategories.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color @@ -10,10 +10,10 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TerrainType import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.surroundWithCircle import java.io.File diff --git a/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt similarity index 96% rename from core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt index fd2db4d00b..42f16523ac 100644 --- a/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color @@ -17,16 +17,16 @@ import com.unciv.models.stats.INamed import com.unciv.models.translations.tr import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.components.AutoScrollPane as ScrollPane /** Screen displaying the Civilopedia * @param ruleset [Ruleset] to display items from diff --git a/core/src/com/unciv/ui/civilopedia/FormattedLine.kt b/core/src/com/unciv/ui/screens/civilopediascreen/FormattedLine.kt similarity index 98% rename from core/src/com/unciv/ui/civilopedia/FormattedLine.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/FormattedLine.kt index f4414fc237..4264710597 100644 --- a/core/src/com/unciv/ui/civilopedia/FormattedLine.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/FormattedLine.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -12,8 +12,8 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.unique.Unique import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.toLabel import com.unciv.utils.Log import kotlin.math.max @@ -182,7 +182,7 @@ class FormattedLine ( yield(CivilopediaCategories.Building to ruleSet.buildings.filter { !it.value.isAnyWonder() }) yield(CivilopediaCategories.Wonder to ruleSet.buildings.filter { it.value.isAnyWonder() }) } - val result = HashMap() + val result = HashMap() allObjectMapsSequence.filter { !it.first.hide } .flatMap { pair -> pair.second.keys.asSequence().map { key -> pair.first to key } } .forEach { diff --git a/core/src/com/unciv/ui/civilopedia/ICivilopediaText.kt b/core/src/com/unciv/ui/screens/civilopediascreen/ICivilopediaText.kt similarity index 99% rename from core/src/com/unciv/ui/civilopedia/ICivilopediaText.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/ICivilopediaText.kt index 310d4cf6a2..76d00cb0c8 100644 --- a/core/src/com/unciv/ui/civilopedia/ICivilopediaText.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/ICivilopediaText.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.models.ruleset.Ruleset diff --git a/core/src/com/unciv/ui/civilopedia/MarkupRenderer.kt b/core/src/com/unciv/ui/screens/civilopediascreen/MarkupRenderer.kt similarity index 93% rename from core/src/com/unciv/ui/civilopedia/MarkupRenderer.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/MarkupRenderer.kt index 50dcc38015..36c26056f0 100644 --- a/core/src/com/unciv/ui/civilopedia/MarkupRenderer.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/MarkupRenderer.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.onClick /** Makes [renderer][render] available outside [ICivilopediaText] */ diff --git a/core/src/com/unciv/ui/civilopedia/SimpleCivilopediaText.kt b/core/src/com/unciv/ui/screens/civilopediascreen/SimpleCivilopediaText.kt similarity index 91% rename from core/src/com/unciv/ui/civilopedia/SimpleCivilopediaText.kt rename to core/src/com/unciv/ui/screens/civilopediascreen/SimpleCivilopediaText.kt index 463c215d88..2b2afd10f1 100644 --- a/core/src/com/unciv/ui/civilopedia/SimpleCivilopediaText.kt +++ b/core/src/com/unciv/ui/screens/civilopediascreen/SimpleCivilopediaText.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.civilopedia +package com.unciv.ui.screens.civilopediascreen /** Storage class for instantiation of the simplest form containing only the lines collection */ open class SimpleCivilopediaText( diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt similarity index 97% rename from core/src/com/unciv/ui/trade/DiplomacyScreen.kt rename to core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt index 9ff9b29188..037dbbf0c7 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.trade +package com.unciv.ui.screens.diplomacyscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.SplitPane @@ -28,27 +28,27 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicMood import com.unciv.ui.audio.MusicTrackChooserFlags -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.tilegroups.InfluenceTable -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.tilegroups.InfluenceTable +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.floor import kotlin.math.roundToInt -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane /** * Creates the diplomacy screen for [viewingCiv]. diff --git a/core/src/com/unciv/ui/trade/LeaderIntroTable.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/LeaderIntroTable.kt similarity index 93% rename from core/src/com/unciv/ui/trade/LeaderIntroTable.kt rename to core/src/com/unciv/ui/screens/diplomacyscreen/LeaderIntroTable.kt index f66e546d06..d1fec46322 100644 --- a/core/src/com/unciv/ui/trade/LeaderIntroTable.kt +++ b/core/src/com/unciv/ui/screens/diplomacyscreen/LeaderIntroTable.kt @@ -1,12 +1,12 @@ -package com.unciv.ui.trade +package com.unciv.ui.screens.diplomacyscreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.logic.civilization.Civilization import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.toLabel /** * This is meant to be used for any kind of civ introduction - [DiplomacyScreen], diff --git a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/OfferColumnsTable.kt similarity index 95% rename from core/src/com/unciv/ui/trade/OfferColumnsTable.kt rename to core/src/com/unciv/ui/screens/diplomacyscreen/OfferColumnsTable.kt index 9595c90108..7b531859cd 100644 --- a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt +++ b/core/src/com/unciv/ui/screens/diplomacyscreen/OfferColumnsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.trade +package com.unciv.ui.screens.diplomacyscreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants @@ -8,10 +8,10 @@ import com.unciv.logic.trade.TradeOffersList import com.unciv.logic.trade.TradeType import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.AskNumberPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.popups.AskNumberPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.surroundWithCircle /** This is the class that holds the 4 columns of the offers (ours/theirs/ offered/available) in trade */ class OfferColumnsTable(private val tradeLogic: TradeLogic, val screen: DiplomacyScreen, val onChange: () -> Unit): Table(BaseScreen.skin) { diff --git a/core/src/com/unciv/ui/trade/OffersListScroll.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/OffersListScroll.kt similarity index 94% rename from core/src/com/unciv/ui/trade/OffersListScroll.kt rename to core/src/com/unciv/ui/screens/diplomacyscreen/OffersListScroll.kt index ef03c2c01f..bd28f223b0 100644 --- a/core/src/com/unciv/ui/trade/OffersListScroll.kt +++ b/core/src/com/unciv/ui/screens/diplomacyscreen/OffersListScroll.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.trade +package com.unciv.ui.screens.diplomacyscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -23,12 +23,12 @@ import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.translations.tr import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick import kotlin.math.min -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane /** * Widget for one fourth of an [OfferColumnsTable] - instantiated for ours/theirs × available/traded diff --git a/core/src/com/unciv/ui/trade/TradeTable.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/TradeTable.kt similarity index 91% rename from core/src/com/unciv/ui/trade/TradeTable.kt rename to core/src/com/unciv/ui/screens/diplomacyscreen/TradeTable.kt index 33b77f36c5..19f402e3d8 100644 --- a/core/src/com/unciv/ui/trade/TradeTable.kt +++ b/core/src/com/unciv/ui/screens/diplomacyscreen/TradeTable.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.trade +package com.unciv.ui.screens.diplomacyscreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.civilization.Civilization import com.unciv.logic.trade.TradeLogic import com.unciv.logic.trade.TradeRequest import com.unciv.models.translations.tr -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toTextButton class TradeTable(private val otherCivilization: Civilization, stage: DiplomacyScreen): Table(BaseScreen.skin) { val currentPlayerCiv = otherCivilization.gameInfo.getCurrentPlayerCivilization() diff --git a/core/src/com/unciv/ui/tutorials/EasterEggRulesets.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/EasterEggRulesets.kt similarity index 98% rename from core/src/com/unciv/ui/tutorials/EasterEggRulesets.kt rename to core/src/com/unciv/ui/screens/mainmenuscreen/EasterEggRulesets.kt index 43d50d49d9..6c22deb289 100644 --- a/core/src/com/unciv/ui/tutorials/EasterEggRulesets.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/EasterEggRulesets.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.tutorials +package com.unciv.ui.screens.mainmenuscreen import com.unciv.logic.HolidayDates import com.unciv.logic.HolidayDates.Holidays @@ -6,7 +6,7 @@ import com.unciv.logic.map.MapParameters import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TerrainType -import com.unciv.ui.civilopedia.FormattedLine +import com.unciv.ui.screens.civilopediascreen.FormattedLine import java.time.Month object EasterEggRulesets { diff --git a/core/src/com/unciv/MainMenuScreen.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt similarity index 87% rename from core/src/com/unciv/MainMenuScreen.kt rename to core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt index 6b5a22683a..d466963a42 100644 --- a/core/src/com/unciv/MainMenuScreen.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt @@ -1,4 +1,4 @@ -package com.unciv +package com.unciv.ui.screens.mainmenuscreen import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color @@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align +import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.GameStarter import com.unciv.logic.UncivShowableException @@ -19,35 +20,32 @@ import com.unciv.models.metadata.BaseRuleset import com.unciv.models.metadata.GameSetupInfo import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.tilegroups.TileGroupMap import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroupMap -import com.unciv.ui.mapeditor.EditorMapHolder -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.multiplayer.MultiplayerScreen -import com.unciv.ui.newgamescreen.NewGameScreen -import com.unciv.ui.pickerscreens.ModManagementScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.popup.closeAllPopups -import com.unciv.ui.popup.hasOpenPopups -import com.unciv.ui.popup.popups -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.saves.QuickSave -import com.unciv.ui.tutorials.EasterEggRulesets -import com.unciv.ui.tutorials.EasterEggRulesets.modifyForEasterEgg -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.mainmenu.WorldScreenMenuPopup +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.screens.multiplayerscreens.MultiplayerScreen +import com.unciv.ui.popups.Popup +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.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.newgamescreen.NewGameScreen +import com.unciv.ui.screens.pickerscreens.ModManagementScreen +import com.unciv.ui.screens.worldscreen.mainmenu.WorldScreenMenuPopup +import com.unciv.ui.screens.mainmenuscreen.EasterEggRulesets.modifyForEasterEgg import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlin.math.min @@ -132,7 +130,10 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize { launchOnGLThread { // for GL context ImageGetter.setNewRuleset(mapRuleset) - val mapHolder = EditorMapHolder(this@MainMenuScreen, newMap) {} + val mapHolder = com.unciv.ui.screens.mapeditorscreen.EditorMapHolder( + this@MainMenuScreen, + newMap + ) {} mapHolder.setScale(scale) backgroundTable.addAction(Actions.sequence( Actions.fadeOut(0f), diff --git a/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/EditorMapHolder.kt similarity index 94% rename from core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/EditorMapHolder.kt index 976c922f34..ccdcfc867d 100644 --- a/core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/EditorMapHolder.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.scenes.scene2d.Action @@ -11,12 +11,12 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.unciv.logic.map.HexMath import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.TileMap -import com.unciv.ui.tilegroups.TileGroupMap -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ZoomableScrollPane -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.tilegroups.TileGroupMap +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ZoomableScrollPane +import com.unciv.ui.components.extensions.onClick /** @@ -28,7 +28,7 @@ class EditorMapHolder( internal val tileMap: TileMap, private val onTileClick: (Tile) -> Unit ): ZoomableScrollPane(20f, 20f) { - val editorScreen = parentScreen as? MapEditorScreen + val editorScreen = parentScreen as? com.unciv.ui.screens.mapeditorscreen.MapEditorScreen val tileGroups = HashMap() private lateinit var tileGroupMap: TileGroupMap diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorFilesTable.kt similarity index 92% rename from core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorFilesTable.kt index 527791e24d..34eb5151cf 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorFilesTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.badlogic.gdx.Input import com.badlogic.gdx.files.FileHandle @@ -9,11 +9,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.logic.files.MapSaver import com.unciv.models.ruleset.RulesetCache import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toLabel class MapEditorFilesTable( initWidth: Float, diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt similarity index 74% rename from core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt index e28886ee68..d4ff2f3a87 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorMainTabs.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt @@ -1,15 +1,15 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.mapeditor.tabs.MapEditorEditTab -import com.unciv.ui.mapeditor.tabs.MapEditorGenerateTab -import com.unciv.ui.mapeditor.tabs.MapEditorLoadTab -import com.unciv.ui.mapeditor.tabs.MapEditorModsTab -import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab -import com.unciv.ui.mapeditor.tabs.MapEditorSaveTab -import com.unciv.ui.mapeditor.tabs.MapEditorViewTab -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorGenerateTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorLoadTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorModsTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorOptionsTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorSaveTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorViewTab +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager class MapEditorMainTabs( editorScreen: MapEditorScreen diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorScreen.kt similarity index 93% rename from core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorScreen.kt index 3c65c700fe..740f533c88 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -13,13 +13,13 @@ import com.unciv.models.metadata.GameSetupInfo import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache import com.unciv.ui.images.ImageGetter -import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.worldscreen.ZoomButtonPair +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorOptionsTab +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.screens.worldscreen.ZoomButtonPair //todo normalize properly @@ -64,7 +64,7 @@ class MapEditorScreen(map: TileMap? = null): BaseScreen(), RecreateOnResize { var tileMatchFuzziness = MapEditorOptionsTab.TileMatchFuzziness.CompleteMatch // UI - var mapHolder: EditorMapHolder + var mapHolder: com.unciv.ui.screens.mapeditorscreen.EditorMapHolder val tabs: MapEditorMainTabs var tileClickHandler: ((tile: Tile)->Unit)? = null private var zoomController: ZoomButtonPair? = null @@ -117,7 +117,7 @@ class MapEditorScreen(map: TileMap? = null): BaseScreen(), RecreateOnResize { fun getToolsWidth() = stage.width * 0.4f - private fun newMapHolder(): EditorMapHolder { + private fun newMapHolder(): com.unciv.ui.screens.mapeditorscreen.EditorMapHolder { ImageGetter.setNewRuleset(ruleset) // setNewRuleset is missing some graphics - those "EmojiIcons"&co already rendered as font characters // so to get the "Water" vs "Gold" icons when switching between Deciv and Vanilla to render properly, @@ -130,7 +130,7 @@ class MapEditorScreen(map: TileMap? = null): BaseScreen(), RecreateOnResize { tileMap.setStartingLocationsTransients() UncivGame.Current.translations.translationActiveMods = ruleset.mods - val result = EditorMapHolder(this, tileMap) { + val result = com.unciv.ui.screens.mapeditorscreen.EditorMapHolder(this, tileMap) { tileClickHandler?.invoke(it) } diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorToolsDrawer.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorToolsDrawer.kt similarity index 96% rename from core/src/com/unciv/ui/mapeditor/MapEditorToolsDrawer.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorToolsDrawer.kt index 48ed9cdc62..ce5c3366cd 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorToolsDrawer.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorToolsDrawer.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -12,13 +12,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.Container import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen +import com.unciv.ui.components.BaseScreen import kotlin.math.abs class MapEditorToolsDrawer( tabs: MapEditorMainTabs, initStage: Stage, - private val mapHolder: EditorMapHolder + private val mapHolder: com.unciv.ui.screens.mapeditorscreen.EditorMapHolder ): Table(BaseScreen.skin) { private companion object { const val arrowImage = "OtherIcons/BackArrow" diff --git a/core/src/com/unciv/ui/mapeditor/MapGeneratorSteps.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt similarity index 98% rename from core/src/com/unciv/ui/mapeditor/MapGeneratorSteps.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt index c40e483a66..1628e1e901 100644 --- a/core/src/com/unciv/ui/mapeditor/MapGeneratorSteps.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapGeneratorSteps.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.unciv.logic.map.MapParameters diff --git a/core/src/com/unciv/ui/mapeditor/TileInfoNormalizer.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/TileInfoNormalizer.kt similarity index 98% rename from core/src/com/unciv/ui/mapeditor/TileInfoNormalizer.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/TileInfoNormalizer.kt index 4a6dcc4f94..10486a6025 100644 --- a/core/src/com/unciv/ui/mapeditor/TileInfoNormalizer.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/TileInfoNormalizer.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.Ruleset diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditSubTabs.kt similarity index 94% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditSubTabs.kt index 1d7e09b6b8..3639d8b264 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditSubTabs.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditSubTabs.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor +package com.unciv.ui.screens.mapeditorscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group @@ -18,18 +18,18 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicMood import com.unciv.ui.audio.MusicTrackChooserFlags -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.mapeditor.tabs.MapEditorEditTab -import com.unciv.ui.mapeditor.tabs.MapEditorEditTab.BrushHandlerType -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab.BrushHandlerType +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel internal interface IMapEditorEditSubTabs { fun isDisabled(): Boolean @@ -44,7 +44,8 @@ class MapEditorEditTerrainTab( init { top() defaults().pad(10f).fillX().left() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getTerrains(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { @@ -84,7 +85,8 @@ class MapEditorEditFeaturesTab( tile.removeTerrainFeatures() } } }).padBottom(0f).row() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getFeatures(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { @@ -113,7 +115,8 @@ class MapEditorEditWondersTab( init { top() defaults().pad(10f).fillX().left() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getWonders(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { @@ -156,7 +159,8 @@ class MapEditorEditResourcesTab( tile.resource = null } } }).padBottom(0f).row() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getResources(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { resourceName -> @@ -205,7 +209,8 @@ class MapEditorEditImprovementsTab( tile.removeRoad() } } }).padBottom(0f).row() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getImprovements(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { @@ -278,7 +283,8 @@ class MapEditorEditStartsTab( } } }).padBottom(0f).row() - add(MarkupRenderer.render( + add( + MarkupRenderer.render( getNations(), iconDisplay = FormattedLine.IconDisplay.NoLink ) { diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditTab.kt similarity index 91% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditTab.kt index b824b21cf3..78ca8b9268 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorEditTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorEditTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -11,27 +11,27 @@ import com.unciv.logic.map.mapgenerator.RiverGenerator import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.Ruleset import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.FormattedLine +import com.unciv.ui.screens.civilopediascreen.FormattedLine import com.unciv.ui.images.ImageGetter -import com.unciv.ui.mapeditor.IMapEditorEditSubTabs -import com.unciv.ui.mapeditor.MapEditorEditFeaturesTab -import com.unciv.ui.mapeditor.MapEditorEditImprovementsTab -import com.unciv.ui.mapeditor.MapEditorEditResourcesTab -import com.unciv.ui.mapeditor.MapEditorEditRiversTab -import com.unciv.ui.mapeditor.MapEditorEditStartsTab -import com.unciv.ui.mapeditor.MapEditorEditTerrainTab -import com.unciv.ui.mapeditor.MapEditorEditWondersTab -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.mapeditor.TileInfoNormalizer -import com.unciv.ui.mapeditor.tabs.MapEditorOptionsTab.TileMatchFuzziness -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.mapeditorscreen.IMapEditorEditSubTabs +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditFeaturesTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditImprovementsTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditResourcesTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditRiversTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditStartsTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditTerrainTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorEditWondersTab +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.screens.mapeditorscreen.TileInfoNormalizer +import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorOptionsTab.TileMatchFuzziness +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.toLabel import com.unciv.utils.Log class MapEditorEditTab( diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorGenerateTab.kt similarity index 91% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorGenerateTab.kt index 0ba1b2d213..a8043e0470 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorGenerateTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorGenerateTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup @@ -13,22 +13,22 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.mapeditor.MapGeneratorSteps -import com.unciv.ui.newgamescreen.MapParametersTable -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.screens.mapeditorscreen.MapGeneratorSteps +import com.unciv.ui.screens.newgamescreen.MapParametersTable +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import kotlin.concurrent.thread diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorLoadTab.kt similarity index 90% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorLoadTab.kt index 268a10c207..5234f20214 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorLoadTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorLoadTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle @@ -9,19 +9,19 @@ import com.unciv.logic.files.MapSaver import com.unciv.logic.UncivShowableException import com.unciv.models.ruleset.RulesetCache import com.unciv.models.translations.tr -import com.unciv.ui.mapeditor.MapEditorFilesTable -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.mapeditorscreen.MapEditorFilesTable +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import kotlin.concurrent.thread diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorModsTab.kt similarity index 88% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorModsTab.kt index ff0b281459..c315a9bd7e 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorModsTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorModsTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.scenes.scene2d.ui.Cell import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane @@ -7,19 +7,19 @@ import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.mapeditor.TileInfoNormalizer -import com.unciv.ui.newgamescreen.ModCheckboxTable -import com.unciv.ui.newgamescreen.TranslatedSelectBox -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +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.popups.Popup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton class MapEditorModsTab( private val editorScreen: MapEditorScreen diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorOptionsTab.kt similarity index 81% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorOptionsTab.kt index 6feda4771f..b683a234fa 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorOptionsTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorOptionsTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -7,19 +7,19 @@ import com.badlogic.gdx.scenes.scene2d.ui.CheckBox import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.files.MapSaver import com.unciv.models.translations.tr -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton class MapEditorOptionsTab( private val editorScreen: MapEditorScreen diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorSaveTab.kt similarity index 84% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorSaveTab.kt index 3a45208077..81ae66c82c 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorSaveTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorSaveTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle @@ -9,22 +9,22 @@ import com.unciv.logic.files.MapSaver import com.unciv.logic.map.MapGeneratedMainType import com.unciv.logic.map.TileMap import com.unciv.models.translations.tr -import com.unciv.ui.mapeditor.MapEditorFilesTable -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.mapeditorscreen.MapEditorFilesTable +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toTextButton import kotlin.concurrent.thread class MapEditorSaveTab( diff --git a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorViewTab.kt similarity index 91% rename from core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt rename to core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorViewTab.kt index 6bf29963c9..5f0bf9fc5d 100644 --- a/core/src/com/unciv/ui/mapeditor/tabs/MapEditorViewTab.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorViewTab.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.mapeditor.tabs +package com.unciv.ui.screens.mapeditorscreen.tabs import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Cell @@ -14,21 +14,21 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.nation.Nation import com.unciv.models.stats.Stats import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.civilopedia.FormattedLine -import com.unciv.ui.civilopedia.FormattedLine.IconDisplay -import com.unciv.ui.civilopedia.MarkupRenderer -import com.unciv.ui.mapeditor.MapEditorScreen -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.ui.screens.civilopediascreen.FormattedLine.IconDisplay +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer +import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toTextButton class MapEditorViewTab( private val editorScreen: MapEditorScreen diff --git a/core/src/com/unciv/ui/multiplayer/AddFriendScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/AddFriendScreen.kt similarity index 87% rename from core/src/com/unciv/ui/multiplayer/AddFriendScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/AddFriendScreen.kt index aff5a56e21..73b3de6104 100644 --- a/core/src/com/unciv/ui/multiplayer/AddFriendScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/AddFriendScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -6,13 +6,13 @@ import com.unciv.UncivGame import com.unciv.logic.IdChecker import com.unciv.logic.multiplayer.FriendList import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import java.util.* class AddFriendScreen : PickerScreen() { diff --git a/core/src/com/unciv/ui/multiplayer/AddMultiplayerGameScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt similarity index 83% rename from core/src/com/unciv/ui/multiplayer/AddMultiplayerGameScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt index e5e1142032..65ba98f723 100644 --- a/core/src/com/unciv/ui/multiplayer/AddMultiplayerGameScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt @@ -1,18 +1,18 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.IdChecker import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +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.components.UncivTextField +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import java.util.* diff --git a/core/src/com/unciv/ui/multiplayer/EditFriendScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/EditFriendScreen.kt similarity index 88% rename from core/src/com/unciv/ui/multiplayer/EditFriendScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/EditFriendScreen.kt index 679919f587..0084201dd3 100644 --- a/core/src/com/unciv/ui/multiplayer/EditFriendScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/EditFriendScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -7,14 +7,14 @@ import com.unciv.UncivGame import com.unciv.logic.IdChecker import com.unciv.logic.multiplayer.FriendList import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import java.util.* class EditFriendScreen(selectedFriend: FriendList.Friend) : PickerScreen() { diff --git a/core/src/com/unciv/ui/multiplayer/EditMultiplayerGameInfoScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt similarity index 87% rename from core/src/com/unciv/ui/multiplayer/EditMultiplayerGameInfoScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt index a1ca2d4fab..3ba5e66b39 100644 --- a/core/src/com/unciv/ui/multiplayer/EditMultiplayerGameInfoScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt @@ -1,20 +1,20 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +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.components.UncivTextField +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/multiplayer/FriendPickerList.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/FriendPickerList.kt similarity index 86% rename from core/src/com/unciv/ui/multiplayer/FriendPickerList.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/FriendPickerList.kt index cb60b02879..f4d5309d74 100644 --- a/core/src/com/unciv/ui/multiplayer/FriendPickerList.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/FriendPickerList.kt @@ -1,12 +1,12 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.unciv.logic.multiplayer.FriendList -import com.unciv.ui.newgamescreen.PlayerPickerTable -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.screens.newgamescreen.PlayerPickerTable +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick class FriendPickerList( playerPicker: PlayerPickerTable, diff --git a/core/src/com/unciv/ui/multiplayer/GameList.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt similarity index 96% rename from core/src/com/unciv/ui/multiplayer/GameList.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt index 10bf3b6c87..7d2dd21d34 100644 --- a/core/src/com/unciv/ui/multiplayer/GameList.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Container @@ -20,9 +20,9 @@ import com.unciv.logic.multiplayer.MultiplayerGameUpdateSucceeded import com.unciv.logic.multiplayer.MultiplayerGameUpdated import com.unciv.logic.multiplayer.isUsersTurn import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setSize +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setSize class GameList( onSelected: (String) -> Unit diff --git a/core/src/com/unciv/ui/multiplayer/MultiplayerHelpers.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt similarity index 91% rename from core/src/com/unciv/ui/multiplayer/MultiplayerHelpers.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt index 8b85c622d5..15ded74f03 100644 --- a/core/src/com/unciv/ui/multiplayer/MultiplayerHelpers.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt @@ -1,16 +1,15 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.Gdx import com.unciv.UncivGame import com.unciv.logic.multiplayer.OnlineMultiplayer import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.models.translations.tr -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.formatShort -import com.unciv.ui.utils.extensions.toCheckBox +import com.unciv.ui.popups.Popup +import com.unciv.ui.savescreens.LoadGameScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.formatShort +import com.unciv.ui.components.extensions.toCheckBox import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import java.time.Duration diff --git a/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt similarity index 93% rename from core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt index 4eb9a3b9fa..2c0d4b18f2 100644 --- a/core/src/com/unciv/ui/multiplayer/MultiplayerScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -7,14 +7,14 @@ import com.unciv.logic.event.EventBus import com.unciv.logic.multiplayer.MultiplayerGameDeleted import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.components.AutoScrollPane as ScrollPane class MultiplayerScreen : PickerScreen() { private var selectedGame: OnlineMultiplayerGame? = null diff --git a/core/src/com/unciv/ui/multiplayer/ViewFriendsListScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/ViewFriendsListScreen.kt similarity index 87% rename from core/src/com/unciv/ui/multiplayer/ViewFriendsListScreen.kt rename to core/src/com/unciv/ui/screens/multiplayerscreens/ViewFriendsListScreen.kt index a64543f8a8..e5f50f15f6 100644 --- a/core/src/com/unciv/ui/multiplayer/ViewFriendsListScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/ViewFriendsListScreen.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.multiplayer +package com.unciv.ui.screens.multiplayerscreens import com.badlogic.gdx.scenes.scene2d.ui.* import com.unciv.logic.multiplayer.FriendList -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.components.AutoScrollPane as ScrollPane class ViewFriendsListScreen : PickerScreen() { private val rightSideTable = Table() diff --git a/core/src/com/unciv/ui/newgamescreen/FriendTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/FriendTable.kt similarity index 91% rename from core/src/com/unciv/ui/newgamescreen/FriendTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/FriendTable.kt index 76ec3f879b..9c514c2795 100644 --- a/core/src/com/unciv/ui/newgamescreen/FriendTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/FriendTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -6,8 +6,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.logic.multiplayer.FriendList -import com.unciv.ui.utils.* -import com.unciv.ui.utils.extensions.pad +import com.unciv.ui.components.* +import com.unciv.ui.components.extensions.pad class FriendTable(val friend: FriendList.Friend, width: Float, minHeight: Float) : Table() { diff --git a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/GameOptionsTable.kt similarity index 96% rename from core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/GameOptionsTable.kt index cd631063a6..98f33a0c73 100644 --- a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/GameOptionsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group @@ -15,23 +15,23 @@ import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicMood import com.unciv.ui.audio.MusicTrackChooserFlags import com.unciv.ui.images.ImageGetter -import com.unciv.ui.multiplayer.MultiplayerHelpers -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.extensions.isNarrowerThan4to3 -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.multiplayerscreens.MultiplayerHelpers +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.extensions.isNarrowerThan4to3 +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton class GameOptionsTable( val previousScreen: IPreviousScreen, diff --git a/core/src/com/unciv/ui/newgamescreen/IPreviousScreen.kt b/core/src/com/unciv/ui/screens/newgamescreen/IPreviousScreen.kt similarity index 66% rename from core/src/com/unciv/ui/newgamescreen/IPreviousScreen.kt rename to core/src/com/unciv/ui/screens/newgamescreen/IPreviousScreen.kt index a688b57aca..e066805c3e 100644 --- a/core/src/com/unciv/ui/newgamescreen/IPreviousScreen.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/IPreviousScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.scenes.scene2d.Stage import com.unciv.models.metadata.GameSetupInfo @@ -14,5 +14,5 @@ interface IPreviousScreen { val ruleset: Ruleset // Having `fun setRightSideButtonEnabled(boolean: Boolean)` part of this interface gives a warning: - // "Names of the parameter #1 conflict in the following members of supertypes: 'public abstract fun setRightSideButtonEnabled(boolean: Boolean): Unit defined in com.unciv.ui.newgamescreen.IPreviousScreen, public final fun setRightSideButtonEnabled(bool: Boolean): Unit defined in com.unciv.ui.pickerscreens.PickerScreen'. This may cause problems when calling this function with named arguments." -} \ No newline at end of file + // "Names of the parameter #1 conflict in the following members of supertypes: 'public abstract fun setRightSideButtonEnabled(boolean: Boolean): Unit defined in com.unciv.ui.screens.IPreviousScreen, public final fun setRightSideButtonEnabled(bool: Boolean): Unit defined in com.unciv.ui.screens.PickerScreen'. This may cause problems when calling this function with named arguments." +} diff --git a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapOptionsTable.kt similarity index 95% rename from core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/MapOptionsTable.kt index 53a4d1836c..d4f9f4aa1c 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapOptionsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.scenes.scene2d.ui.SelectBox @@ -9,10 +9,10 @@ import com.unciv.logic.files.MapSaver import com.unciv.logic.UncivShowableException import com.unciv.logic.map.MapGeneratedMainType import com.unciv.models.ruleset.RulesetCache -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.toLabel class MapOptionsTable(private val newGameScreen: NewGameScreen): Table() { @@ -83,7 +83,8 @@ class MapOptionsTable(private val newGameScreen: NewGameScreen): Table() { // Pre-select custom if any map saved within last 15 minutes if (mapFilesSequence.any { it.fileHandle.lastModified() > System.currentTimeMillis() - 900000 }) - mapTypeSelectBox.selected = TranslatedSelectBox.TranslatedString(MapGeneratedMainType.custom) + mapTypeSelectBox.selected = + TranslatedSelectBox.TranslatedString(MapGeneratedMainType.custom) // activate once, so when we had a file map before we'll have the right things set for another one updateOnMapTypeChange() diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt similarity index 97% rename from core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt index 314382aab5..6d17df74c3 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapParametersTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.CheckBox @@ -13,16 +13,16 @@ import com.unciv.logic.map.MapSize import com.unciv.logic.map.MapSizeNew import com.unciv.logic.map.MapType import com.unciv.logic.map.mapgenerator.MapGenerationRandomness -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton /** Table for editing [mapParameters] * diff --git a/core/src/com/unciv/ui/newgamescreen/ModCheckboxTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/ModCheckboxTable.kt similarity index 94% rename from core/src/com/unciv/ui/newgamescreen/ModCheckboxTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/ModCheckboxTable.kt index e25b0e54eb..8749200a2f 100644 --- a/core/src/com/unciv/ui/newgamescreen/ModCheckboxTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/ModCheckboxTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.scenes.scene2d.ui.CheckBox import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -7,12 +7,12 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetErrorList import com.unciv.models.translations.tr -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toCheckBox +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toCheckBox /** * A widget containing one expander for extension mods. diff --git a/core/src/com/unciv/ui/newgamescreen/MultiCheckboxTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MultiCheckboxTable.kt similarity index 86% rename from core/src/com/unciv/ui/newgamescreen/MultiCheckboxTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/MultiCheckboxTable.kt index bf833d11c6..53480f0368 100644 --- a/core/src/com/unciv/ui/newgamescreen/MultiCheckboxTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MultiCheckboxTable.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.scenes.scene2d.ui.CheckBox import com.badlogic.gdx.scenes.scene2d.ui.Table -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toCheckBox +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toCheckBox /** * A widget containing one expander for check boxes. diff --git a/core/src/com/unciv/ui/newgamescreen/NationTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/NationTable.kt similarity index 93% rename from core/src/com/unciv/ui/newgamescreen/NationTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/NationTable.kt index 5f7034b32f..4bacdab0a5 100644 --- a/core/src/com/unciv/ui/newgamescreen/NationTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/NationTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -8,12 +8,12 @@ import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.models.ruleset.nation.Nation import com.unciv.models.ruleset.Ruleset -import com.unciv.ui.civilopedia.FormattedLine.IconDisplay -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.FormattedLine.IconDisplay +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.pad +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.pad // The ruleset also acts as a secondary parameter to determine if this is the right or self side of the player picker class NationTable(val nation: Nation, width: Float, minHeight: Float, ruleset: Ruleset? = null) diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/screens/newgamescreen/NewGameScreen.kt similarity index 95% rename from core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt rename to core/src/com/unciv/ui/screens/newgamescreen/NewGameScreen.kt index eee34475fe..939d84138e 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/NewGameScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -20,28 +20,28 @@ import com.unciv.models.metadata.GameSetupInfo import com.unciv.models.ruleset.RulesetCache import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +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.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlinx.coroutines.coroutineScope import java.net.URL import java.util.* -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane class NewGameScreen( _gameSetupInfo: GameSetupInfo? = null diff --git a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt similarity index 98% rename from core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt rename to core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt index fd5031cf2a..f49c0be0c8 100644 --- a/core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/PlayerPickerTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.newgamescreen +package com.unciv.ui.screens.newgamescreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -20,14 +20,14 @@ import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicMood import com.unciv.ui.audio.MusicTrackChooserFlags import com.unciv.ui.images.ImageGetter -import com.unciv.ui.multiplayer.FriendPickerList -import com.unciv.ui.pickerscreens.PickerPane -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.* -import com.unciv.ui.utils.extensions.* +import com.unciv.ui.screens.multiplayerscreens.FriendPickerList +import com.unciv.ui.screens.pickerscreens.PickerPane +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.* +import com.unciv.ui.components.extensions.* import java.util.* -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane /** * This [Table] is used to pick or edit players information for new game creation. diff --git a/core/src/com/unciv/ui/overviewscreen/CityOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTable.kt similarity index 92% rename from core/src/com/unciv/ui/overviewscreen/CityOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTable.kt index 8f77494de0..3178debdb9 100644 --- a/core/src/com/unciv/ui/overviewscreen/CityOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -14,16 +14,16 @@ import com.unciv.logic.city.City import com.unciv.logic.civilization.Civilization import com.unciv.models.stats.Stat import com.unciv.models.translations.tr -import com.unciv.ui.cityscreen.CityScreen +import com.unciv.ui.screens.cityscreen.CityScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.roundToInt class CityOverviewTab( @@ -194,7 +194,9 @@ class CityOverviewTab( val construction = city.cityConstructions.currentConstructionFromQueue if (construction.isNotEmpty()) { - cityInfoTableDetails.add(ImageGetter.getConstructionPortrait(construction, iconSize*0.8f)).padRight(paddingHorz) + cityInfoTableDetails.add(ImageGetter.getConstructionPortrait(construction, iconSize *0.8f)).padRight( + paddingHorz + ) } else { cityInfoTableDetails.add() } @@ -211,14 +213,15 @@ class CityOverviewTab( when { city.isWeLoveTheKingDayActive() -> { - val image = ImageGetter.getImage("OtherIcons/WLTK 1").surroundWithCircle(iconSize, color = Color.CLEAR) + val image = ImageGetter.getImage("OtherIcons/WLTK 1").surroundWithCircle( + iconSize, color = Color.CLEAR) image.addTooltip("[${city.getFlag(CityFlags.WeLoveTheKing)}] turns", 18f, tipAlign = Align.topLeft) cityInfoTableDetails.add(image) } city.demandedResource.isNotEmpty() -> { - val image = ImageGetter.getResourcePortrait(city.demandedResource, iconSize*0.7f) + val image = ImageGetter.getResourcePortrait(city.demandedResource, iconSize *0.7f) image.addTooltip("Demanding [${city.demandedResource}]", 18f, tipAlign = Align.topLeft) - cityInfoTableDetails.add(image).padLeft(iconSize*0.3f) + cityInfoTableDetails.add(image).padLeft(iconSize *0.3f) } else -> cityInfoTableDetails.add() } diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewCategories.kt b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewCategories.kt similarity index 96% rename from core/src/com/unciv/ui/overviewscreen/EmpireOverviewCategories.kt rename to core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewCategories.kt index a027446b4b..6820416fbc 100644 --- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewCategories.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewCategories.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.tile.ResourceType -import com.unciv.ui.overviewscreen.EmpireOverviewTab.EmpireOverviewTabPersistableData -import com.unciv.ui.utils.KeyCharAndCode +import com.unciv.ui.screens.overviewscreen.EmpireOverviewTab.EmpireOverviewTabPersistableData +import com.unciv.ui.components.KeyCharAndCode private typealias FactoryType = (Civilization, EmpireOverviewScreen, EmpireOverviewTabPersistableData?) -> EmpireOverviewTab diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt similarity index 91% rename from core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt rename to core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt index fe85ab97e5..ec8680d500 100644 --- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewScreen.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.unciv.Constants import com.unciv.logic.civilization.Civilization import com.unciv.ui.images.ImageGetter -import com.unciv.ui.overviewscreen.EmpireOverviewTab.EmpireOverviewTabPersistableData -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.TabbedPager +import com.unciv.ui.screens.overviewscreen.EmpireOverviewTab.EmpireOverviewTabPersistableData +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.TabbedPager class EmpireOverviewScreen( private var viewingPlayer: Civilization, diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewTab.kt b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt similarity index 92% rename from core/src/com/unciv/ui/overviewscreen/EmpireOverviewTab.kt rename to core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt index 075cb6e233..566d123323 100644 --- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewTab.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/EmpireOverviewTab.kt @@ -1,13 +1,13 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.logic.civilization.Civilization -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.extensions.packIfNeeded -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.extensions.packIfNeeded +import com.unciv.ui.components.extensions.toLabel abstract class EmpireOverviewTab ( val viewingPlayer: Civilization, diff --git a/core/src/com/unciv/ui/overviewscreen/EspionageOverviewScreen.kt b/core/src/com/unciv/ui/screens/overviewscreen/EspionageOverviewScreen.kt similarity index 91% rename from core/src/com/unciv/ui/overviewscreen/EspionageOverviewScreen.kt rename to core/src/com/unciv/ui/screens/overviewscreen/EspionageOverviewScreen.kt index 72ed0d7672..3f67ce560f 100644 --- a/core/src/com/unciv/ui/overviewscreen/EspionageOverviewScreen.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/EspionageOverviewScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -12,17 +12,17 @@ import com.unciv.logic.civilization.managers.Spy import com.unciv.logic.civilization.managers.SpyAction import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setSize -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setSize +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton /** Screen used for moving spies between cities */ class EspionageOverviewScreen(val civInfo: Civilization) : PickerScreen(true) { diff --git a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt similarity index 96% rename from core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt index 0594b50c74..593c38cb50 100644 --- a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -16,18 +16,18 @@ import com.unciv.logic.civilization.diplomacy.RelationshipLevel import com.unciv.logic.map.HexMath import com.unciv.models.ruleset.Policy.PolicyBranchType import com.unciv.ui.images.ImageGetter -import com.unciv.ui.trade.DiplomacyScreen -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addBorder -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addBorder +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.roundToInt class GlobalPoliticsOverviewTable ( diff --git a/core/src/com/unciv/ui/overviewscreen/NotificationsOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/NotificationsOverviewTable.kt similarity index 92% rename from core/src/com/unciv/ui/overviewscreen/NotificationsOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/NotificationsOverviewTable.kt index dd9cf3a6d9..5fe4b72925 100644 --- a/core/src/com/unciv/ui/overviewscreen/NotificationsOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/NotificationsOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -8,12 +8,12 @@ import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Notification import com.unciv.logic.civilization.NotificationCategory import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.WorldScreen class NotificationsOverviewTable( val worldScreen: WorldScreen, diff --git a/core/src/com/unciv/ui/overviewscreen/ReligionOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/ReligionOverviewTable.kt similarity index 93% rename from core/src/com/unciv/ui/overviewscreen/ReligionOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/ReligionOverviewTable.kt index c537e64eb0..15059fd5f2 100644 --- a/core/src/com/unciv/ui/overviewscreen/ReligionOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/ReligionOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -12,15 +12,15 @@ import com.unciv.models.Religion import com.unciv.models.ruleset.Belief import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.toLabel import kotlin.math.max class ReligionOverviewTab( diff --git a/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTable.kt similarity index 94% rename from core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTable.kt index b70e384ae0..061ad19454 100644 --- a/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/ResourcesOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Label @@ -11,17 +11,17 @@ import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel class ResourcesOverviewTab( diff --git a/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/StatsOverviewTable.kt similarity index 97% rename from core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/StatsOverviewTable.kt index 56c52d5556..519a11d4c0 100644 --- a/core/src/com/unciv/ui/overviewscreen/StatsOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/StatsOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -9,9 +9,9 @@ import com.unciv.models.ruleset.ModOptionsConstants import com.unciv.models.stats.Stat import com.unciv.models.stats.StatMap import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.UncivSlider -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.UncivSlider +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.toLabel import kotlin.math.roundToInt class StatsOverviewTab( diff --git a/core/src/com/unciv/ui/overviewscreen/TradesOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/TradesOverviewTable.kt similarity index 94% rename from core/src/com/unciv/ui/overviewscreen/TradesOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/TradesOverviewTable.kt index 6a12125596..bc821637cf 100644 --- a/core/src/com/unciv/ui/overviewscreen/TradesOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/TradesOverviewTable.kt @@ -1,13 +1,13 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants import com.unciv.logic.civilization.Civilization import com.unciv.logic.trade.Trade import com.unciv.logic.trade.TradeOffersList -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.toLabel class TradesOverviewTab( viewingPlayer: Civilization, diff --git a/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTable.kt similarity index 92% rename from core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTable.kt index 342828e64d..847de886ed 100644 --- a/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/UnitOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Vector2 @@ -13,21 +13,21 @@ import com.unciv.models.UnitActionType import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.PromotionPickerScreen -import com.unciv.ui.pickerscreens.UnitRenamePopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.TabbedPager -import com.unciv.ui.utils.UnitGroup -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.unit.actions.UnitActionsUpgrade +import com.unciv.ui.screens.pickerscreens.PromotionPickerScreen +import com.unciv.ui.screens.pickerscreens.UnitRenamePopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.TabbedPager +import com.unciv.ui.components.UnitGroup +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade import kotlin.math.abs /** diff --git a/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/WonderOverviewTable.kt similarity index 97% rename from core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt rename to core/src/com/unciv/ui/screens/overviewscreen/WonderOverviewTable.kt index cc74eb8b36..357953a7df 100644 --- a/core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/WonderOverviewTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.overviewscreen +package com.unciv.ui.screens.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -12,11 +12,11 @@ import com.unciv.models.ruleset.QuestName import com.unciv.models.ruleset.tech.Era import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel class WonderOverviewTab( viewingPlayer: Civilization, diff --git a/core/src/com/unciv/ui/pickerscreens/CityRenamePopup.kt b/core/src/com/unciv/ui/screens/pickerscreens/CityRenamePopup.kt similarity index 76% rename from core/src/com/unciv/ui/pickerscreens/CityRenamePopup.kt rename to core/src/com/unciv/ui/screens/pickerscreens/CityRenamePopup.kt index 94266b1fa7..4dcb6c4935 100644 --- a/core/src/com/unciv/ui/pickerscreens/CityRenamePopup.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/CityRenamePopup.kt @@ -1,10 +1,9 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.logic.city.City import com.unciv.models.translations.tr -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.AskTextPopup -import com.unciv.ui.utils.BaseScreen +import com.unciv.ui.popups.AskTextPopup +import com.unciv.ui.components.BaseScreen class CityRenamePopup(val screen: BaseScreen, val city: City, val actionOnClose: ()->Unit) { init { diff --git a/core/src/com/unciv/ui/pickerscreens/DiplomaticVotePickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVotePickerScreen.kt similarity index 77% rename from core/src/com/unciv/ui/pickerscreens/DiplomaticVotePickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVotePickerScreen.kt index 9b20fb14d7..7a4d1d5386 100644 --- a/core/src/com/unciv/ui/pickerscreens/DiplomaticVotePickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVotePickerScreen.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.models.UncivSound import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.components.extensions.onClick class DiplomaticVotePickerScreen(private val votingCiv: Civilization) : PickerScreen() { private var chosenCiv: String? = null @@ -19,7 +19,12 @@ class DiplomaticVotePickerScreen(private val votingCiv: Civilization) : PickerSc val choosableCivs = votingCiv.gameInfo.civilizations.filter { it.isMajorCiv() && it != votingCiv && !it.isDefeated() } for (civ in choosableCivs) { - val button = PickerPane.getPickerOptionButton(ImageGetter.getNationPortrait(civ.nation, PickerPane.pickerOptionIconSize), civ.civName) + val button = PickerPane.getPickerOptionButton( + ImageGetter.getNationPortrait( + civ.nation, + PickerPane.pickerOptionIconSize + ), civ.civName + ) button.pack() button.onClick { chosenCiv = civ.civName diff --git a/core/src/com/unciv/ui/pickerscreens/DiplomaticVoteResultScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVoteResultScreen.kt similarity index 90% rename from core/src/com/unciv/ui/pickerscreens/DiplomaticVoteResultScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVoteResultScreen.kt index 9ca604116e..f52f5c907f 100644 --- a/core/src/com/unciv/ui/pickerscreens/DiplomaticVoteResultScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/DiplomaticVoteResultScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.UncivGame import com.unciv.logic.civilization.CivFlags @@ -6,9 +6,9 @@ import com.unciv.logic.civilization.Civilization import com.unciv.models.UncivSound import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel class DiplomaticVoteResultScreen(val votesCast: HashMap, val viewingCiv: Civilization) : PickerScreen() { val gameInfo = viewingCiv.gameInfo diff --git a/core/src/com/unciv/ui/pickerscreens/GitHub.kt b/core/src/com/unciv/ui/screens/pickerscreens/GitHub.kt similarity index 98% rename from core/src/com/unciv/ui/pickerscreens/GitHub.kt rename to core/src/com/unciv/ui/screens/pickerscreens/GitHub.kt index a3abd172e5..1ed814bc6d 100644 --- a/core/src/com/unciv/ui/pickerscreens/GitHub.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/GitHub.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.Files import com.badlogic.gdx.files.FileHandle @@ -6,10 +6,10 @@ import com.unciv.json.fromJsonFile import com.unciv.json.json import com.unciv.logic.BackwardCompatibility.updateDeprecations import com.unciv.models.ruleset.ModOptions -import com.unciv.ui.pickerscreens.Github.RateLimit -import com.unciv.ui.pickerscreens.Github.download -import com.unciv.ui.pickerscreens.Github.downloadAndExtract -import com.unciv.ui.pickerscreens.Github.tryGetGithubReposWithTopic +import com.unciv.ui.screens.pickerscreens.Github.RateLimit +import com.unciv.ui.screens.pickerscreens.Github.download +import com.unciv.ui.screens.pickerscreens.Github.downloadAndExtract +import com.unciv.ui.screens.pickerscreens.Github.tryGetGithubReposWithTopic import com.unciv.utils.Log import com.unciv.utils.debug import java.io.BufferedInputStream diff --git a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/GreatPersonPickerScreen.kt similarity index 84% rename from core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/GreatPersonPickerScreen.kt index 1d14669b85..f8c51b96ee 100644 --- a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/GreatPersonPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization @@ -6,9 +6,9 @@ import com.unciv.models.UncivSound import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.onDoubleClick class GreatPersonPickerScreen(val civInfo:Civilization) : PickerScreen() { private var theChosenOne: BaseUnit? = null @@ -21,7 +21,8 @@ class GreatPersonPickerScreen(val civInfo:Civilization) : PickerScreen() { val useMayaLongCount = civInfo.greatPeople.mayaLimitedFreeGP > 0 for (unit in greatPersonUnits) { - val button = PickerPane.getPickerOptionButton(ImageGetter.getUnitIcon(unit.name), unit.name) + val button = + PickerPane.getPickerOptionButton(ImageGetter.getUnitIcon(unit.name), unit.name) button.pack() button.isEnabled = !useMayaLongCount || unit.name in civInfo.greatPeople.longCountGPPool if (button.isEnabled) { diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt similarity index 96% rename from core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt index e23d9d3bee..fc17702088 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -13,13 +13,13 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stats import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.onDoubleClick +import com.unciv.ui.components.extensions.toLabel import kotlin.math.roundToInt class ImprovementPickerScreen( diff --git a/core/src/com/unciv/ui/pickerscreens/ModManagementOptions.kt b/core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt similarity index 94% rename from core/src/com/unciv/ui/pickerscreens/ModManagementOptions.kt rename to core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt index fd6298751c..a27a31c45a 100644 --- a/core/src/com/unciv/ui/pickerscreens/ModManagementOptions.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -10,18 +10,18 @@ import com.unciv.Constants import com.unciv.models.ruleset.Ruleset import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.newgamescreen.TranslatedSelectBox -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onChange -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.newgamescreen.TranslatedSelectBox +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onChange +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import kotlin.math.sign /** @@ -212,7 +212,7 @@ class ModManagementOptions(private val modManagementScreen: ModManagementScreen) private fun getTextButton(nameString:String, topics: List): TextButton { val categories = ArrayList() for (category in ModManagementOptions.Category.values()) { - if (category==ModManagementOptions.Category.All) continue + if (category== ModManagementOptions.Category.All) continue if (topics.contains(category.topic)) categories += category } diff --git a/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt similarity index 95% rename from core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt index 5eb15640b5..7c33ff618c 100644 --- a/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.SerializationException -import com.unciv.MainMenuScreen +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.UncivGame import com.unciv.json.fromJsonFile import com.unciv.json.json @@ -21,29 +21,29 @@ import com.unciv.models.ruleset.RulesetCache import com.unciv.models.tilesets.TileSetCache import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.ModManagementOptions.SortType -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ExpanderTab -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.UncivTextField -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.UncivDateFormat.formatDate -import com.unciv.ui.utils.extensions.UncivDateFormat.parseDate -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toCheckBox -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.ModManagementOptions.SortType +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.Popup +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ExpanderTab +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.UncivTextField +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.UncivDateFormat.formatDate +import com.unciv.ui.components.extensions.UncivDateFormat.parseDate +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toCheckBox +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread @@ -465,8 +465,10 @@ class ModManagementScreen( private fun downloadMod(repo: Github.Repo, postAction: () -> Unit = {}) { Concurrency.run("DownloadMod") { // to avoid ANRs - we've learnt our lesson from previous download-related actions try { - val modFolder = Github.downloadAndExtract(repo, - Gdx.files.local("mods")) + val modFolder = Github.downloadAndExtract( + repo, + Gdx.files.local("mods") + ) ?: throw Exception() // downloadAndExtract returns null for 404 errors and the like -> display something! Github.rewriteModOptions(repo, modFolder) launchOnGLThread { diff --git a/core/src/com/unciv/ui/pickerscreens/PantheonPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/PantheonPickerScreen.kt similarity index 96% rename from core/src/com/unciv/ui/pickerscreens/PantheonPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/PantheonPickerScreen.kt index f3350f84f1..7e5511dc6b 100644 --- a/core/src/com/unciv/ui/pickerscreens/PantheonPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/PantheonPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.logic.civilization.Civilization import com.unciv.models.ruleset.Belief diff --git a/core/src/com/unciv/ui/pickerscreens/PickerPane.kt b/core/src/com/unciv/ui/screens/pickerscreens/PickerPane.kt similarity index 90% rename from core/src/com/unciv/ui/pickerscreens/PickerPane.kt rename to core/src/com/unciv/ui/screens/pickerscreens/PickerPane.kt index 87a517eb9a..e1a1a1aef0 100644 --- a/core/src/com/unciv/ui/pickerscreens/PickerPane.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/PickerPane.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -8,13 +8,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.unciv.Constants import com.unciv.UncivGame import com.unciv.ui.images.IconTextButton -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton class PickerPane( disableScroll: Boolean = false, diff --git a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/PickerScreen.kt similarity index 88% rename from core/src/com/unciv/ui/pickerscreens/PickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/PickerScreen.kt index e7ef4c28ce..53bd6d992b 100644 --- a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/PickerScreen.kt @@ -1,9 +1,9 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation open class PickerScreen(disableScroll: Boolean = false) : BaseScreen() { diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/PolicyPickerScreen.kt similarity index 95% rename from core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/PolicyPickerScreen.kt index 11065b0b1b..999f546e8d 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/PolicyPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -19,23 +19,22 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.BorderedTable -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addToCenter -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toGroup -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.BorderedTable +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.onDoubleClick +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toGroup +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.WorldScreen import java.lang.Integer.max import kotlin.math.abs import kotlin.math.min @@ -267,8 +266,8 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, val viewingCiv: Civilizat val maxCol = max(5, branch.policies.maxOf { it.column }) val maxRow = branch.policies.maxOf { it.row } - val prefWidth = Sizes.paddingHorizontal*2 + Sizes.iconSize*maxCol - (Sizes.iconSize-Sizes.paddingBetweenHor)*(maxCol-1)/2 - val prefHeight = Sizes.paddingVertical*2 + Sizes.iconSize*maxRow + Sizes.paddingBetweenVer*(maxRow - 1) + val prefWidth = Sizes.paddingHorizontal *2 + Sizes.iconSize *maxCol - (Sizes.iconSize - Sizes.paddingBetweenHor)*(maxCol-1)/2 + val prefHeight = Sizes.paddingVertical *2 + Sizes.iconSize *maxRow + Sizes.paddingBetweenVer *(maxRow - 1) // Main table val colorBg = if (branch.isAdopted()) PolicyColors.branchAdopted else PolicyColors.branchNotAdopted diff --git a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/PromotionPickerScreen.kt similarity index 96% rename from core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/PromotionPickerScreen.kt index d3a60d4796..caeb9e6bac 100644 --- a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/PromotionPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Vector2 @@ -14,17 +14,17 @@ import com.unciv.models.UncivSound import com.unciv.models.ruleset.unit.Promotion import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.BorderedTable -import com.unciv.ui.utils.RecreateOnResize -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.setFontColor -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.BorderedTable +import com.unciv.ui.components.RecreateOnResize +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.onDoubleClick +import com.unciv.ui.components.extensions.setFontColor +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton import java.lang.Integer.max import kotlin.math.abs diff --git a/core/src/com/unciv/ui/pickerscreens/ReligionPickerScreenCommon.kt b/core/src/com/unciv/ui/screens/pickerscreens/ReligionPickerScreenCommon.kt similarity index 90% rename from core/src/com/unciv/ui/pickerscreens/ReligionPickerScreenCommon.kt rename to core/src/com/unciv/ui/screens/pickerscreens/ReligionPickerScreenCommon.kt index 7d72553d54..7186d2b346 100644 --- a/core/src/com/unciv/ui/pickerscreens/ReligionPickerScreenCommon.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/ReligionPickerScreenCommon.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -15,14 +15,14 @@ import com.unciv.models.UncivSound import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.BeliefType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.civilopedia.MarkupRenderer -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel abstract class ReligionPickerScreenCommon( private val choosingCiv: Civilization, @@ -104,7 +104,8 @@ abstract class ReligionPickerScreenCommon( descriptionScroll.scrollY = 0f descriptionScroll.updateVisualScroll() descriptionTable.apply { - add(MarkupRenderer.render( + add( + MarkupRenderer.render( belief.getCivilopediaTextLines(withHeader = true), width - 20f ) { UncivGame.Current.pushScreen(CivilopediaScreen(ruleset, link = it)) diff --git a/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/ReligiousBeliefsPickerScreen.kt similarity index 94% rename from core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/ReligiousBeliefsPickerScreen.kt index af0ffb2cb2..b50742619c 100644 --- a/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/ReligiousBeliefsPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -12,15 +12,15 @@ import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.BeliefType import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.AskTextPopup -import com.unciv.ui.utils.AutoScrollPane -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.addSeparatorVertical -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.packIfNeeded -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.popups.AskTextPopup +import com.unciv.ui.components.AutoScrollPane +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.addSeparatorVertical +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.packIfNeeded +import com.unciv.ui.components.extensions.surroundWithCircle class ReligiousBeliefsPickerScreen ( choosingCiv: Civilization, @@ -153,7 +153,9 @@ class ReligiousBeliefsPickerScreen ( val button = Button(ImageGetter.getReligionPortrait(religionName, 60f), skin) buttonSetup(button, religionName) if (religionName == this.religionName) button.disable(Color(greenDisableColor)) - else if (gameInfo.religions.keys.any { it == religionName }) button.disable(redDisableColor) + else if (gameInfo.religions.keys.any { it == religionName }) button.disable( + redDisableColor + ) iconsTable.add(button).pad(5f) } iconsTable.row() diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/screens/pickerscreens/TechButton.kt similarity index 93% rename from core/src/com/unciv/ui/pickerscreens/TechButton.kt rename to core/src/com/unciv/ui/screens/pickerscreens/TechButton.kt index 7dabcf0209..d26b06a468 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/TechButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group @@ -12,14 +12,14 @@ import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addBorder -import com.unciv.ui.utils.extensions.brighten -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.centerY -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addBorder +import com.unciv.ui.components.extensions.brighten +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.centerY +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.toLabel class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(BaseScreen.skin) { val text = "".toLabel().apply { diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/TechPickerScreen.kt similarity index 96% rename from core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt rename to core/src/com/unciv/ui/screens/pickerscreens/TechPickerScreen.kt index 3f164bebde..95652377bb 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/TechPickerScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Vector2 @@ -15,18 +15,18 @@ import com.unciv.models.UncivSound import com.unciv.models.ruleset.tech.Technology import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.onDoubleClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.ToastPopup +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.onDoubleClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel import com.unciv.utils.concurrency.Concurrency import kotlin.math.abs diff --git a/core/src/com/unciv/ui/pickerscreens/UnitRenamePopup.kt b/core/src/com/unciv/ui/screens/pickerscreens/UnitRenamePopup.kt similarity index 81% rename from core/src/com/unciv/ui/pickerscreens/UnitRenamePopup.kt rename to core/src/com/unciv/ui/screens/pickerscreens/UnitRenamePopup.kt index 1889ddb618..20eae531d3 100644 --- a/core/src/com/unciv/ui/pickerscreens/UnitRenamePopup.kt +++ b/core/src/com/unciv/ui/screens/pickerscreens/UnitRenamePopup.kt @@ -1,11 +1,11 @@ -package com.unciv.ui.pickerscreens +package com.unciv.ui.screens.pickerscreens import com.unciv.logic.map.mapunit.MapUnit import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.AskTextPopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.popups.AskTextPopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.surroundWithCircle class UnitRenamePopup(val screen: BaseScreen, val unit: MapUnit, val actionOnClose: ()->Unit) { init { diff --git a/core/src/com/unciv/ui/victoryscreen/RankingType.kt b/core/src/com/unciv/ui/screens/victoryscreen/RankingType.kt similarity index 94% rename from core/src/com/unciv/ui/victoryscreen/RankingType.kt rename to core/src/com/unciv/ui/screens/victoryscreen/RankingType.kt index f4cb3b1e11..6ce8dd5611 100644 --- a/core/src/com/unciv/ui/victoryscreen/RankingType.kt +++ b/core/src/com/unciv/ui/screens/victoryscreen/RankingType.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.victoryscreen +package com.unciv.ui.screens.victoryscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Image diff --git a/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt similarity index 96% rename from core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt rename to core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt index ed92f48d5d..bdfd8551b4 100644 --- a/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt +++ b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.victoryscreen +package com.unciv.ui.screens.victoryscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -10,14 +10,14 @@ import com.unciv.models.metadata.GameSetupInfo import com.unciv.models.ruleset.Victory import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.newgamescreen.NewGameScreen -import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.newgamescreen.NewGameScreen +import com.unciv.ui.screens.pickerscreens.PickerScreen +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.worldscreen.WorldScreen class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() { diff --git a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt similarity index 97% rename from core/src/com/unciv/ui/worldscreen/AlertPopup.kt rename to core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt index 84d45a6a9c..f858928544 100644 --- a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane @@ -19,16 +19,16 @@ import com.unciv.models.translations.tr import com.unciv.ui.audio.MusicMood import com.unciv.ui.audio.MusicTrackChooserFlags import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.Popup -import com.unciv.ui.trade.LeaderIntroTable -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.victoryscreen.VictoryScreen +import com.unciv.ui.popups.Popup +import com.unciv.ui.screens.diplomacyscreen.LeaderIntroTable +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.victoryscreen.VictoryScreen import java.util.* /** diff --git a/core/src/com/unciv/ui/worldscreen/BackgroundActor.kt b/core/src/com/unciv/ui/screens/worldscreen/BackgroundActor.kt similarity index 98% rename from core/src/com/unciv/ui/worldscreen/BackgroundActor.kt rename to core/src/com/unciv/ui/screens/worldscreen/BackgroundActor.kt index 4c10ac540f..1fbb319025 100644 --- a/core/src/com/unciv/ui/worldscreen/BackgroundActor.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/BackgroundActor.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.scenes.scene2d.Actor diff --git a/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt b/core/src/com/unciv/ui/screens/worldscreen/NotificationsScroll.kt similarity index 95% rename from core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt rename to core/src/com/unciv/ui/screens/worldscreen/NotificationsScroll.kt index 8bae170c36..6842dfa513 100644 --- a/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/NotificationsScroll.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -8,12 +8,12 @@ import com.badlogic.gdx.utils.Align import com.unciv.logic.civilization.Notification import com.unciv.logic.civilization.NotificationCategory import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.WrappableLabel -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.WrappableLabel +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel import kotlin.math.min -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane class NotificationsScroll( private val worldScreen: WorldScreen diff --git a/core/src/com/unciv/ui/worldscreen/PlayerReadyScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt similarity index 75% rename from core/src/com/unciv/ui/worldscreen/PlayerReadyScreen.kt rename to core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt index a22eb8230b..5e9067723e 100644 --- a/core/src/com/unciv/ui/worldscreen/PlayerReadyScreen.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/PlayerReadyScreen.kt @@ -1,13 +1,11 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.utils.concurrency.Concurrency +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel class PlayerReadyScreen(worldScreen: WorldScreen) : BaseScreen() { init { diff --git a/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt b/core/src/com/unciv/ui/screens/worldscreen/TechPolicyDiplomacyButtons.kt similarity index 90% rename from core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt rename to core/src/com/unciv/ui/screens/worldscreen/TechPolicyDiplomacyButtons.kt index 0bd2cdd619..03d96636a9 100644 --- a/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/TechPolicyDiplomacyButtons.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -8,16 +8,16 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.models.UncivSound import com.unciv.models.translations.tr import com.unciv.ui.images.ImageGetter -import com.unciv.ui.overviewscreen.EspionageOverviewScreen -import com.unciv.ui.pickerscreens.PolicyPickerScreen -import com.unciv.ui.pickerscreens.TechButton -import com.unciv.ui.pickerscreens.TechPickerScreen -import com.unciv.ui.trade.DiplomacyScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.screens.overviewscreen.EspionageOverviewScreen +import com.unciv.ui.screens.pickerscreens.PolicyPickerScreen +import com.unciv.ui.screens.pickerscreens.TechButton +import com.unciv.ui.screens.pickerscreens.TechPickerScreen +import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel /** A holder for Tech, Policies and Diplomacy buttons going in the top left of the WorldScreen just under WorldScreenTopBar */ diff --git a/core/src/com/unciv/ui/worldscreen/TradePopup.kt b/core/src/com/unciv/ui/screens/worldscreen/TradePopup.kt similarity index 90% rename from core/src/com/unciv/ui/worldscreen/TradePopup.kt rename to core/src/com/unciv/ui/screens/worldscreen/TradePopup.kt index 988f3b9762..e3b78069db 100644 --- a/core/src/com/unciv/ui/worldscreen/TradePopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/TradePopup.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -8,16 +8,16 @@ import com.unciv.logic.trade.TradeLogic import com.unciv.logic.trade.TradeOffer import com.unciv.logic.trade.TradeType import com.unciv.models.translations.tr -import com.unciv.ui.popup.Popup -import com.unciv.ui.trade.DiplomacyScreen -import com.unciv.ui.trade.LeaderIntroTable -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.popups.Popup +import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen +import com.unciv.ui.screens.diplomacyscreen.LeaderIntroTable +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.pad +import com.unciv.ui.components.extensions.toLabel import kotlin.math.max import kotlin.math.min -import com.unciv.ui.utils.AutoScrollPane as ScrollPane +import com.unciv.ui.components.AutoScrollPane as ScrollPane /* TODO: different Notification wording for peace treaties? diff --git a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt similarity index 97% rename from core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt rename to core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt index 56a0a4f4b7..24deca0316 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -31,25 +31,25 @@ import com.unciv.models.UncivSound import com.unciv.models.helpers.MapArrowType import com.unciv.models.helpers.MiscArrowTypes import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.UncivStage +import com.unciv.ui.screens.basescreen.UncivStage import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.tilegroups.TileGroupMap -import com.unciv.ui.tilegroups.TileGroup -import com.unciv.ui.tilegroups.TileSetStrings -import com.unciv.ui.tilegroups.WorldTileGroup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UnitGroup -import com.unciv.ui.utils.ZoomableScrollPane -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.tilegroups.TileGroupMap +import com.unciv.ui.components.tilegroups.TileGroup +import com.unciv.ui.components.tilegroups.TileSetStrings +import com.unciv.ui.components.tilegroups.WorldTileGroup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UnitGroup +import com.unciv.ui.components.ZoomableScrollPane +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.toLabel import com.unciv.utils.Log import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread @@ -102,7 +102,8 @@ class WorldMapHolder( // Interface for classes that contain the data required to draw a button interface ButtonDto // Contains the data required to draw a "move here" button - class MoveHereButtonDto(val unitToTurnsToDestination: HashMap, val tile: Tile) : ButtonDto + class MoveHereButtonDto(val unitToTurnsToDestination: HashMap, val tile: Tile) : + ButtonDto // Contains the data required to draw a "swap with" button class SwapWithButtonDto(val unit: MapUnit, val tile: Tile) : ButtonDto diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt similarity index 95% rename from core/src/com/unciv/ui/worldscreen/WorldScreen.kt rename to core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt index 3776156216..3ca8990683 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.Application import com.badlogic.gdx.Gdx @@ -13,7 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.badlogic.gdx.utils.Align import com.unciv.Constants -import com.unciv.MainMenuScreen +import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.UncivShowableException @@ -27,38 +27,38 @@ import com.unciv.logic.trade.TradeEvaluation import com.unciv.models.TutorialTrigger import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.cityscreen.CityScreen -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.cityscreen.CityScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.overviewscreen.EmpireOverviewScreen -import com.unciv.ui.pickerscreens.DiplomaticVoteResultScreen -import com.unciv.ui.pickerscreens.GreatPersonPickerScreen -import com.unciv.ui.pickerscreens.PolicyPickerScreen -import com.unciv.ui.pickerscreens.TechPickerScreen -import com.unciv.ui.popup.Popup -import com.unciv.ui.popup.ToastPopup -import com.unciv.ui.popup.hasOpenPopups -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.saves.QuickSave -import com.unciv.ui.saves.SaveGameScreen -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.victoryscreen.VictoryScreen -import com.unciv.ui.worldscreen.bottombar.BattleTable -import com.unciv.ui.worldscreen.bottombar.TileInfoTable -import com.unciv.ui.worldscreen.minimap.MinimapHolder -import com.unciv.ui.worldscreen.status.MultiplayerStatusButton -import com.unciv.ui.worldscreen.status.NextTurnButton -import com.unciv.ui.worldscreen.status.StatusButtons -import com.unciv.ui.worldscreen.unit.UnitTable -import com.unciv.ui.worldscreen.unit.actions.UnitActionsTable +import com.unciv.ui.screens.overviewscreen.EmpireOverviewScreen +import com.unciv.ui.screens.pickerscreens.DiplomaticVoteResultScreen +import com.unciv.ui.screens.pickerscreens.GreatPersonPickerScreen +import com.unciv.ui.screens.pickerscreens.PolicyPickerScreen +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.components.BaseScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.extensions.centerX +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.victoryscreen.VictoryScreen +import com.unciv.ui.screens.worldscreen.bottombar.BattleTable +import com.unciv.ui.screens.worldscreen.bottombar.TileInfoTable +import com.unciv.ui.screens.worldscreen.minimap.MinimapHolder +import com.unciv.ui.screens.worldscreen.status.MultiplayerStatusButton +import com.unciv.ui.screens.worldscreen.status.NextTurnButton +import com.unciv.ui.screens.worldscreen.status.StatusButtons +import com.unciv.ui.screens.worldscreen.unit.UnitTable +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsTable import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import com.unciv.utils.concurrency.launchOnThreadPool diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreenTopBar.kt similarity index 93% rename from core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt rename to core/src/com/unciv/ui/screens/worldscreen/WorldScreenTopBar.kt index 78ecd0c9f1..62f7cdd1c7 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreenTopBar.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -14,26 +14,26 @@ import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.stats.Stats import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.overviewscreen.EmpireOverviewScreen -import com.unciv.ui.pickerscreens.PolicyPickerScreen -import com.unciv.ui.pickerscreens.TechPickerScreen -import com.unciv.ui.popup.popups -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.MayaCalendar -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.colorFromRGB -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontColor -import com.unciv.ui.utils.extensions.setFontSize -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.victoryscreen.VictoryScreen -import com.unciv.ui.worldscreen.mainmenu.WorldScreenMenuPopup +import com.unciv.ui.screens.overviewscreen.EmpireOverviewScreen +import com.unciv.ui.screens.pickerscreens.PolicyPickerScreen +import com.unciv.ui.screens.pickerscreens.TechPickerScreen +import com.unciv.ui.popups.popups +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.MayaCalendar +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.colorFromRGB +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontColor +import com.unciv.ui.components.extensions.setFontSize +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.victoryscreen.VictoryScreen +import com.unciv.ui.screens.worldscreen.mainmenu.WorldScreenMenuPopup import kotlin.math.abs import kotlin.math.ceil import kotlin.math.max diff --git a/core/src/com/unciv/ui/worldscreen/ZoomButtonPair.kt b/core/src/com/unciv/ui/screens/worldscreen/ZoomButtonPair.kt similarity index 76% rename from core/src/com/unciv/ui/worldscreen/ZoomButtonPair.kt rename to core/src/com/unciv/ui/screens/worldscreen/ZoomButtonPair.kt index 6ed594731d..05c7d850b6 100644 --- a/core/src/com/unciv/ui/worldscreen/ZoomButtonPair.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/ZoomButtonPair.kt @@ -1,13 +1,13 @@ -package com.unciv.ui.worldscreen +package com.unciv.ui.screens.worldscreen import com.badlogic.gdx.scenes.scene2d.ui.Cell import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.ZoomableScrollPane -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setFontSize +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.ZoomableScrollPane +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setFontSize class ZoomButtonPair(private val mapHolder: ZoomableScrollPane) : Table(BaseScreen.skin) { init { diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTable.kt similarity index 96% rename from core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt rename to core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTable.kt index c6f6cb52e1..53186169f2 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.bottombar +package com.unciv.ui.screens.worldscreen.bottombar import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -19,18 +19,18 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.UnitGroup -import com.unciv.ui.utils.extensions.addBorderAllowOpacity -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.utils.extensions.toTextButton -import com.unciv.ui.worldscreen.WorldScreen -import com.unciv.ui.worldscreen.bottombar.BattleTableHelpers.flashWoundedCombatants -import com.unciv.ui.worldscreen.bottombar.BattleTableHelpers.getHealthBar +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.UnitGroup +import com.unciv.ui.components.extensions.addBorderAllowOpacity +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.worldscreen.WorldScreen +import com.unciv.ui.screens.worldscreen.bottombar.BattleTableHelpers.flashWoundedCombatants +import com.unciv.ui.screens.worldscreen.bottombar.BattleTableHelpers.getHealthBar import kotlin.math.max import kotlin.math.roundToInt diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTableHelpers.kt b/core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTableHelpers.kt similarity index 97% rename from core/src/com/unciv/ui/worldscreen/bottombar/BattleTableHelpers.kt rename to core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTableHelpers.kt index 33e4d922af..86b8c24e86 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTableHelpers.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTableHelpers.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.bottombar +package com.unciv.ui.screens.worldscreen.bottombar import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Interpolation @@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame import com.unciv.logic.battle.ICombatant import com.unciv.ui.images.ImageGetter -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.worldscreen.WorldScreen object BattleTableHelpers { diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt b/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt similarity index 81% rename from core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt rename to core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt index 5b69237b1f..941cccd03b 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.bottombar +package com.unciv.ui.screens.worldscreen.bottombar import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -7,14 +7,14 @@ import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.TileDescription -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.civilopedia.FormattedLine.IconDisplay -import com.unciv.ui.civilopedia.MarkupRenderer +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.FormattedLine.IconDisplay +import com.unciv.ui.screens.civilopediascreen.MarkupRenderer import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.addBorderAllowOpacity -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.addBorderAllowOpacity +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.toLabel class TileInfoTable(private val viewingCiv :Civilization) : Table(BaseScreen.skin) { init { diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt similarity index 83% rename from core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt rename to core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt index 806bddc3b4..239c65f794 100644 --- a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt @@ -1,19 +1,19 @@ -package com.unciv.ui.worldscreen.mainmenu +package com.unciv.ui.screens.worldscreen.mainmenu import com.badlogic.gdx.Gdx import com.unciv.UncivGame import com.unciv.models.metadata.GameSetupInfo import com.unciv.ui.audio.MusicTrackChooserFlags -import com.unciv.ui.civilopedia.CivilopediaScreen -import com.unciv.ui.newgamescreen.NewGameScreen -import com.unciv.ui.options.addMusicCurrentlyPlaying -import com.unciv.ui.options.addMusicPauseSlider -import com.unciv.ui.options.addMusicVolumeSlider -import com.unciv.ui.popup.Popup -import com.unciv.ui.saves.LoadGameScreen -import com.unciv.ui.saves.SaveGameScreen -import com.unciv.ui.victoryscreen.VictoryScreen -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.newgamescreen.NewGameScreen +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.victoryscreen.VictoryScreen +import com.unciv.ui.screens.worldscreen.WorldScreen class WorldScreenMenuPopup(val worldScreen: WorldScreen) : Popup(worldScreen) { init { diff --git a/core/src/com/unciv/ui/worldscreen/minimap/MapOverlayToggleButton.kt b/core/src/com/unciv/ui/screens/worldscreen/minimap/MapOverlayToggleButton.kt similarity index 92% rename from core/src/com/unciv/ui/worldscreen/minimap/MapOverlayToggleButton.kt rename to core/src/com/unciv/ui/screens/worldscreen/minimap/MapOverlayToggleButton.kt index 7b85119398..89fb0295fb 100644 --- a/core/src/com/unciv/ui/worldscreen/minimap/MapOverlayToggleButton.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/minimap/MapOverlayToggleButton.kt @@ -1,12 +1,12 @@ -package com.unciv.ui.worldscreen.minimap +package com.unciv.ui.screens.worldscreen.minimap import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Image import com.unciv.UncivGame import com.unciv.ui.images.IconCircleGroup -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle /** * Class that unifies the behaviour of the little green map overlay toggle buttons shown next to the minimap. diff --git a/core/src/com/unciv/ui/worldscreen/minimap/Minimap.kt b/core/src/com/unciv/ui/screens/worldscreen/minimap/Minimap.kt similarity index 97% rename from core/src/com/unciv/ui/worldscreen/minimap/Minimap.kt rename to core/src/com/unciv/ui/screens/worldscreen/minimap/Minimap.kt index b388047372..cf90551251 100644 --- a/core/src/com/unciv/ui/worldscreen/minimap/Minimap.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/minimap/Minimap.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.minimap +package com.unciv.ui.screens.worldscreen.minimap import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.math.Rectangle @@ -11,9 +11,9 @@ import com.unciv.logic.map.MapShape import com.unciv.logic.map.MapSize import com.unciv.ui.images.ClippingImage import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.* -import com.unciv.ui.utils.extensions.* -import com.unciv.ui.worldscreen.WorldMapHolder +import com.unciv.ui.components.* +import com.unciv.ui.components.extensions.* +import com.unciv.ui.screens.worldscreen.WorldMapHolder import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/ui/worldscreen/minimap/MinimapHolder.kt b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapHolder.kt similarity index 96% rename from core/src/com/unciv/ui/worldscreen/minimap/MinimapHolder.kt rename to core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapHolder.kt index 2abad2ab9f..4b8c12c033 100644 --- a/core/src/com/unciv/ui/worldscreen/minimap/MinimapHolder.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapHolder.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.minimap +package com.unciv.ui.screens.worldscreen.minimap import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.Batch @@ -7,8 +7,8 @@ import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.worldscreen.WorldMapHolder +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.screens.worldscreen.WorldMapHolder class MinimapHolder(val mapHolder: WorldMapHolder) : Table() { private val worldScreen = mapHolder.worldScreen diff --git a/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTile.kt similarity index 96% rename from core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt rename to core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTile.kt index 5565f088c7..5ccecdf71a 100644 --- a/core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTile.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.minimap +package com.unciv.ui.screens.worldscreen.minimap import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -11,8 +11,8 @@ import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.tile.Tile import com.unciv.ui.images.IconCircleGroup import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.surroundWithCircle import kotlin.math.PI import kotlin.math.atan diff --git a/core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt similarity index 97% rename from core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusButton.kt rename to core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt index 76bce9a109..aafff43c88 100644 --- a/core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusButton.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.status +package com.unciv.ui.screens.worldscreen.status import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor @@ -22,9 +22,9 @@ import com.unciv.logic.multiplayer.MultiplayerGameUpdated import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.logic.multiplayer.isUsersTurn import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.setSize +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.setSize import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread import kotlinx.coroutines.Job diff --git a/core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusPopup.kt similarity index 79% rename from core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusPopup.kt rename to core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusPopup.kt index 91a9623958..7d21521e9d 100644 --- a/core/src/com/unciv/ui/worldscreen/status/MultiplayerStatusPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusPopup.kt @@ -1,14 +1,14 @@ -package com.unciv.ui.worldscreen.status +package com.unciv.ui.screens.worldscreen.status import com.unciv.UncivGame import com.unciv.logic.multiplayer.OnlineMultiplayerGame import com.unciv.models.translations.tr -import com.unciv.ui.multiplayer.GameList -import com.unciv.ui.multiplayer.MultiplayerHelpers -import com.unciv.ui.pickerscreens.PickerPane -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.extensions.onClick +import com.unciv.ui.screens.multiplayerscreens.GameList +import com.unciv.ui.screens.multiplayerscreens.MultiplayerHelpers +import com.unciv.ui.screens.pickerscreens.PickerPane +import com.unciv.ui.popups.Popup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.extensions.onClick class MultiplayerStatusPopup( screen: BaseScreen, diff --git a/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt similarity index 90% rename from core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt rename to core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt index ceba851503..b1f82d36c3 100644 --- a/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.status +package com.unciv.ui.screens.worldscreen.status import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color @@ -6,25 +6,25 @@ import com.unciv.Constants import com.unciv.logic.civilization.managers.ReligionState import com.unciv.models.ruleset.BeliefType import com.unciv.models.translations.tr -import com.unciv.ui.cityscreen.CityScreen +import com.unciv.ui.screens.cityscreen.CityScreen import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.DiplomaticVotePickerScreen -import com.unciv.ui.pickerscreens.PantheonPickerScreen -import com.unciv.ui.pickerscreens.PolicyPickerScreen -import com.unciv.ui.pickerscreens.ReligiousBeliefsPickerScreen -import com.unciv.ui.pickerscreens.TechPickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.hasOpenPopups -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.KeyShortcut -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.enable -import com.unciv.ui.utils.extensions.isEnabled -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.setSize -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.pickerscreens.DiplomaticVotePickerScreen +import com.unciv.ui.screens.pickerscreens.PantheonPickerScreen +import com.unciv.ui.screens.pickerscreens.PolicyPickerScreen +import com.unciv.ui.screens.pickerscreens.ReligiousBeliefsPickerScreen +import com.unciv.ui.screens.pickerscreens.TechPickerScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.hasOpenPopups +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.KeyShortcut +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.enable +import com.unciv.ui.components.extensions.isEnabled +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.components.extensions.setSize +import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.utils.concurrency.Concurrency import com.unciv.utils.concurrency.launchOnGLThread diff --git a/core/src/com/unciv/ui/worldscreen/status/StatusButtons.kt b/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt similarity index 94% rename from core/src/com/unciv/ui/worldscreen/status/StatusButtons.kt rename to core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt index a6c46cb40f..de19ae2616 100644 --- a/core/src/com/unciv/ui/worldscreen/status/StatusButtons.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.status +package com.unciv.ui.screens.worldscreen.status import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup import com.badlogic.gdx.utils.Disposable diff --git a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt similarity index 90% rename from core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt index 106e8913a6..4d5d3aef6b 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/IdleUnitButton.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit +package com.unciv.ui.screens.worldscreen.unit import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -6,9 +6,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.logic.map.mapunit.MapUnit import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.pad -import com.unciv.ui.worldscreen.WorldMapHolder +import com.unciv.ui.screens.worldscreen.WorldMapHolder +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.pad class IdleUnitButton ( internal val unitTable: UnitTable, diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt similarity index 95% rename from core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt index dfa1065096..47ab86cae8 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit +package com.unciv.ui.screens.worldscreen.unit import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input @@ -14,20 +14,20 @@ import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.civilopedia.CivilopediaCategories -import com.unciv.ui.civilopedia.CivilopediaScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen import com.unciv.ui.images.ImageGetter -import com.unciv.ui.pickerscreens.CityRenamePopup -import com.unciv.ui.pickerscreens.PromotionPickerScreen -import com.unciv.ui.pickerscreens.UnitRenamePopup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.UnitGroup -import com.unciv.ui.utils.extensions.addSeparator -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.darken -import com.unciv.ui.utils.extensions.onClick -import com.unciv.ui.utils.extensions.toLabel -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.screens.pickerscreens.CityRenamePopup +import com.unciv.ui.screens.pickerscreens.PromotionPickerScreen +import com.unciv.ui.screens.pickerscreens.UnitRenamePopup +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.UnitGroup +import com.unciv.ui.components.extensions.addSeparator +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.darken +import com.unciv.ui.components.extensions.onClick +import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.screens.worldscreen.WorldScreen class UnitTable(val worldScreen: WorldScreen) : Table() { private val prevIdleUnitButton = IdleUnitButton(this,worldScreen.mapHolder,true) diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt similarity index 98% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt index 342fb6ee1f..e3c33c3647 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActions.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.unciv.Constants import com.unciv.UncivGame @@ -20,13 +20,13 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.pickerscreens.ImprovementPickerScreen -import com.unciv.ui.pickerscreens.PromotionPickerScreen -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.hasOpenPopups -import com.unciv.ui.utils.Fonts -import com.unciv.ui.worldscreen.WorldScreen -import com.unciv.ui.worldscreen.unit.UnitTable +import com.unciv.ui.screens.pickerscreens.ImprovementPickerScreen +import com.unciv.ui.screens.pickerscreens.PromotionPickerScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.hasOpenPopups +import com.unciv.ui.components.Fonts +import com.unciv.ui.screens.worldscreen.WorldScreen +import com.unciv.ui.screens.worldscreen.unit.UnitTable object UnitActions { diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsGreatPerson.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsGreatPerson.kt similarity index 98% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsGreatPerson.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsGreatPerson.kt index a79442ee9a..160eda4b77 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsGreatPerson.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsGreatPerson.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.unciv.logic.civilization.NotificationCategory import com.unciv.logic.civilization.NotificationIcon @@ -8,7 +8,7 @@ import com.unciv.models.UnitAction import com.unciv.models.UnitActionType import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent import kotlin.math.min object UnitActionsGreatPerson { diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsPillage.kt similarity index 96% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsPillage.kt index 0e5c63cb0d..cf510201c6 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsPillage.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.unciv.UncivGame import com.unciv.logic.civilization.NotificationCategory @@ -10,9 +10,9 @@ import com.unciv.models.UnitActionType import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats -import com.unciv.ui.popup.ConfirmPopup -import com.unciv.ui.popup.hasOpenPopups -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.popups.ConfirmPopup +import com.unciv.ui.popups.hasOpenPopups +import com.unciv.ui.screens.worldscreen.WorldScreen import kotlin.random.Random object UnitActionsPillage { diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsReligion.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt similarity index 98% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsReligion.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt index 7fa53802d9..7630d8b7f5 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsReligion.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.unciv.Constants import com.unciv.logic.city.City @@ -9,7 +9,7 @@ import com.unciv.models.UnitAction import com.unciv.models.UnitActionType import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat -import com.unciv.ui.utils.extensions.toPercent +import com.unciv.ui.components.extensions.toPercent object UnitActionsReligion { diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsTable.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsTable.kt similarity index 86% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsTable.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsTable.kt index a7961e2097..3d7a3849a5 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsTable.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button @@ -8,12 +8,12 @@ import com.unciv.logic.map.mapunit.MapUnit import com.unciv.models.UnitAction import com.unciv.models.UnitActionType import com.unciv.ui.images.IconTextButton -import com.unciv.ui.utils.KeyCharAndCode -import com.unciv.ui.utils.UncivTooltip.Companion.addTooltip -import com.unciv.ui.utils.extensions.disable -import com.unciv.ui.utils.extensions.keyShortcuts -import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.UncivTooltip.Companion.addTooltip +import com.unciv.ui.components.extensions.disable +import com.unciv.ui.components.extensions.keyShortcuts +import com.unciv.ui.components.extensions.onActivation +import com.unciv.ui.screens.worldscreen.WorldScreen class UnitActionsTable(val worldScreen: WorldScreen) : Table() { diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsUpgrade.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsUpgrade.kt similarity index 98% rename from core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsUpgrade.kt rename to core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsUpgrade.kt index 560e2b81bd..2669317d3b 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsUpgrade.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsUpgrade.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.worldscreen.unit.actions +package com.unciv.ui.screens.worldscreen.unit.actions import com.unciv.logic.map.mapunit.MapUnit import com.unciv.models.Counter diff --git a/core/src/com/unciv/ui/tutorials/TutorialRender.kt b/core/src/com/unciv/ui/tutorials/TutorialRender.kt deleted file mode 100644 index efed197c5e..0000000000 --- a/core/src/com/unciv/ui/tutorials/TutorialRender.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.unciv.ui.tutorials - -import com.badlogic.gdx.Gdx -import com.unciv.Constants -import com.unciv.models.TutorialTrigger -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.popup.Popup -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.KeyCharAndCode - -data class TutorialForRender(val tutorial: TutorialTrigger, val texts: List) - -class TutorialRender(private val screen: BaseScreen) { - - fun showTutorial(tutorial: TutorialForRender, closeAction: () -> Unit) { - showDialog(tutorial.tutorial.name, tutorial.texts, closeAction) - } - - private fun showDialog(tutorialName: String, texts: List, closeAction: () -> Unit) { - if (texts.isEmpty()) return closeAction() - - val tutorialPopup = Popup(screen) - tutorialPopup.name = Constants.tutorialPopupNamePrefix + tutorialName - - if (Gdx.files.internal("ExtraImages/$tutorialName").exists()) { - tutorialPopup.add(ImageGetter.getExternalImage(tutorialName)).row() - } - - tutorialPopup.addGoodSizedLabel(texts[0]).row() - - tutorialPopup.addCloseButton(additionalKey = KeyCharAndCode.SPACE) { - tutorialPopup.remove() - showDialog(tutorialName, texts.subList(1, texts.size), closeAction) - } - tutorialPopup.open() - } -} diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index b1fd79fc82..6ac5a0952b 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -15,7 +15,7 @@ import com.unciv.logic.files.SETTINGS_FILE_NAME import com.unciv.logic.files.UncivFiles import com.unciv.models.metadata.ScreenSize import com.unciv.models.metadata.WindowState -import com.unciv.ui.utils.Fonts +import com.unciv.ui.components.Fonts import com.unciv.utils.Log import com.unciv.utils.debug import java.awt.GraphicsEnvironment diff --git a/desktop/src/com/unciv/app/desktop/HardenGdxAudio.kt b/desktop/src/com/unciv/app/desktop/HardenGdxAudio.kt index 7b268c88c6..b6011e1125 100644 --- a/desktop/src/com/unciv/app/desktop/HardenGdxAudio.kt +++ b/desktop/src/com/unciv/app/desktop/HardenGdxAudio.kt @@ -6,7 +6,7 @@ import com.badlogic.gdx.backends.lwjgl3.audio.OpenALLwjgl3Audio import com.badlogic.gdx.backends.lwjgl3.audio.OpenALMusic import com.badlogic.gdx.backends.lwjgl3.audio.mock.MockAudio import com.badlogic.gdx.utils.Array -import com.unciv.ui.utils.AudioExceptionHelper +import com.unciv.ui.components.AudioExceptionHelper /** * Problem: Not all exceptions playing Music can be caught on the desktop platform using a try-catch around the play method. diff --git a/desktop/src/com/unciv/app/desktop/NativeFontDesktop.kt b/desktop/src/com/unciv/app/desktop/NativeFontDesktop.kt index 46f4f1fe2d..1060ae1b44 100755 --- a/desktop/src/com/unciv/app/desktop/NativeFontDesktop.kt +++ b/desktop/src/com/unciv/app/desktop/NativeFontDesktop.kt @@ -1,8 +1,8 @@ package com.unciv.app.desktop import com.badlogic.gdx.graphics.Pixmap -import com.unciv.ui.utils.FontFamilyData -import com.unciv.ui.utils.NativeFontImplementation +import com.unciv.ui.components.FontFamilyData +import com.unciv.ui.components.NativeFontImplementation import java.awt.* import java.awt.image.BufferedImage import java.util.* diff --git a/desktop/src/com/unciv/app/desktop/PlatformSpecificHelpersDesktop.kt b/desktop/src/com/unciv/app/desktop/PlatformSpecificHelpersDesktop.kt index 6fad79e085..9c1fe2cb12 100644 --- a/desktop/src/com/unciv/app/desktop/PlatformSpecificHelpersDesktop.kt +++ b/desktop/src/com/unciv/app/desktop/PlatformSpecificHelpersDesktop.kt @@ -1,7 +1,7 @@ package com.unciv.app.desktop import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration -import com.unciv.ui.utils.GeneralPlatformSpecificHelpers +import com.unciv.ui.components.GeneralPlatformSpecificHelpers class PlatformSpecificHelpersDesktop(config: Lwjgl3ApplicationConfiguration) : GeneralPlatformSpecificHelpers { val turnNotifier = MultiplayerTurnNotifierDesktop() diff --git a/tests/src/com/unciv/dev/FasterUIDevelopment.kt b/tests/src/com/unciv/dev/FasterUIDevelopment.kt index 3ad22ec7b4..bfbbbffaed 100644 --- a/tests/src/com/unciv/dev/FasterUIDevelopment.kt +++ b/tests/src/com/unciv/dev/FasterUIDevelopment.kt @@ -16,12 +16,12 @@ import com.unciv.logic.files.UncivFiles import com.unciv.logic.multiplayer.throttle import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageWithCustomSize -import com.unciv.ui.utils.BaseScreen -import com.unciv.ui.utils.FontFamilyData -import com.unciv.ui.utils.Fonts -import com.unciv.ui.utils.NativeFontImplementation -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.toLabel +import com.unciv.ui.components.BaseScreen +import com.unciv.ui.components.FontFamilyData +import com.unciv.ui.components.Fonts +import com.unciv.ui.components.NativeFontImplementation +import com.unciv.ui.components.extensions.center +import com.unciv.ui.components.extensions.toLabel import com.unciv.utils.concurrency.Concurrency import java.awt.Font import java.awt.RenderingHints diff --git a/tests/src/com/unciv/uniques/GlobalUniquesTests.kt b/tests/src/com/unciv/uniques/GlobalUniquesTests.kt index 3eb2ecff9e..a2b72b7cd3 100644 --- a/tests/src/com/unciv/uniques/GlobalUniquesTests.kt +++ b/tests/src/com/unciv/uniques/GlobalUniquesTests.kt @@ -7,7 +7,7 @@ import com.unciv.logic.map.tile.RoadStatus import com.unciv.models.ruleset.BeliefType import com.unciv.models.stats.Stats import com.unciv.testing.GdxTestRunner -import com.unciv.ui.worldscreen.unit.actions.UnitActionsPillage +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsPillage import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/tests/src/com/unciv/uniques/UnitUniquesTests.kt b/tests/src/com/unciv/uniques/UnitUniquesTests.kt index 9a9bb415ec..5af51f29c1 100644 --- a/tests/src/com/unciv/uniques/UnitUniquesTests.kt +++ b/tests/src/com/unciv/uniques/UnitUniquesTests.kt @@ -2,7 +2,7 @@ package com.unciv.uniques import com.badlogic.gdx.math.Vector2 import com.unciv.testing.GdxTestRunner -import com.unciv.ui.worldscreen.unit.actions.UnitActions +import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions import org.junit.Assert.assertNotNull import org.junit.Before import org.junit.Test