From ad75ad916b7e597daa815d7a8af8f1642ce99979 Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Mon, 31 Jul 2023 20:54:55 +0200 Subject: [PATCH] Move Mod Manager to prepare class splits (#9863) --- .../com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt | 2 +- .../{pickerscreens => modmanager}/ModManagementOptions.kt | 3 ++- .../{pickerscreens => modmanager}/ModManagementScreen.kt | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) rename core/src/com/unciv/ui/screens/{pickerscreens => modmanager}/ModManagementOptions.kt (99%) rename core/src/com/unciv/ui/screens/{pickerscreens => modmanager}/ModManagementScreen.kt (99%) diff --git a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt index e947fdf481..b0811f0413 100644 --- a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt @@ -47,7 +47,7 @@ import com.unciv.ui.screens.mapeditorscreen.EditorMapHolder import com.unciv.ui.screens.mapeditorscreen.MapEditorScreen import com.unciv.ui.screens.multiplayerscreens.MultiplayerScreen import com.unciv.ui.screens.newgamescreen.NewGameScreen -import com.unciv.ui.screens.pickerscreens.ModManagementScreen +import com.unciv.ui.screens.modmanager.ModManagementScreen import com.unciv.ui.screens.savescreens.LoadGameScreen import com.unciv.ui.screens.savescreens.QuickSave import com.unciv.ui.screens.worldscreen.BackgroundActor diff --git a/core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt b/core/src/com/unciv/ui/screens/modmanager/ModManagementOptions.kt similarity index 99% rename from core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt rename to core/src/com/unciv/ui/screens/modmanager/ModManagementOptions.kt index 677d145a39..f9984df753 100644 --- a/core/src/com/unciv/ui/screens/pickerscreens/ModManagementOptions.kt +++ b/core/src/com/unciv/ui/screens/modmanager/ModManagementOptions.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.screens.pickerscreens +package com.unciv.ui.screens.modmanager import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable @@ -23,6 +23,7 @@ import com.unciv.ui.components.input.onChange import com.unciv.ui.components.extensions.surroundWithCircle import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toTextButton +import com.unciv.ui.screens.pickerscreens.Github import kotlin.math.sign /** diff --git a/core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt b/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt similarity index 99% rename from core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt rename to core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt index b654f1b4e9..c8706147b2 100644 --- a/core/src/com/unciv/ui/screens/pickerscreens/ModManagementScreen.kt +++ b/core/src/com/unciv/ui/screens/modmanager/ModManagementScreen.kt @@ -1,4 +1,4 @@ -package com.unciv.ui.screens.pickerscreens +package com.unciv.ui.screens.modmanager import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color @@ -46,7 +46,9 @@ import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.basescreen.RecreateOnResize import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen import com.unciv.ui.screens.pickerscreens.Github.repoNameToFolderName -import com.unciv.ui.screens.pickerscreens.ModManagementOptions.SortType +import com.unciv.ui.screens.modmanager.ModManagementOptions.SortType +import com.unciv.ui.screens.pickerscreens.Github +import com.unciv.ui.screens.pickerscreens.PickerScreen import com.unciv.utils.Concurrency import com.unciv.utils.Log import com.unciv.utils.launchOnGLThread