liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

left menu

This commit is contained in:
Tungstend 2023-03-04 02:02:22 +08:00
parent 307208bd2f
commit 0ae3b2671c
5 changed files with 309 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
FCL/src/main/java/com/tungsten/fcl/control/GameMenu.java
View File

@ -16,12 +16,14 @@ import androidx.annotation.Nullable;
import com.google.gson.GsonBuilder;
import com.tungsten.fcl.R;
import com.tungsten.fcl.activity.JVMCrashActivity;
import com.tungsten.fcl.control.data.ControlViewGroup;
import com.tungsten.fcl.control.keyboard.LwjglCharSender;
import com.tungsten.fcl.control.keyboard.TouchCharInput;
import com.tungsten.fcl.control.view.GameItemBar;
import com.tungsten.fcl.control.view.LogWindow;
import com.tungsten.fcl.control.view.TouchPad;
import com.tungsten.fcl.control.view.ViewManager;
import com.tungsten.fcl.setting.Controller;
import com.tungsten.fcl.setting.Controllers;
import com.tungsten.fcl.setting.MenuSetting;
import com.tungsten.fcl.util.FXUtils;
@ -30,8 +32,12 @@ import com.tungsten.fclauncher.FCLPath;
import com.tungsten.fclauncher.bridge.FCLBridge;
import com.tungsten.fclauncher.bridge.FCLBridgeCallback;
import com.tungsten.fclcore.fakefx.beans.binding.Bindings;
import com.tungsten.fclcore.fakefx.beans.property.BooleanProperty;
import com.tungsten.fclcore.fakefx.beans.property.IntegerProperty;
import com.tungsten.fclcore.fakefx.beans.property.ObjectProperty;
import com.tungsten.fclcore.fakefx.beans.property.SimpleBooleanProperty;
import com.tungsten.fclcore.fakefx.beans.property.SimpleIntegerProperty;
import com.tungsten.fclcore.fakefx.beans.property.SimpleObjectProperty;
import com.tungsten.fclcore.util.Logging;
import com.tungsten.fclcore.util.io.FileUtils;
import com.tungsten.fcllibrary.component.FCLActivity;
@ -39,6 +45,7 @@ import com.tungsten.fcllibrary.component.dialog.FCLAlertDialog;
import com.tungsten.fcllibrary.component.theme.ThemeEngine;
import com.tungsten.fcllibrary.component.view.FCLButton;
import com.tungsten.fcllibrary.component.view.FCLImageView;
import com.tungsten.fcllibrary.component.view.FCLLinearLayout;
import com.tungsten.fcllibrary.component.view.FCLProgressBar;
import com.tungsten.fcllibrary.component.view.FCLSeekBar;
import com.tungsten.fcllibrary.component.view.FCLSpinner;
@ -51,6 +58,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.stream.Collectors;
public class GameMenu implements MenuCallback, View.OnClickListener {
@ -77,6 +85,12 @@ public class GameMenu implements MenuCallback, View.OnClickListener {
private FCLImageView cursorView;
private ViewManager viewManager;
private Gyroscope gyroscope;
private FCLButton manageViewGroups;
private FCLButton addButton;
private FCLButton addDirection;
private FCLButton manageButtonStyle;
private FCLButton manageDirectionStyle;
private FCLButton openMultiplayerMenu;
private FCLButton manageQuickInput;
@ -150,9 +164,107 @@ public class GameMenu implements MenuCallback, View.OnClickListener {
public TouchCharInput getTouchCharInput() {
return touchCharInput;
}
private final BooleanProperty editModeProperty = new SimpleBooleanProperty(this, "editMode", false);
public BooleanProperty editModeProperty() {
return editModeProperty;
}
public void setEditMode(boolean editMode) {
editModeProperty.set(editMode);
}
public boolean isEditMode() {
return editModeProperty.get();
}
private final BooleanProperty showViewBoundariesProperty = new SimpleBooleanProperty(this, "showViewBoundaries", false);
public BooleanProperty showViewBoundariesProperty() {
return showViewBoundariesProperty;
}
public void setShowViewBoundaries(boolean showViewBoundaries) {
showViewBoundariesProperty.set(showViewBoundaries);
}
public boolean isShowViewBoundaries() {
return showViewBoundariesProperty.get();
}
private final ObjectProperty<Controller> controllerProperty = new SimpleObjectProperty<>(this, "controller", null);
public ObjectProperty<Controller> controllerProperty() {
return controllerProperty;
}
public void setController(Controller controller) {
controllerProperty.set(controller);
}
public Controller getController() {
return controllerProperty.get();
}
private final ObjectProperty<ControlViewGroup> viewGroupProperty = new SimpleObjectProperty<>(this, "viewGroup", null);
public ObjectProperty<ControlViewGroup> viewGroupProperty() {
return viewGroupProperty;
}
public void setViewGroup(ControlViewGroup viewGroup) {
viewGroupProperty.set(viewGroup);
}
public ControlViewGroup getViewGroup() {
return viewGroupProperty.get();
}
private void initLeftMenu() {
FCLSwitch editMode = findViewById(R.id.edit_mode);
FCLSwitch showViewBoundaries = findViewById(R.id.show_boundary);
FCLSpinner<Controller> currentControllerSpinner = findViewById(R.id.current_controller);
FCLSpinner<ControlViewGroup> currentViewGroupSpinner = findViewById(R.id.current_view_group);
FCLLinearLayout editLayout = findViewById(R.id.edit_layout);
manageViewGroups = findViewById(R.id.manage_view_groups);
addButton = findViewById(R.id.add_button);
addDirection = findViewById(R.id.add_direction);
manageButtonStyle = findViewById(R.id.manage_button_style);
manageDirectionStyle = findViewById(R.id.manage_direction_style);
FXUtils.bindBoolean(editMode, editModeProperty);
FXUtils.bindBoolean(showViewBoundaries, showViewBoundariesProperty);
ArrayList<String> controllerNameList = Controllers.getControllers().stream().map(Controller::getName).collect(Collectors.toCollection(ArrayList::new));
currentControllerSpinner.setDataList(new ArrayList<>(Controllers.getControllers()));
ArrayAdapter<String> controllerNameAdapter = new ArrayAdapter<>(activity, R.layout.item_spinner_small, controllerNameList);
controllerNameAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_small);
currentControllerSpinner.setAdapter(controllerNameAdapter);
FXUtils.bindSelection(currentControllerSpinner, controllerProperty);
refreshViewGroupList(currentViewGroupSpinner);
controllerProperty.addListener(invalidate -> refreshViewGroupList(currentViewGroupSpinner));
editLayout.visibilityProperty().bind(editModeProperty);
manageViewGroups.setOnClickListener(this);
addButton.setOnClickListener(this);
addDirection.setOnClickListener(this);
manageButtonStyle.setOnClickListener(this);
manageDirectionStyle.setOnClickListener(this);
}
private void refreshViewGroupList(FCLSpinner<ControlViewGroup> spinner) {
ArrayList<String> viewGroupNameList = controllerProperty.get().viewGroups().stream().map(ControlViewGroup::getName).collect(Collectors.toCollection(ArrayList::new));
spinner.setDataList(new ArrayList<>(controllerProperty.get().viewGroups()));
ArrayAdapter<String> viewGroupNameAdapter = new ArrayAdapter<>(activity, R.layout.item_spinner_small, viewGroupNameList);
viewGroupNameAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_small);
spinner.setAdapter(viewGroupNameAdapter);
FXUtils.bindSelection(spinner, viewGroupProperty);
}
private void initRightMenu() {
@ -262,6 +374,9 @@ public class GameMenu implements MenuCallback, View.OnClickListener {
Logging.LOG.log(Level.SEVERE, "Failed to save menu setting", e);
}
});
editModeProperty.set(isSimulated());
controllerProperty.set(Controllers.findControllerByName(activity.getIntent().getExtras().getString("controller")));
baseLayout = findViewById(R.id.base_layout);
touchPad = findViewById(R.id.touch_pad);
@ -418,6 +533,22 @@ public class GameMenu implements MenuCallback, View.OnClickListener {
@Override
public void onClick(View v) {
if (v == manageViewGroups) {
}
if (v == addButton) {
}
if (v == addDirection) {
}
if (v == manageButtonStyle) {
}
if (v == manageDirectionStyle) {
}
if (v == openMultiplayerMenu) {
}

4
FCL/src/main/java/com/tungsten/fcl/game/LauncherHelper.java
View File

@ -6,6 +6,7 @@ import static com.tungsten.fclcore.util.Logging.LOG;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
@ -135,6 +136,9 @@ public final class LauncherHelper {
fclBridge.setController(repository.getVersionSetting(selectedVersion).getController());
fclBridge.setGameDir(repository.getRunDirectory(selectedVersion).getAbsolutePath());
JVMActivity.setFClBridge(fclBridge, MenuType.GAME);
Bundle bundle = new Bundle();
bundle.putString("controller", repository.getVersionSetting(selectedVersion).getController());
intent.putExtras(bundle);
LOG.log(Level.INFO, "Start JVMActivity!");
context.startActivity(intent);
})).withStage("launch.state.waiting_launching"))

