add a back button

This commit is contained in:
Tungstend 2024-01-07 20:55:29 +08:00
parent d665ebd8a5
commit 6c2cde0baf
4 changed files with 21 additions and 2 deletions

View File

@ -85,6 +85,7 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
private FCLImageView icon; private FCLImageView icon;
private FCLTextView versionName; private FCLTextView versionName;
private FCLTextView versionHint; private FCLTextView versionHint;
private FCLButton back;
private FCLButton launch; private FCLButton launch;
private ObjectProperty<Account> currentAccount; private ObjectProperty<Account> currentAccount;
@ -164,12 +165,14 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
icon = findViewById(R.id.icon); icon = findViewById(R.id.icon);
versionName = findViewById(R.id.version_name); versionName = findViewById(R.id.version_name);
versionHint = findViewById(R.id.version_hint); versionHint = findViewById(R.id.version_hint);
back = findViewById(R.id.back);
launch = findViewById(R.id.launch); launch = findViewById(R.id.launch);
account.setOnClickListener(this); account.setOnClickListener(this);
version.setOnClickListener(this); version.setOnClickListener(this);
back.setOnClickListener(this);
launch.setOnClickListener(this); launch.setOnClickListener(this);
launch.setOnLongClickListener(view ->{ launch.setOnLongClickListener(view -> {
startActivity(new Intent(MainActivity.this,ShellActivity.class)); startActivity(new Intent(MainActivity.this, ShellActivity.class));
return true; return true;
}); });
@ -298,6 +301,11 @@ public class MainActivity extends FCLActivity implements FCLMenuView.OnSelectLis
titleView.setTextWithAnim(getString(R.string.version)); titleView.setTextWithAnim(getString(R.string.version));
uiManager.switchUI(uiManager.getVersionUI()); uiManager.switchUI(uiManager.getVersionUI());
} }
if (view == back) {
if (uiManager != null) {
uiManager.onBackPressed();
}
}
if (view == launch) { if (view == launch) {
Versions.launch(this, Profiles.getSelectedProfile()); Versions.launch(this, Profiles.getSelectedProfile());
} }

View File

@ -233,9 +233,18 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:id="@+id/back"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/button_back"
android:layout_marginTop="10dp"
app:ripple="true"/>
<com.tungsten.fcllibrary.component.view.FCLButton <com.tungsten.fcllibrary.component.view.FCLButton
android:id="@+id/launch" android:id="@+id/launch"
android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/launch" android:text="@string/launch"

View File

@ -92,6 +92,7 @@
<string name="assets_download_all">检查资源文件完整性</string> <string name="assets_download_all">检查资源文件完整性</string>
<string name="assets_index_malformed">资源文件的索引文件损坏。</string> <string name="assets_index_malformed">资源文件的索引文件损坏。</string>
<string name="button_back">返回</string>
<string name="button_cancel">取消</string> <string name="button_cancel">取消</string>
<string name="button_download">下载</string> <string name="button_download">下载</string>
<string name="button_export">导出</string> <string name="button_export">导出</string>

View File

@ -104,6 +104,7 @@
<string name="assets_download_all">Validating assets integrity</string> <string name="assets_download_all">Validating assets integrity</string>
<string name="assets_index_malformed">Index files of downloaded assets were corrupted.</string> <string name="assets_index_malformed">Index files of downloaded assets were corrupted.</string>
<string name="button_back">Back</string>
<string name="button_cancel">Cancel</string> <string name="button_cancel">Cancel</string>
<string name="button_download">Download</string> <string name="button_download">Download</string>
<string name="button_export">Export</string> <string name="button_export">Export</string>