From 78d385156cedf21cbb1feeb1fe50564e10243566 Mon Sep 17 00:00:00 2001
From: Tungstend <hanjinlong197@gmail.com>
Date: Tue, 9 Jan 2024 16:05:15 +0800
Subject: [PATCH] update ui

---
 .../tungsten/fcl/activity/MainActivity.java   | 13 ++++++--
 .../fcl/ui/manage/InstallerListPage.java      |  7 -----
 FCL/src/main/res/layout/activity_main.xml     | 11 +++++--
 .../main/res/layout/page_installer_list.xml   | 31 ++++---------------
 FCL/src/main/res/values-zh/strings.xml        |  2 +-
 FCL/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/FCL/src/main/java/com/tungsten/fcl/activity/MainActivity.java b/FCL/src/main/java/com/tungsten/fcl/activity/MainActivity.java
index f61cc2d3..45b360d8 100644
--- a/FCL/src/main/java/com/tungsten/fcl/activity/MainActivity.java
+++ b/FCL/src/main/java/com/tungsten/fcl/activity/MainActivity.java
@@ -16,6 +16,7 @@ import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.tungsten.fcl.R;
+import com.tungsten.fcl.game.JarExecutorHelper;
 import com.tungsten.fcl.game.TexturesLoader;
 import com.tungsten.fcl.setting.Accounts;
 import com.tungsten.fcl.setting.ConfigHolder;
@@ -76,6 +77,7 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
     public FCLMenuView controller;
     public FCLMenuView multiplayer;
     public FCLMenuView setting;
+    public FCLMenuView back;
 
     private LinearLayoutCompat account;
     private FCLImageView avatar;
@@ -85,7 +87,7 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
     private FCLImageView icon;
     private FCLTextView versionName;
     private FCLTextView versionHint;
-    private FCLButton back;
+    private FCLButton executeJar;
     private FCLButton launch;
 
     private ObjectProperty<Account> currentAccount;
@@ -165,11 +167,11 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
             icon = findViewById(R.id.icon);
             versionName = findViewById(R.id.version_name);
             versionHint = findViewById(R.id.version_hint);
-            back = findViewById(R.id.back);
+            executeJar = findViewById(R.id.execute_jar);
             launch = findViewById(R.id.launch);
             account.setOnClickListener(this);
             version.setOnClickListener(this);
-            back.setOnClickListener(this);
+            executeJar.setOnClickListener(this);
             launch.setOnClickListener(this);
             launch.setOnLongClickListener(view -> {
                 startActivity(new Intent(MainActivity.this, ShellActivity.class));
@@ -185,12 +187,14 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
                 controller = findViewById(R.id.controller);
                 multiplayer = findViewById(R.id.multiplayer);
                 setting = findViewById(R.id.setting);
+                back = findViewById(R.id.back);
                 home.setOnSelectListener(this);
                 manage.setOnSelectListener(this);
                 download.setOnSelectListener(this);
                 controller.setOnSelectListener(this);
                 multiplayer.setOnSelectListener(this);
                 setting.setOnSelectListener(this);
+                back.setOnClickListener(this);
                 home.setSelected(true);
 
                 setupAccountDisplay();
@@ -306,6 +310,9 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
                 uiManager.onBackPressed();
             }
         }
+        if (view == executeJar) {
+            JarExecutorHelper.start(this, this);
+        }
         if (view == launch) {
             Versions.launch(this, Profiles.getSelectedProfile());
         }
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
index a8555b0c..c9219562 100644
--- a/FCL/src/main/java/com/tungsten/fcl/ui/manage/InstallerListPage.java
+++ b/FCL/src/main/java/com/tungsten/fcl/ui/manage/InstallerListPage.java
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AppCompatDialog;
 import androidx.appcompat.widget.LinearLayoutCompat;
 
 import com.tungsten.fcl.R;
-import com.tungsten.fcl.game.JarExecutorHelper;
 import com.tungsten.fcl.setting.DownloadProviders;
 import com.tungsten.fcl.setting.Profile;
 import com.tungsten.fcl.ui.InstallerItem;
@@ -56,7 +55,6 @@ public class InstallerListPage extends FCLCommonPage implements ManageUI.Version
     private LinearLayoutCompat parent;
 
     private FCLButton installOfflineButton;
-    private FCLButton executeJarButton;
 
     public InstallerListPage(Context context, int id, FCLUILayout parent, int resId) {
         super(context, id, parent, resId);
@@ -66,9 +64,7 @@ public class InstallerListPage extends FCLCommonPage implements ManageUI.Version
     private void create() {
         scrollView = findViewById(R.id.scroll);
         installOfflineButton = findViewById(R.id.install_offline);
-        executeJarButton = findViewById(R.id.execute_jar);
         installOfflineButton.setOnClickListener(this);
-        executeJarButton.setOnClickListener(this);
     }
 
     @Override
@@ -266,8 +262,5 @@ public class InstallerListPage extends FCLCommonPage implements ManageUI.Version
         if (view == installOfflineButton) {
             installOffline();
         }
-        if (view == executeJarButton) {
-            JarExecutorHelper.start(getActivity(), getContext());
-        }
     }
 }