5
FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java
View File

@ -132,4 +132,9 @@ public class Controllers {
controllers.remove(controller);
}
public static Controller findControllerByName(String name) {
checkControllers();
return controllers.stream().filter(it -> it.getName().equals(name)).findFirst().orElse(controllers.get(0));
}
}

4
FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java
View File

@ -4,6 +4,7 @@ import static com.tungsten.fcl.util.FXUtils.onInvalidating;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ListView;
@ -161,6 +162,9 @@ public class ControllerUI extends FCLCommonUI implements View.OnClickListener {
}
if (view == editController) {
Intent intent = new Intent(getContext(), ControllerActivity.class);
Bundle bundle = new Bundle();
bundle.putString("controller", getSelectedController().getName());
intent.putExtras(bundle);
getActivity().startActivity(intent);
}
}

322
FCL/src/main/res/layout/menu_left.xml
View File

@ -111,189 +111,197 @@
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_controls_groups"
android:textSize="11sp"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:padding="5dp"
android:id="@+id/edit_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_current_view_group"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLSpinner
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/current_view_group"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_groups"
android:textSize="12sp"/>
android:textSize="11sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:padding="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_view_groups"/>
android:orientation="horizontal">
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_current_view_group"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLSpinner
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/current_view_group"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_groups"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_view_groups"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_add_button"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_add_view_button"
android:textSize="12sp"
android:id="@+id/add_button"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_add_direction"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_add_view_button"
android:textSize="12sp"
android:id="@+id/add_direction"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_add_button"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_add_view_button"
android:textSize="12sp"
android:id="@+id/add_button"/>
android:text="@string/menu_controls_style"
android:textSize="11sp"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_add_direction"
android:textSize="12sp"/>
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_button_style"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_button_style"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_add_view_button"
android:textSize="12sp"
android:id="@+id/add_direction"/>
android:orientation="horizontal">
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_direction_style"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_controls_style"
android:textSize="11sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_direction_style"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_button_style"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_button_style"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
<com.tungsten.fcllibrary.component.view.FCLLinearLayout
android:padding="5dp"
android:layout_marginTop="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:singleLine="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/menu_controls_direction_style"
android:textSize="12sp"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/menu_controls_manage"
android:textSize="12sp"
android:id="@+id/manage_direction_style"/>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>
</com.tungsten.fcllibrary.component.view.FCLLinearLayout>