refactor(download): 重构下载模块包结构和类名

ShirosakiMio · ShirosakiMio · commit 25d581b05ce4 · 2026-01-30T10:24:11.000+08:00
- 将通用组件移至 common 包 (DependencyAdapter, DownloadAddonDialog, DownloadPage 等)
- 将模组包相关组件移至 modpack 包 (LocalModpackPage, ModpackDownloadPage 等)
- 将版本安装相关组件移至 version 包 (InstallerListPage, VersionInstallPage 等)
- 重命名 InstallersPage 为 VersionInstallInfoPage
- 重命名 InstallVersionPage 为 VersionInstallPage
- 更新所有相关的导入路径和引用
- 修改 DownloadPageManager 中的属性名以匹配新类名
- 调整访问修饰符以便子类继承使用
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/DownloadPageManager.kt b/FCL/src/main/java/com/tungsten/fcl/ui/download/DownloadPageManager.kt
@@ -5,6 +5,9 @@ import com.tungsten.fcl.R
 import com.tungsten.fcl.setting.Profile
 import com.tungsten.fcl.ui.PageManager
 import com.tungsten.fcl.ui.UIListener
+import com.tungsten.fcl.ui.download.common.DownloadPage
+import com.tungsten.fcl.ui.download.modpack.ModpackDownloadPage
+import com.tungsten.fcl.ui.download.version.VersionInstallPage
 import com.tungsten.fcl.ui.manage.ManageUI.VersionLoadable
 import com.tungsten.fclcore.mod.curse.CurseForgeRemoteModRepository
 import com.tungsten.fcllibrary.component.ui.FCLCommonPage