diff --git a/FCL/src/main/res/layout/activity_main.xml b/FCL/src/main/res/layout/activity_main.xml
index 866e34e8..1b579f16 100644
--- a/FCL/src/main/res/layout/activity_main.xml
+++ b/FCL/src/main/res/layout/activity_main.xml
@@ -64,6 +64,13 @@
                 android:src="@drawable/ic_baseline_settings_24"
                 android:id="@+id/setting"/>
 
+            <com.tungsten.fcllibrary.component.view.FCLMenuView
+                android:layout_marginTop="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_baseline_arrow_back_24"
+                android:id="@+id/back"/>
+
         </androidx.appcompat.widget.LinearLayoutCompat>
 
     </ScrollView>
@@ -235,10 +242,10 @@
             android:layout_weight="1"/>
 
         <com.tungsten.fcllibrary.component.view.FCLButton
-            android:id="@+id/back"
+            android:id="@+id/execute_jar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/button_back"
+            android:text="@string/jar_execute"
             android:layout_marginTop="10dp"
             app:ripple="true"/>
         
diff --git a/FCL/src/main/res/layout/page_installer_list.xml b/FCL/src/main/res/layout/page_installer_list.xml
index ec50d0d7..5d4dd741 100644
--- a/FCL/src/main/res/layout/page_installer_list.xml
+++ b/FCL/src/main/res/layout/page_installer_list.xml
@@ -11,36 +11,17 @@
     <ScrollView
         android:id="@+id/scroll"
         android:layout_marginBottom="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/button_layout"
+        app:layout_constraintBottom_toTopOf="@+id/install_offline"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="0dp"/>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/button_layout"
+    <com.tungsten.fcllibrary.component.view.FCLButton
+        android:id="@+id/install_offline"
+        android:text="@string/install_installer_install_offline"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <com.tungsten.fcllibrary.component.view.FCLButton
-            android:id="@+id/install_offline"
-            android:text="@string/install_installer_install_offline"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
-            android:layout_weight="1"
-            app:ripple="true"/>
-
-        <com.tungsten.fcllibrary.component.view.FCLButton
-            android:id="@+id/execute_jar"
-            android:text="@string/install_installer_install_jar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_weight="1"
-            app:ripple="true"/>
-
-    </androidx.appcompat.widget.LinearLayoutCompat>
+        app:ripple="true"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/FCL/src/main/res/values-zh/strings.xml b/FCL/src/main/res/values-zh/strings.xml
index f0d0a1da..4c69e37c 100644
--- a/FCL/src/main/res/values-zh/strings.xml
+++ b/FCL/src/main/res/values-zh/strings.xml
@@ -396,7 +396,6 @@
     <string name="install_installer_fabric_api_warning">Fabric API 是一个模组, 并且将被安装至当前版本的模组文件夹。请不要修改此版本的版本隔离/游戏运行路径设置。如果你在之后修改了相关设置，Fabric API 需要被重新安装！</string>
     <string name="install_installer_incompatible">与 %s 不兼容</string>
     <string name="install_installer_install">安装 %s</string>
-    <string name="install_installer_install_jar">执行 Jar 文件</string>
     <string name="install_installer_install_offline">从本地文件安装/升级</string>
     <string name="install_installer_install_offline_extension">Forge/OptiFine 安装器</string>
     <string name="install_installer_not_installed">不安装</string>
@@ -406,6 +405,7 @@
     <string name="install_new_game_malformed">无效的名称</string>
     <string name="install_success">安装成功</string>
 
+    <string name="jar_execute">执行 Jar 文件</string>
     <string name="jar_executor_crash_title">Jar Executor 意外退出</string>
     <string name="jar_executor_crash_reason">尚不支持 Jar Executor 崩溃原因分析。</string>
 
diff --git a/FCL/src/main/res/values/strings.xml b/FCL/src/main/res/values/strings.xml
index ca75a5d6..b85aa095 100644
--- a/FCL/src/main/res/values/strings.xml
+++ b/FCL/src/main/res/values/strings.xml
@@ -418,7 +418,6 @@
     <string name="install_installer_game" translatable="false">Minecraft</string>
     <string name="install_installer_incompatible">Incompatible with %s</string>
     <string name="install_installer_install">Install %s</string>
-    <string name="install_installer_install_jar">Execute Jar File</string>
     <string name="install_installer_install_offline">Install/Update from Local File</string>
     <string name="install_installer_install_offline_extension">Forge/OptiFine installer</string>
     <string name="install_installer_liteloader" translatable="false">LiteLoader</string>
@@ -432,6 +431,7 @@
     <string name="install_new_game_malformed">Invalid Name</string>
     <string name="install_success">Installed successfully.</string>
 
+    <string name="jar_execute">Execute Jar</string>
     <string name="jar_executor_crash_title">Jar Executor Crashed</string>
     <string name="jar_executor_crash_reason">Jar Executor crash reason analyse is not supported now.</string>