Skip to content

Commit f2127e1

Browse files
committed
交换“游戏设置”与“管理版本”的位置
1 parent 877cf00 commit f2127e1

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

FCL/src/main/java/com/tungsten/fcl/ui/manage/ManagePageManager.kt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ class ManagePageManager(
2828
var profile: Profile? = null
2929
var version: String? = null
3030

31-
private lateinit var managePage: ManagePage
32-
private val versionSettingPage: VersionSettingPage by lazy {
33-
VersionSettingPage(
34-
context,
35-
PAGE_ID_MANAGE_SETTING,
36-
parent,
37-
R.layout.page_version_setting,
38-
false
39-
)
31+
private lateinit var versionSettingPage: VersionSettingPage
32+
private val managePage: ManagePage by lazy {
33+
ManagePage(context, PAGE_ID_MANAGE_MANAGE, parent, R.layout.page_manage_version)
4034
}
4135
private val installerListPage: InstallerListPage by lazy {
4236
InstallerListPage(
@@ -68,20 +62,25 @@ class ManagePageManager(
6862
}
6963

7064
override fun init(listener: UIListener?) {
71-
managePage =
72-
ManagePage(context, PAGE_ID_MANAGE_MANAGE, parent, R.layout.page_manage_version)
65+
versionSettingPage = VersionSettingPage(
66+
context,
67+
PAGE_ID_MANAGE_SETTING,
68+
parent,
69+
R.layout.page_version_setting,
70+
false
71+
)
7372
listener?.onLoad()
7473
}
7574

7675
override fun getAllPages(): ArrayList<FCLCommonPage> {
7776
return ArrayList<FCLCommonPage>().apply {
78-
add(managePage)
77+
add(versionSettingPage)
7978
}
8079
}
8180

8281
override fun createPageById(id: Int): FCLCommonPage? {
8382
val page: FCLCommonPage? = when (id) {
84-
PAGE_ID_MANAGE_SETTING -> versionSettingPage
83+
PAGE_ID_MANAGE_MANAGE -> managePage
8584
PAGE_ID_MANAGE_INSTALL -> installerListPage
8685
PAGE_ID_MANAGE_MOD -> modListPage
8786
PAGE_ID_MANAGE_WORLD -> worldListPage

FCL/src/main/java/com/tungsten/fcl/ui/manage/ManageUI.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void onResume() {
9898

9999
@Override
100100
public void initPages() {
101-
pageManager = new ManagePageManager(getContext(), container, ManagePageManager.PAGE_ID_MANAGE_MANAGE, null);
101+
pageManager = new ManagePageManager(getContext(), container, ManagePageManager.PAGE_ID_MANAGE_SETTING, null);
102102
}
103103

104104
@Override
@@ -121,7 +121,7 @@ public void onTabSelected(TabLayout.Tab tab) {
121121
if (pageManager != null) {
122122
switch (tab.getPosition()) {
123123
case 1:
124-
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_SETTING);
124+
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_MANAGE);
125125
break;
126126
case 2:
127127
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_INSTALL);
@@ -133,7 +133,7 @@ public void onTabSelected(TabLayout.Tab tab) {
133133
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_WORLD);
134134
break;
135135
default:
136-
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_MANAGE);
136+
pageManager.switchPage(ManagePageManager.PAGE_ID_MANAGE_SETTING);
137137
break;
138138
}
139139
}

FCL/src/main/res/layout/ui_manage.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<com.google.android.material.tabs.TabItem
2222
android:layout_width="wrap_content"
2323
android:layout_height="match_parent"
24-
android:text="@string/manage"/>
24+
android:text="@string/settings_game"/>
2525

2626
<com.google.android.material.tabs.TabItem
2727
android:layout_width="wrap_content"
2828
android:layout_height="match_parent"
29-
android:text="@string/settings_game"/>
29+
android:text="@string/manage"/>
3030

3131
<com.google.android.material.tabs.TabItem
3232
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)