@@ -29,7 +32,7 @@ class DownloadPageManager(
 
     var profile: Profile? = null
     var version: String? = null
-    private lateinit var installVersionPage: InstallVersionPage
+    private lateinit var versionInstallPage: VersionInstallPage
     private val downloadModpackPage: ModpackDownloadPage by lazy {
         ModpackDownloadPage(context, PAGE_ID_DOWNLOAD_MODPACK, parent, R.layout.page_download)
     }
@@ -67,7 +70,7 @@ class DownloadPageManager(
     }
 
     override fun init(listener: UIListener?) {
-        installVersionPage = InstallVersionPage(
+        versionInstallPage = VersionInstallPage(
             context,
             PAGE_ID_DOWNLOAD_GAME,
             parent,
@@ -78,7 +81,7 @@ class DownloadPageManager(
 
     override fun getAllPages(): ArrayList<FCLCommonPage> {
         return ArrayList<FCLCommonPage>().apply {
-            add(installVersionPage)
+            add(versionInstallPage)
         }
     }
 
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/ModDownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/ModDownloadPage.java
@@ -9,6 +9,7 @@
 import com.tungsten.fcl.game.LocalizedRemoteModRepository;
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.setting.Profiles;
+import com.tungsten.fcl.ui.download.common.DownloadPage;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fclcore.mod.ModLoaderType;
 import com.tungsten.fclcore.mod.ModManager;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/ResourcePackDownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/ResourcePackDownloadPage.java
@@ -4,6 +4,7 @@
 
 import com.tungsten.fcl.R;
 import com.tungsten.fcl.game.LocalizedRemoteModRepository;
+import com.tungsten.fcl.ui.download.common.DownloadPage;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fclcore.mod.RemoteModRepository;
 import com.tungsten.fclcore.mod.curse.CurseForgeRemoteModRepository;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/ShaderPackDownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/ShaderPackDownloadPage.java
@@ -4,6 +4,7 @@
 
 import com.tungsten.fcl.R;
 import com.tungsten.fcl.game.LocalizedRemoteModRepository;
+import com.tungsten.fcl.ui.download.common.DownloadPage;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fclcore.mod.RemoteModRepository;
 import com.tungsten.fclcore.mod.curse.CurseForgeRemoteModRepository;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DependencyAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DependencyAdapter.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DownloadAddonDialog.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DownloadAddonDialog.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.content.Context;
 import android.view.View;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/DownloadPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import static com.tungsten.fcl.ui.download.DownloadPageManager.PAGE_ID_DOWNLOAD_MOD;
 import static com.tungsten.fcl.ui.download.DownloadPageManager.PAGE_ID_DOWNLOAD_MODPACK;
@@ -23,9 +23,11 @@
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.PageManager;
 import com.tungsten.fcl.ui.TaskDialog;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
+import com.tungsten.fcl.ui.download.ModDownloadPage;
+import com.tungsten.fcl.ui.download.TranslationDialog;
 import com.tungsten.fcl.ui.manage.ManageUI;
 import com.tungsten.fcl.ui.version.Versions;
-import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fcl.util.FXUtils;
 import com.tungsten.fcl.util.TaskCancellationAction;
 import com.tungsten.fclcore.download.DownloadProvider;
@@ -71,9 +73,6 @@
 import java.util.concurrent.CancellationException;
 import java.util.stream.Collectors;
 
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-
 public class DownloadPage extends FCLCommonPage implements ManageUI.VersionLoadable, View.OnClickListener {
 
     protected RemoteModRepository repository;
@@ -112,8 +111,8 @@ public class DownloadPage extends FCLCommonPage implements ManageUI.VersionLoada
     private FCLProgressBar progressBar;
     private FCLImageButton retry;
 
-    PageDownloadBinding binding;
-    ModLoaderType selectedModLoader;
+    protected PageDownloadBinding binding;
+    protected ModLoaderType selectedModLoader;
     private final DownloadProvider downloadProvider;
 
     public void setLoading(boolean loading) {
@@ -439,7 +438,7 @@ private void refreshCategory(boolean search) {
                 }).start();
     }
 
-    void showTranslationDialog() {
+    protected void showTranslationDialog() {
         new TranslationDialog(getContext(), repository, s -> {
             nameEditText.setText(s);
             search();
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/ModGameVersionAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/ModGameVersionAdapter.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.animation.AnimatorInflater;
 import android.annotation.SuppressLint;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/ModVersionAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/ModVersionAdapter.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.animation.AnimatorInflater;
 import android.annotation.SuppressLint;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModDownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModDownloadPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -13,6 +13,7 @@
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.PageManager;
 import com.tungsten.fcl.ui.UIManager;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fclcore.mod.RemoteMod;
 import com.tungsten.fclcore.task.Schedulers;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModInfoPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModInfoPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -14,6 +14,9 @@
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.setting.Profiles;
 import com.tungsten.fcl.ui.PageManager;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
+import com.tungsten.fcl.ui.download.ModDownloadPage;
+import com.tungsten.fcl.ui.download.modpack.ModpackDownloadPage;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fcl.util.ModTranslations;
 import com.tungsten.fclcore.download.LibraryAnalyzer;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModListAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModListAdapter.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,6 +8,7 @@
 import com.bumptech.glide.Glide;
 import com.mio.util.AnimUtil;
 import com.tungsten.fcl.R;
+import com.tungsten.fcl.ui.download.ModDownloadPage;
 import com.tungsten.fcl.util.ModTranslations;
 import com.tungsten.fclcore.mod.LocalModFile;
 import com.tungsten.fclcore.mod.ModManager;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModScreenshotAdapter.kt b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModScreenshotAdapter.kt
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download
+package com.tungsten.fcl.ui.download.common
 
 import android.content.Context
 import android.graphics.drawable.Drawable
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModVersionPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/common/RemoteModVersionPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.common;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,6 +10,7 @@
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.PageManager;
 import com.tungsten.fcl.ui.TaskDialog;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.util.RequestCodes;
 import com.tungsten.fcl.util.TaskCancellationAction;
 import com.tungsten.fclcore.mod.RemoteMod;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/LocalModpackPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/LocalModpackPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import static com.tungsten.fclcore.util.Logging.LOG;
 
@@ -13,6 +13,7 @@
 import com.tungsten.fcl.game.ModpackHelper;
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.setting.Profiles;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.ui.manage.ManagePageManager;
 import com.tungsten.fclcore.fakefx.beans.property.BooleanProperty;
 import com.tungsten.fclcore.fakefx.beans.property.SimpleBooleanProperty;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackDownloadPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackDownloadPage.java
@@ -1,10 +1,11 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.content.Context;
 import android.view.View;
 
 import com.tungsten.fcl.R;
 import com.tungsten.fcl.game.LocalizedRemoteModRepository;
+import com.tungsten.fcl.ui.download.common.DownloadPage;
 import com.tungsten.fcl.ui.version.Versions;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fclcore.mod.RemoteModRepository;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackInstaller.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackInstaller.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.content.Context;
 
@@ -9,6 +9,8 @@
 import com.tungsten.fcl.game.ModpackHelper;
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.TaskDialog;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
+import com.tungsten.fcl.ui.download.version.VersionInstallInfoPage;
 import com.tungsten.fcl.ui.manage.ManagePageManager;
 import com.tungsten.fcl.util.TaskCancellationAction;
 import com.tungsten.fclcore.mod.MismatchedModpackTypeException;
@@ -83,7 +85,7 @@ public void onStop(boolean success, TaskExecutor executor) {
                                     builder1.create().show();
                                 }
                             } else {
-                                InstallersPage.alertFailureMessage(context, executor.getException(), () -> {});
+                                VersionInstallInfoPage.alertFailureMessage(context, executor.getException(), () -> {});
                             }
                         }
 
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackSelectionPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackSelectionPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.app.Activity;
 import android.content.Context;
@@ -12,6 +12,7 @@
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.PageManager;
 import com.tungsten.fcl.ui.TaskDialog;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.ui.manage.ManagePageManager;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fcl.util.RequestCodes;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackUrlDialog.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/ModpackUrlDialog.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.content.Context;
 import android.view.View;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/RemoteModpackPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/modpack/RemoteModpackPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.modpack;
 
 import android.content.Context;
 import android.text.Html;
@@ -8,6 +8,7 @@
 import com.tungsten.fcl.R;
 import com.tungsten.fcl.game.FCLGameRepository;
 import com.tungsten.fcl.setting.Profile;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.ui.manage.ManagePageManager;
 import com.tungsten.fclcore.mod.Modpack;
 import com.tungsten.fclcore.mod.server.ServerModpackManifest;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/version/InstallerListPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/version/InstallerListPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.version;
 
 import static com.tungsten.fclcore.util.Logging.LOG;
 
@@ -26,7 +26,7 @@
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class InstallerVersionPage extends FCLTempPage implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
+public class InstallerListPage extends FCLTempPage implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
 
     private final String gameVersion;
     private final String libraryId;
@@ -41,7 +41,7 @@ public class InstallerVersionPage extends FCLTempPage implements View.OnClickLis
     private FCLProgressBar progressBar;
     private ListView listView;
 
-    public InstallerVersionPage(Context context, int id, FCLUILayout parent, int resId, String gameVersion, String libraryId, Callback callback) {
+    public InstallerListPage(Context context, int id, FCLUILayout parent, int resId, String gameVersion, String libraryId, Callback callback) {
         super(context, id, parent, resId);
         this.gameVersion = gameVersion;
         this.libraryId = libraryId;
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/version/RemoteVersionListAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/version/RemoteVersionListAdapter.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.version;
 
 import static com.tungsten.fcllibrary.util.LocaleUtils.formatDateTime;
 
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/version/VersionInstallInfoPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/version/VersionInstallInfoPage.java
@@ -1,4 +1,4 @@
-package com.tungsten.fcl.ui.download;
+package com.tungsten.fcl.ui.download.version;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -19,6 +19,7 @@
 import com.tungsten.fcl.ui.InstallerItem;
 import com.tungsten.fcl.ui.PageManager;
 import com.tungsten.fcl.ui.TaskDialog;
+import com.tungsten.fcl.ui.download.DownloadPageManager;
 import com.tungsten.fcl.util.AndroidUtils;
 import com.tungsten.fcl.util.TaskCancellationAction;
 import com.tungsten.fclcore.download.ArtifactMalformedException;
@@ -54,7 +55,7 @@
 import java.util.concurrent.CancellationException;
 import java.util.zip.ZipException;
 
-public class InstallersPage extends FCLTempPage implements View.OnClickListener {
+public class VersionInstallInfoPage extends FCLTempPage implements View.OnClickListener {
 
     private final String gameVersion;
     private InstallerItem.InstallerItemGroup group;
@@ -66,7 +67,7 @@ public class InstallersPage extends FCLTempPage implements View.OnClickListener
     private FCLImageButton install;
     private boolean nameManuallyModified = false;
 
-    public InstallersPage(Context context, int id, FCLUILayout parent, int resId, final String gameVersion) {
+    public VersionInstallInfoPage(Context context, int id, FCLUILayout parent, int resId, final String gameVersion) {
         super(context, id, parent, resId);
         this.gameVersion = gameVersion;
         onCreate(gameVersion);
@@ -122,7 +123,7 @@ public void afterTextChanged(Editable s) {
                 }
 
                 if (library.incompatibleLibraryName.get() == null) {
-                    InstallerVersionPage page = new InstallerVersionPage(getContext(), PageManager.PAGE_ID_TEMP, getParent(), R.layout.page_install_version, gameVersion, libraryId, remoteVersion -> {
+                    InstallerListPage page = new InstallerListPage(getContext(), PageManager.PAGE_ID_TEMP, getParent(), R.layout.page_install_version, gameVersion, libraryId, remoteVersion -> {
                         map.put(libraryId, remoteVersion);
                         refreshVersionName();
                         DownloadPageManager.getInstance().dismissCurrentTempPage();
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/version/VersionInstallPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/version/VersionInstallPage.java
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/manage/InstallerListPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/manage/InstallerListPage.java
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/version/Versions.java b/FCL/src/main/java/com/tungsten/fcl/ui/version/Versions.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.tungsten.fcl.ui.download;`
	`1`	`+package com.tungsten.fcl.ui.download.common;`
`2`	`2`
`3`	`3`	`import android.annotation.SuppressLint;`
`4`	`4`	`import android.content.Context;`