izzy/WeeU
0
0
Fork 0
mirror of https://github.com/izzy2lost/WeeU.git synced 2026-07-06 00:19:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace most adapters with a generic one

Browse Source
This commit is contained in:
SSimco
2023-07-03 17:35:18 +03:00
parent 5da49b59eb
commit ddc29f1206
23 changed files with 404 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/app/src/main/java/info/cemu/Cemu/ButtonListAdapter.java
-77
View File
@@ -1,77 +0,0 @@
package info.cemu.Cemu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
public class ButtonListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public interface OnButtonClickListener {
void onButtonClicked();
}
private static class ButtonInfo {
public ButtonInfo(String text, String description, OnButtonClickListener onButtonClickListener) {
this.text = text;
this.description = description;
this.onButtonClickListener = onButtonClickListener;
}
String text;
String description;
OnButtonClickListener onButtonClickListener;
}
private final List<ButtonInfo> buttonInfoList = new ArrayList<>();
public void addButtonInfo(String text, String description, OnButtonClickListener onButtonClickListener) {
buttonInfoList.add(new ButtonInfo(text, description, onButtonClickListener));
notifyItemInserted(buttonInfoList.size());
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ButtonViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_button, parent, false));
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
((ButtonViewHolder) holder).bind(buttonInfoList.get(position));
holder.itemView.setOnClickListener(view -> {
ButtonInfo buttonInfo = buttonInfoList.get(holder.getAdapterPosition());
if (buttonInfo.onButtonClickListener != null) {
buttonInfo.onButtonClickListener.onButtonClicked();
}
});
}
@Override
public int getItemCount() {
return buttonInfoList.size();
}
private static class ButtonViewHolder extends RecyclerView.ViewHolder {
TextView text;
TextView description;
void bind(ButtonInfo buttonInfo) {
text.setText(buttonInfo.text);
description.setText(buttonInfo.description);
}
public ButtonViewHolder(View itemView) {
super(itemView);
text = itemView.findViewById(R.id.button_text);
description = itemView.findViewById(R.id.button_description);
}
}
}
src/android/app/src/main/java/info/cemu/Cemu/ButtonRecyclerViewItem.java
+51
View File
@@ -0,0 +1,51 @@
package info.cemu.Cemu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
public class ButtonRecyclerViewItem implements RecyclerViewItem {
public interface OnButtonClickListener {
void onButtonClick();
}
private static class ButtonViewHolder extends RecyclerView.ViewHolder {
TextView text;
TextView description;
public ButtonViewHolder(View itemView) {
super(itemView);
text = itemView.findViewById(R.id.button_text);
description = itemView.findViewById(R.id.button_description);
}
}
private final OnButtonClickListener onButtonClickListener;
private String text;
private String description;
public ButtonRecyclerViewItem(String text, String description, OnButtonClickListener onButtonClickListener) {
this.text = text;
this.description = description;
this.onButtonClickListener = onButtonClickListener;
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) {
return new ButtonViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_button, parent, false));
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter<RecyclerView.ViewHolder> adapter) {
ButtonViewHolder buttonViewHolder = (ButtonViewHolder) viewHolder;
buttonViewHolder.text.setText(text);
buttonViewHolder.description.setText(description);
buttonViewHolder.itemView.setOnClickListener(view -> {
if (onButtonClickListener != null)
onButtonClickListener.onButtonClick();
});
}
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerHeaderItem.java
-22
View File
@@ -1,22 +0,0 @@
package info.cemu.Cemu;
public class ControllerHeaderItem implements ControllerItem {
private String header;
public ControllerHeaderItem(String header) {
this.header = header;
}
@Override
public int getType() {
return TYPE_HEADER;
}
public String getHeader() {
return header;
}
public void setHeader(String header) {
this.header = header;
}
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerInputItem.java
-34
View File
@@ -1,34 +0,0 @@
package info.cemu.Cemu;
public class ControllerInputItem implements ControllerItem {
private final int nameResourceId;
private final int id;
private String boundInput;
public ControllerInputItem(int nameResourceId, int id, String boundInput) {
this.nameResourceId = nameResourceId;
this.id = id;
this.boundInput = boundInput;
}
@Override
public int getType() {
return TYPE_INPUT;
}
public int getNameResourceId() {
return nameResourceId;
}
public int getId() {
return id;
}
public String getBoundInput() {
return boundInput;
}
public void setBoundInput(String boundInput) {
this.boundInput = boundInput;
}
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerInputListener.java
-41
View File
@@ -1,41 +0,0 @@
package info.cemu.Cemu;
import android.view.InputDevice;
import android.view.KeyEvent;
import android.view.MotionEvent;
public class ControllerInputListener {
private static boolean isController(int sources) {
return ((sources & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK) ||
((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
}
public static boolean onKeyEvent(KeyEvent keyEvent) {
InputDevice inputDevice = keyEvent.getDevice();
if (isController(inputDevice.getSources())) {
String descriptor = inputDevice.getDescriptor();
String name = inputDevice.getName();
NativeLibrary.onNativeKey(descriptor == null ? name : descriptor, name, keyEvent.getKeyCode(), keyEvent.getAction() == KeyEvent.ACTION_DOWN);
return true;
}
return false;
}
public static boolean onMotionEvent(MotionEvent motionEvent) {
int actionPointerIndex = motionEvent.getActionIndex();
int action = motionEvent.getActionMasked();
if (action == MotionEvent.ACTION_MOVE) {
InputDevice inputDevice = motionEvent.getDevice();
String descriptor = inputDevice.getDescriptor();
String name = inputDevice.getName();
for (InputDevice.MotionRange range : inputDevice.getMotionRanges()) {
int axis = range.getAxis();
float value = (motionEvent.getAxisValue(axis, actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
NativeLibrary.onNativeAxis(descriptor == null ? name : descriptor, name, axis, value);
}
return true;
}
return false;
}
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsDataProvider.java
+43 -22
View File
@@ -3,6 +3,7 @@ package info.cemu.Cemu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class ControllerInputsDataProvider {
private int getButtonResourceIdName(int controllerType, int buttonId) {
@@ -125,38 +126,58 @@ public class ControllerInputsDataProvider {
throw new RuntimeException("Invalid controllerType " + controllerType);
}
private void addControllerInputsGroup(List<ControllerItem> controllerInputItems, String groupName, int controllerType, int[] buttons, Map<Integer, String> inputs) {
controllerInputItems.add(new ControllerHeaderItem(groupName));
for (int button : buttons) {
controllerInputItems.add(new ControllerInputItem(getButtonResourceIdName(controllerType, button), button, inputs.getOrDefault(button, "")));
public static class ControllerInput {
public int buttonResourceIdName;
public int buttonId;
public String boundInput;
public ControllerInput(int buttonResourceIdName, int buttonId, String boundInput) {
this.boundInput = boundInput;
this.buttonId = buttonId;
this.buttonResourceIdName = buttonResourceIdName;
}
}
public List<ControllerItem> getControllerInputs(int controllerType, Map<Integer, String> inputs) {
List<ControllerItem> controllerInputItems = new ArrayList<>();
public static class ControllerInputGroup {
public int groupResourceIdName;
public List<ControllerInput> inputs;
public ControllerInputGroup(int groupResourceIdName, List<ControllerInput> inputs) {
this.groupResourceIdName = groupResourceIdName;
this.inputs = inputs;
}
}
private void addControllerInputsGroup(List<ControllerInputGroup> controllerInputItems, int groupResourceIdName, int controllerType, List<Integer> buttons, Map<Integer, String> inputs) {
List<ControllerInput> controllerInputs = buttons.stream().map(buttonId -> new ControllerInput(getButtonResourceIdName(controllerType, buttonId), buttonId, inputs.getOrDefault(buttonId, ""))).collect(Collectors.toList());
controllerInputItems.add(new ControllerInputGroup(groupResourceIdName, controllerInputs));
}
public List<ControllerInputGroup> getControllerInputs(int controllerType, Map<Integer, String> inputs) {
List<ControllerInputGroup> controllerInputItems = new ArrayList<>();
if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_VPAD) {
addControllerInputsGroup(controllerInputItems, "Buttons", controllerType, new int[]{NativeLibrary.VPAD_BUTTON_A, NativeLibrary.VPAD_BUTTON_B, NativeLibrary.VPAD_BUTTON_X, NativeLibrary.VPAD_BUTTON_Y, NativeLibrary.VPAD_BUTTON_L, NativeLibrary.VPAD_BUTTON_R, NativeLibrary.VPAD_BUTTON_ZL, NativeLibrary.VPAD_BUTTON_ZR, NativeLibrary.VPAD_BUTTON_PLUS, NativeLibrary.VPAD_BUTTON_MINUS}, inputs);
addControllerInputsGroup(controllerInputItems, "D-Pad", controllerType, new int[]{NativeLibrary.VPAD_BUTTON_UP, NativeLibrary.VPAD_BUTTON_DOWN, NativeLibrary.VPAD_BUTTON_LEFT, NativeLibrary.VPAD_BUTTON_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Left Axis", controllerType, new int[]{NativeLibrary.VPAD_BUTTON_STICKL, NativeLibrary.VPAD_BUTTON_STICKL_UP, NativeLibrary.VPAD_BUTTON_STICKL_DOWN, NativeLibrary.VPAD_BUTTON_STICKL_LEFT, NativeLibrary.VPAD_BUTTON_STICKL_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Right Axis", controllerType, new int[]{NativeLibrary.VPAD_BUTTON_STICKR, NativeLibrary.VPAD_BUTTON_STICKR_UP, NativeLibrary.VPAD_BUTTON_STICKR_DOWN, NativeLibrary.VPAD_BUTTON_STICKR_LEFT, NativeLibrary.VPAD_BUTTON_STICKR_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Extra", controllerType, new int[]{NativeLibrary.VPAD_BUTTON_MIC, NativeLibrary.VPAD_BUTTON_SCREEN, NativeLibrary.VPAD_BUTTON_HOME}, inputs);
addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.VPAD_BUTTON_A, NativeLibrary.VPAD_BUTTON_B, NativeLibrary.VPAD_BUTTON_X, NativeLibrary.VPAD_BUTTON_Y, NativeLibrary.VPAD_BUTTON_L, NativeLibrary.VPAD_BUTTON_R, NativeLibrary.VPAD_BUTTON_ZL, NativeLibrary.VPAD_BUTTON_ZR, NativeLibrary.VPAD_BUTTON_PLUS, NativeLibrary.VPAD_BUTTON_MINUS), inputs);
addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.VPAD_BUTTON_UP, NativeLibrary.VPAD_BUTTON_DOWN, NativeLibrary.VPAD_BUTTON_LEFT, NativeLibrary.VPAD_BUTTON_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.VPAD_BUTTON_STICKL, NativeLibrary.VPAD_BUTTON_STICKL_UP, NativeLibrary.VPAD_BUTTON_STICKL_DOWN, NativeLibrary.VPAD_BUTTON_STICKL_LEFT, NativeLibrary.VPAD_BUTTON_STICKL_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.VPAD_BUTTON_STICKR, NativeLibrary.VPAD_BUTTON_STICKR_UP, NativeLibrary.VPAD_BUTTON_STICKR_DOWN, NativeLibrary.VPAD_BUTTON_STICKR_LEFT, NativeLibrary.VPAD_BUTTON_STICKR_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.extra, controllerType, List.of(NativeLibrary.VPAD_BUTTON_MIC, NativeLibrary.VPAD_BUTTON_SCREEN, NativeLibrary.VPAD_BUTTON_HOME), inputs);
}
if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_PRO) {
addControllerInputsGroup(controllerInputItems, "Buttons", controllerType, new int[]{NativeLibrary.PRO_BUTTON_A, NativeLibrary.PRO_BUTTON_B, NativeLibrary.PRO_BUTTON_X, NativeLibrary.PRO_BUTTON_Y, NativeLibrary.PRO_BUTTON_L, NativeLibrary.PRO_BUTTON_R, NativeLibrary.PRO_BUTTON_ZL, NativeLibrary.PRO_BUTTON_ZR, NativeLibrary.PRO_BUTTON_PLUS, NativeLibrary.PRO_BUTTON_MINUS, NativeLibrary.PRO_BUTTON_HOME}, inputs);
addControllerInputsGroup(controllerInputItems, "Left Axis", controllerType, new int[]{NativeLibrary.PRO_BUTTON_STICKL, NativeLibrary.PRO_BUTTON_STICKL_UP, NativeLibrary.PRO_BUTTON_STICKL_DOWN, NativeLibrary.PRO_BUTTON_STICKL_LEFT, NativeLibrary.PRO_BUTTON_STICKL_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Right Axis", controllerType, new int[]{NativeLibrary.PRO_BUTTON_STICKR, NativeLibrary.PRO_BUTTON_STICKR_UP, NativeLibrary.PRO_BUTTON_STICKR_DOWN, NativeLibrary.PRO_BUTTON_STICKR_LEFT, NativeLibrary.PRO_BUTTON_STICKR_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "D-Pad", controllerType, new int[]{NativeLibrary.PRO_BUTTON_UP, NativeLibrary.PRO_BUTTON_DOWN, NativeLibrary.PRO_BUTTON_LEFT, NativeLibrary.PRO_BUTTON_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.PRO_BUTTON_A, NativeLibrary.PRO_BUTTON_B, NativeLibrary.PRO_BUTTON_X, NativeLibrary.PRO_BUTTON_Y, NativeLibrary.PRO_BUTTON_L, NativeLibrary.PRO_BUTTON_R, NativeLibrary.PRO_BUTTON_ZL, NativeLibrary.PRO_BUTTON_ZR, NativeLibrary.PRO_BUTTON_PLUS, NativeLibrary.PRO_BUTTON_MINUS, NativeLibrary.PRO_BUTTON_HOME), inputs);
addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.PRO_BUTTON_STICKL, NativeLibrary.PRO_BUTTON_STICKL_UP, NativeLibrary.PRO_BUTTON_STICKL_DOWN, NativeLibrary.PRO_BUTTON_STICKL_LEFT, NativeLibrary.PRO_BUTTON_STICKL_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.PRO_BUTTON_STICKR, NativeLibrary.PRO_BUTTON_STICKR_UP, NativeLibrary.PRO_BUTTON_STICKR_DOWN, NativeLibrary.PRO_BUTTON_STICKR_LEFT, NativeLibrary.PRO_BUTTON_STICKR_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.PRO_BUTTON_UP, NativeLibrary.PRO_BUTTON_DOWN, NativeLibrary.PRO_BUTTON_LEFT, NativeLibrary.PRO_BUTTON_RIGHT), inputs);
}
if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_CLASSIC) {
addControllerInputsGroup(controllerInputItems, "Buttons", controllerType, new int[]{NativeLibrary.CLASSIC_BUTTON_A, NativeLibrary.CLASSIC_BUTTON_B, NativeLibrary.CLASSIC_BUTTON_X, NativeLibrary.CLASSIC_BUTTON_Y, NativeLibrary.CLASSIC_BUTTON_L, NativeLibrary.CLASSIC_BUTTON_R, NativeLibrary.CLASSIC_BUTTON_ZL, NativeLibrary.CLASSIC_BUTTON_ZR, NativeLibrary.CLASSIC_BUTTON_PLUS, NativeLibrary.CLASSIC_BUTTON_MINUS, NativeLibrary.CLASSIC_BUTTON_HOME}, inputs);
addControllerInputsGroup(controllerInputItems, "Left Axis", controllerType, new int[]{NativeLibrary.CLASSIC_BUTTON_STICKL_UP, NativeLibrary.CLASSIC_BUTTON_STICKL_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKL_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKL_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Right Axis", controllerType, new int[]{NativeLibrary.CLASSIC_BUTTON_STICKR_UP, NativeLibrary.CLASSIC_BUTTON_STICKR_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKR_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKR_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "D-Pad", controllerType, new int[]{NativeLibrary.CLASSIC_BUTTON_UP, NativeLibrary.CLASSIC_BUTTON_DOWN, NativeLibrary.CLASSIC_BUTTON_LEFT, NativeLibrary.CLASSIC_BUTTON_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_A, NativeLibrary.CLASSIC_BUTTON_B, NativeLibrary.CLASSIC_BUTTON_X, NativeLibrary.CLASSIC_BUTTON_Y, NativeLibrary.CLASSIC_BUTTON_L, NativeLibrary.CLASSIC_BUTTON_R, NativeLibrary.CLASSIC_BUTTON_ZL, NativeLibrary.CLASSIC_BUTTON_ZR, NativeLibrary.CLASSIC_BUTTON_PLUS, NativeLibrary.CLASSIC_BUTTON_MINUS, NativeLibrary.CLASSIC_BUTTON_HOME), inputs);
addControllerInputsGroup(controllerInputItems, R.string.left_axis, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_STICKL_UP, NativeLibrary.CLASSIC_BUTTON_STICKL_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKL_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKL_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.right_axis, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_STICKR_UP, NativeLibrary.CLASSIC_BUTTON_STICKR_DOWN, NativeLibrary.CLASSIC_BUTTON_STICKR_LEFT, NativeLibrary.CLASSIC_BUTTON_STICKR_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.CLASSIC_BUTTON_UP, NativeLibrary.CLASSIC_BUTTON_DOWN, NativeLibrary.CLASSIC_BUTTON_LEFT, NativeLibrary.CLASSIC_BUTTON_RIGHT), inputs);
}
if (controllerType == NativeLibrary.EMULATED_CONTROLLER_TYPE_WIIMOTE) {
addControllerInputsGroup(controllerInputItems, "Buttons", controllerType, new int[]{NativeLibrary.WIIMOTE_BUTTON_A, NativeLibrary.WIIMOTE_BUTTON_B, NativeLibrary.WIIMOTE_BUTTON_1, NativeLibrary.WIIMOTE_BUTTON_2, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_Z, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_C, NativeLibrary.WIIMOTE_BUTTON_PLUS, NativeLibrary.WIIMOTE_BUTTON_MINUS, NativeLibrary.WIIMOTE_BUTTON_HOME}, inputs);
addControllerInputsGroup(controllerInputItems, "D-Pad", controllerType, new int[]{NativeLibrary.WIIMOTE_BUTTON_UP, NativeLibrary.WIIMOTE_BUTTON_DOWN, NativeLibrary.WIIMOTE_BUTTON_LEFT, NativeLibrary.WIIMOTE_BUTTON_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, "Nunchuck", controllerType, new int[]{NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_UP, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_DOWN, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_LEFT, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_RIGHT}, inputs);
addControllerInputsGroup(controllerInputItems, R.string.buttons, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_A, NativeLibrary.WIIMOTE_BUTTON_B, NativeLibrary.WIIMOTE_BUTTON_1, NativeLibrary.WIIMOTE_BUTTON_2, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_Z, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_C, NativeLibrary.WIIMOTE_BUTTON_PLUS, NativeLibrary.WIIMOTE_BUTTON_MINUS, NativeLibrary.WIIMOTE_BUTTON_HOME), inputs);
addControllerInputsGroup(controllerInputItems, R.string.d_pad, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_UP, NativeLibrary.WIIMOTE_BUTTON_DOWN, NativeLibrary.WIIMOTE_BUTTON_LEFT, NativeLibrary.WIIMOTE_BUTTON_RIGHT), inputs);
addControllerInputsGroup(controllerInputItems, R.string.nunchuck, controllerType, List.of(NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_UP, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_DOWN, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_LEFT, NativeLibrary.WIIMOTE_BUTTON_NUNCHUCK_RIGHT), inputs);
}
return controllerInputItems;
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java
+50 -54
View File
@@ -1,11 +1,9 @@
package info.cemu.Cemu;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -14,26 +12,67 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import info.cemu.Cemu.databinding.FragmentControllerInputsBinding;
import java.util.HashMap;
import java.util.Objects;
import java.util.Map;
import info.cemu.Cemu.databinding.FragmentControllerInputsBinding;
public class ControllerInputsFragment extends Fragment {
public static final String CONTROLLER_INDEX = "ControllerIndex";
private int controllerIndex;
private int controllerType;
private final InputManager inputManager = new InputManager();
private EmulatedControllerTypeAdapter emulatedControllerTypeAdapter;
private ControllerListAdapter controllerListAdapter;
private final ControllerInputsDataProvider controllerInputsDataProvider = new ControllerInputsDataProvider();
private final GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter();
private final EmulatedControllerTypeAdapter emulatedControllerTypeAdapter = new EmulatedControllerTypeAdapter();
private void onTypeChanged(int controllerType) {
if (this.controllerType == controllerType) return;
this.controllerType = controllerType;
NativeLibrary.setControllerType(controllerIndex, controllerType);
genericRecyclerViewAdapter.clearRecyclerViewItems();
setControllerInputs(new HashMap<>());
}
private void setControllerInputs(Map<Integer, String> inputs) {
emulatedControllerTypeAdapter.setCurrentControllerType(controllerType);
controllerListAdapter.setEmulatedControllerListItems(controllerType, new HashMap<>());
emulatedControllerTypeAdapter.setControllerTypeCounts(NativeLibrary.getVPADControllersCount(), NativeLibrary.getWPADControllersCount());
SpinnerRecyclerViewItem emulatedControllerSpinner = new SpinnerRecyclerViewItem(R.string.emulated_controller_label, emulatedControllerTypeAdapter, emulatedControllerTypeAdapter.getPosition(controllerType), position -> onTypeChanged(emulatedControllerTypeAdapter.getItem(position)));
genericRecyclerViewAdapter.addRecyclerViewItem(emulatedControllerSpinner);
for (var controllerInputsGroups : controllerInputsDataProvider.getControllerInputs(controllerType, inputs)) {
genericRecyclerViewAdapter.addRecyclerViewItem(new HeaderRecyclerViewItem(controllerInputsGroups.groupResourceIdName));
for (var controllerInput : controllerInputsGroups.inputs) {
int buttonId = controllerInput.buttonId;
int buttonResourceIdName = controllerInput.buttonResourceIdName;
InputRecyclerViewItem inputRecyclerViewItem = new InputRecyclerViewItem(controllerInput.buttonResourceIdName, controllerInput.boundInput, inputItem -> {
MotionDialog inputDialog = new MotionDialog(getContext());
inputDialog.setOnKeyListener((dialog, keyCode, keyEvent) -> {
if (inputManager.mapKeyEventToMappingId(controllerIndex, buttonId, keyEvent)) {
inputItem.setBoundInput(NativeLibrary.getControllerMapping(controllerIndex, buttonId));
inputDialog.dismiss();
}
return true;
});
inputDialog.setOnMotionListener(motionEvent -> {
if (inputManager.mapMotionEventToMappingId(controllerIndex, buttonId, motionEvent)) {
inputItem.setBoundInput(NativeLibrary.getControllerMapping(controllerIndex, buttonId));
inputDialog.dismiss();
}
return true;
});
inputDialog.setMessage(getString(R.string.inputBindingDialogMessage, getString(buttonResourceIdName)));
inputDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.clear), (dialogInterface, i) -> {
NativeLibrary.clearControllerMapping(controllerIndex, buttonId);
inputItem.clearBoundInput();
dialogInterface.dismiss();
});
inputDialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.cancel), (dialogInterface, i) -> dialogInterface.dismiss());
inputDialog.setTitle(R.string.inputBindingDialogTitle);
inputDialog.show();
});
genericRecyclerViewAdapter.addRecyclerViewItem(inputRecyclerViewItem);
}
}
}
@Nullable
@@ -47,54 +86,11 @@ public class ControllerInputsFragment extends Fragment {
if (NativeLibrary.isControllerDisabled(controllerIndex))
controllerType = NativeLibrary.EMULATED_CONTROLLER_TYPE_DISABLED;
else controllerType = NativeLibrary.getControllerType(controllerIndex);
controllerListAdapter = new ControllerListAdapter();
emulatedControllerTypeAdapter = new EmulatedControllerTypeAdapter();
emulatedControllerTypeAdapter.setCurrentControllerType(controllerType);
emulatedControllerTypeAdapter.setControllerTypeCounts(NativeLibrary.getVPADControllersCount(), NativeLibrary.getWPADControllersCount());
setControllerInputs(NativeLibrary.getControllerMappings(controllerIndex));
FragmentControllerInputsBinding binding = FragmentControllerInputsBinding.inflate(inflater, container, false);
binding.emulatedControllerSpinner.setAdapter(emulatedControllerTypeAdapter);
binding.emulatedControllerSpinner.setSelection(emulatedControllerTypeAdapter.getPosition(controllerType));
binding.emulatedControllerSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long l) {
onTypeChanged(emulatedControllerTypeAdapter.getItem(position));
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
controllerListAdapter.setEmulatedControllerListItems(controllerType, NativeLibrary.getControllerMappings(controllerIndex));
controllerListAdapter.setOnInputClickListener((nameId, id, position) -> {
MotionDialog inputDialog = new MotionDialog(getContext());
inputDialog.setOnKeyListener((dialog, keyCode, keyEvent) -> {
if (inputManager.mapKeyEventToMappingId(controllerIndex, id, keyEvent)) {
controllerListAdapter.setBoundInput(position, NativeLibrary.getControllerMapping(controllerIndex, id));
inputDialog.dismiss();
}
return true;
});
inputDialog.setOnMotionListener(motionEvent -> {
if (inputManager.mapMotionEventToMappingId(controllerIndex, id, motionEvent)) {
controllerListAdapter.setBoundInput(position, NativeLibrary.getControllerMapping(controllerIndex, id));
inputDialog.dismiss();
}
return true;
});
inputDialog.setMessage(getString(R.string.inputBindingDialogMessage, getString(nameId)));
inputDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.clear), (dialogInterface, i) -> {
NativeLibrary.clearControllerMapping(controllerIndex, id);
controllerListAdapter.clearBoundInput(position);
dialogInterface.dismiss();
});
inputDialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.cancel), (dialogInterface, i) -> dialogInterface.dismiss());
inputDialog.setTitle(R.string.inputBindingDialogTitle);
inputDialog.show();
});
binding.controllerInputsRecyclerView.setAdapter(controllerListAdapter);
binding.controllerInputsRecyclerView.setAdapter(genericRecyclerViewAdapter);
return binding.getRoot();
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerItem.java
-8
View File
@@ -1,8 +0,0 @@
package info.cemu.Cemu;
public interface ControllerItem {
int TYPE_HEADER = 0;
int TYPE_INPUT = 1;
int getType();
}
src/android/app/src/main/java/info/cemu/Cemu/ControllerListAdapter.java
-122
View File
@@ -1,122 +0,0 @@
package info.cemu.Cemu;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class ControllerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private List<ControllerItem> controllerItemList = new ArrayList<>();
private final ControllerInputsDataProvider controllerInputs = new ControllerInputsDataProvider();
private OnInputClickListener onInputClickListener;
public void setEmulatedControllerListItems(int controllerType, Map<Integer, String> inputsMapping) {
controllerItemList = controllerInputs.getControllerInputs(controllerType, inputsMapping);
notifyDataSetChanged();
}
public void clearBoundInput(int position) {
ControllerItem listItem = controllerItemList.get(position);
if (listItem.getType() == ControllerItem.TYPE_INPUT) {
ControllerInputItem controllerInputItem = (ControllerInputItem) listItem;
controllerInputItem.setBoundInput("");
controllerItemList.set(position, controllerInputItem);
notifyItemChanged(position);
}
}
public interface OnInputClickListener {
void onInputClicked(int nameId, int id, int position);
}
void setOnInputClickListener(OnInputClickListener onInputClickListener) {
this.onInputClickListener = onInputClickListener;
}
@Override
public int getItemViewType(int position) {
return controllerItemList.get(position).getType();
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
if (viewType == ControllerItem.TYPE_HEADER) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_controller_header, parent, false);
return new HeaderViewHolder(view);
} else if (viewType == ControllerItem.TYPE_INPUT) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_controller_input, parent, false);
return new InputViewHolder(view);
}
throw new RuntimeException("Invalid viewType: " + viewType);
}
public void setBoundInput(int inputItemPosition, String boundInput) {
ControllerItem listItem = controllerItemList.get(inputItemPosition);
if (listItem.getType() == ControllerItem.TYPE_INPUT) {
ControllerInputItem controllerInputItem = (ControllerInputItem) listItem;
controllerInputItem.setBoundInput(boundInput);
controllerItemList.set(inputItemPosition, controllerInputItem);
notifyItemChanged(inputItemPosition);
}
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if (holder instanceof HeaderViewHolder) {
((HeaderViewHolder) holder).bind((ControllerHeaderItem) controllerItemList.get(position));
} else if (holder instanceof InputViewHolder inputViewHolder) {
ControllerInputItem inputListItem = (ControllerInputItem) controllerItemList.get(position);
holder.itemView.setOnClickListener(v -> {
if (onInputClickListener != null) {
onInputClickListener.onInputClicked(inputListItem.getNameResourceId(), inputListItem.getId(), holder.getAdapterPosition());
}
});
inputViewHolder.bind(inputListItem);
}
}
@Override
public int getItemCount() {
return controllerItemList.size();
}
public static class InputViewHolder extends RecyclerView.ViewHolder {
TextView inputName;
TextView boundInput;
void bind(ControllerInputItem inputListItem) {
inputName.setText(inputListItem.getNameResourceId());
boundInput.setText(inputListItem.getBoundInput());
}
public InputViewHolder(View itemView) {
super(itemView);
inputName = itemView.findViewById(R.id.controller_input_name);
boundInput = itemView.findViewById(R.id.controller_button_name);
}
}
public static class HeaderViewHolder extends RecyclerView.ViewHolder {
TextView header;
void bind(ControllerHeaderItem headerListItem) {
header.setText(headerListItem.getHeader());
}
public HeaderViewHolder(View itemView) {
super(itemView);
header = itemView.findViewById(R.id.textview_controller_header);
}
}
}
src/android/app/src/main/java/info/cemu/Cemu/GenericRecyclerViewAdapter.java
+46
View File
@@ -0,0 +1,46 @@
package info.cemu.Cemu;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
public class GenericRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private final List<RecyclerViewItem> recyclerViewItems = new ArrayList<>();
public void addRecyclerViewItem(RecyclerViewItem recyclerViewItem) {
recyclerViewItems.add(recyclerViewItem);
notifyItemInserted(recyclerViewItems.size() - 1);
}
public void clearRecyclerViewItems() {
int itemsCount = recyclerViewItems.size();
recyclerViewItems.clear();
notifyItemRangeRemoved(0, itemsCount);
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int position) {
return recyclerViewItems.get(position).onCreateViewHolder(parent);
}
@Override
public int getItemViewType(int position) {
return position;
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
recyclerViewItems.get(position).onBindViewHolder(holder, this);
}
@Override
public int getItemCount() {
return recyclerViewItems.size();
}
}
src/android/app/src/main/java/info/cemu/Cemu/HeaderRecyclerViewItem.java
+37
View File
@@ -0,0 +1,37 @@
package info.cemu.Cemu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
public class HeaderRecyclerViewItem implements RecyclerViewItem {
private static class HeaderViewHolder extends RecyclerView.ViewHolder {
TextView header;
public HeaderViewHolder(View itemView) {
super(itemView);
header = itemView.findViewById(R.id.textview_header);
}
}
private final int headerResourceIdText;
public HeaderRecyclerViewItem(int headerResourceIdText) {
this.headerResourceIdText = headerResourceIdText;
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) {
return new HeaderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_header, parent, false));
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter<RecyclerView.ViewHolder> adapter) {
HeaderViewHolder headerViewHolder = (HeaderViewHolder) viewHolder;
headerViewHolder.header.setText(headerResourceIdText);
}
}
src/android/app/src/main/java/info/cemu/Cemu/InputRecyclerViewItem.java
+61
View File
@@ -0,0 +1,61 @@
package info.cemu.Cemu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
public class InputRecyclerViewItem implements RecyclerViewItem {
public interface OnInputClickListener {
void onInputClick(InputRecyclerViewItem inputRecyclerViewItem);
}
private static class InputViewHolder extends RecyclerView.ViewHolder {
TextView inputName;
TextView boundInput;
public InputViewHolder(View itemView) {
super(itemView);
inputName = itemView.findViewById(R.id.controller_input_name);
boundInput = itemView.findViewById(R.id.controller_button_name);
}
}
private final int inputNameResourceId;
private String boundInput;
private final OnInputClickListener onInputClickListener;
private RecyclerView.Adapter<RecyclerView.ViewHolder> recyclerViewAdapter;
private InputViewHolder inputViewHolder;
public InputRecyclerViewItem(int inputNameResourceId, String boundInput, OnInputClickListener onInputClickListener) {
this.inputNameResourceId = inputNameResourceId;
this.boundInput = boundInput;
this.onInputClickListener = onInputClickListener;
}
public void clearBoundInput() {
setBoundInput("");
}
public void setBoundInput(String boundInput) {
this.boundInput = boundInput;
recyclerViewAdapter.notifyItemChanged(inputViewHolder.getAdapterPosition());
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) {
return new InputViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_controller_input, parent, false));
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter<RecyclerView.ViewHolder> adapter) {
inputViewHolder = (InputViewHolder) viewHolder;
recyclerViewAdapter = adapter;
inputViewHolder.itemView.setOnClickListener(view -> onInputClickListener.onInputClick(this));
inputViewHolder.inputName.setText(inputNameResourceId);
inputViewHolder.boundInput.setText(boundInput);
}
}
src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java
+6 -3
View File
@@ -20,18 +20,21 @@ public class InputSettingsFragment extends Fragment {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
FragmentInputSettingsBinding binding = FragmentInputSettingsBinding.inflate(inflater, container, false);
ButtonListAdapter buttonListAdapter = new ButtonListAdapter();
GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter();
for (int index = 0; index < NativeLibrary.MAX_CONTROLLERS; index++) {
int controllerIndex = index;
String controllerType = getString(NativeLibrary.controllerTypeToResourceNameId(NativeLibrary.getControllerType(controllerIndex)));
buttonListAdapter.addButtonInfo(getString(R.string.controller_numbered, controllerIndex + 1), getString(R.string.emulated_controller_with_type, controllerType),
ButtonRecyclerViewItem buttonRecyclerViewItem = new ButtonRecyclerViewItem(
getString(R.string.controller_numbered, controllerIndex + 1),
getString(R.string.emulated_controller_with_type, controllerType),
() -> {
Bundle bundle = new Bundle();
bundle.putInt(ControllerInputsFragment.CONTROLLER_INDEX, controllerIndex);
NavHostFragment.findNavController(InputSettingsFragment.this).navigate(R.id.action_inputSettingsFragment_to_controllerInputsFragment, bundle);
});
genericRecyclerViewAdapter.addRecyclerViewItem(buttonRecyclerViewItem);
}
binding.inputSettingsRecyclerView.setAdapter(buttonListAdapter);
binding.inputSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter);
return binding.getRoot();
}
}
src/android/app/src/main/java/info/cemu/Cemu/RecyclerViewItem.java
+11
View File
@@ -0,0 +1,11 @@
package info.cemu.Cemu;
import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
public interface RecyclerViewItem {
RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent);
void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter<RecyclerView.ViewHolder> adapter);
}
src/android/app/src/main/java/info/cemu/Cemu/SettingsFragment.java
-95
View File
@@ -1,95 +0,0 @@
package info.cemu.Cemu;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.SpinnerAdapter;
import java.util.ArrayList;
import java.util.List;
import info.cemu.Cemu.databinding.FragmentSettingsBinding;
import info.cemu.Cemu.databinding.SettingsCheckboxBinding;
import info.cemu.Cemu.databinding.SettingsHeaderBinding;
import info.cemu.Cemu.databinding.SettingsCheckboxBinding;
import info.cemu.Cemu.databinding.SettingsSpinnerBinding;
public class SettingsFragment extends Fragment {
protected FragmentSettingsBinding binding;
public SettingsFragment() {
}
// public abstract int getSettingsNameId();
protected interface OnCheckBoxStateListener {
void onStateChanged(boolean checked);
}
protected interface OnItemSelectedPositionListener {
void onItemSelected(int position);
}
protected void addCheckBox(String title, String description, boolean initialValue, OnCheckBoxStateListener checkBoxStateListener) {
View checkboxLayout = getLayoutInflater().inflate(R.layout.settings_spinner, null);
binding.settingsLayout.addView(checkboxLayout);
SettingsCheckboxBinding checkboxBinding = SettingsCheckboxBinding.bind(checkboxLayout);
checkboxBinding.textviewCheckboxName.setText(title);
checkboxBinding.checkbox.setChecked(initialValue);
checkboxBinding.textviewCheckboxDescription.setText(description);
checkboxLayout.setOnClickListener(v -> {
boolean isChecked = !checkboxBinding.checkbox.isChecked();
checkboxBinding.checkbox.setChecked(isChecked);
checkBoxStateListener.onStateChanged(isChecked);
});
}
// protected void addSeparator() {
// View divider = getLayoutInflater().inflate(R.layout.divider_layout, null);
// binding.settingsLayout.addView(divider);
// }
protected void addHeader(String title) {
View headerLayout = getLayoutInflater().inflate(R.layout.settings_header, null);
binding.settingsLayout.addView(headerLayout);
SettingsHeaderBinding headerBinding = SettingsHeaderBinding.bind(headerLayout);
headerBinding.settingsTextviewHeaderName.setText(title);
}
protected void addSpinner(String title, List<String> items, int initialPosition, OnItemSelectedPositionListener itemSelectedPositionListener) {
View spinnerLayout = getLayoutInflater().inflate(R.layout.settings_spinner, null);
binding.settingsLayout.addView(spinnerLayout);
SettingsSpinnerBinding spinnerBinding = SettingsSpinnerBinding.bind(spinnerLayout);
spinnerBinding.textviewSpinnerName.setText(title);
spinnerLayout.setOnClickListener(v -> spinnerBinding.spinner.performClick());
ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, items);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinnerBinding.spinner.setAdapter(adapter);
spinnerBinding.spinner.setSelection(initialPosition);
spinnerBinding.spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
itemSelectedPositionListener.onItemSelected(position);
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
binding = FragmentSettingsBinding.inflate(inflater, container, false);
return binding.getRoot();
}
}
src/android/app/src/main/java/info/cemu/Cemu/SpinnerRecyclerViewItem.java
+65
View File
@@ -0,0 +1,65 @@
package info.cemu.Cemu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.Spinner;
import android.widget.SpinnerAdapter;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
public class SpinnerRecyclerViewItem implements RecyclerViewItem {
public interface OnItemSelectedListener {
void onItemSelected(int position);
}
private static class SpinnerViewHolder extends RecyclerView.ViewHolder {
TextView text;
Spinner spinner;
public SpinnerViewHolder(View itemView) {
super(itemView);
text = itemView.findViewById(R.id.spinner_label);
spinner = itemView.findViewById(R.id.spinner);
}
}
private final SpinnerAdapter spinnerAdapter;
private final int spinnerLabelResourceId;
private final int initialSelection;
private final OnItemSelectedListener onItemSelectedListener;
public SpinnerRecyclerViewItem(int spinnerLabelResourceId, SpinnerAdapter spinnerAdapter, int initialSelection, OnItemSelectedListener onItemSelectedListener) {
this.spinnerLabelResourceId = spinnerLabelResourceId;
this.spinnerAdapter = spinnerAdapter;
this.initialSelection = initialSelection;
this.onItemSelectedListener = onItemSelectedListener;
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent) {
return new SpinnerViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_spinner, parent, false));
}
@Override
public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, RecyclerView.Adapter<RecyclerView.ViewHolder> adapter) {
SpinnerViewHolder spinnerViewHolder = (SpinnerViewHolder) viewHolder;
spinnerViewHolder.text.setText(spinnerLabelResourceId);
spinnerViewHolder.spinner.setAdapter(spinnerAdapter);
spinnerViewHolder.spinner.setSelection(initialSelection);
spinnerViewHolder.spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long l) {
if (onItemSelectedListener != null)
onItemSelectedListener.onItemSelected(position);
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
}
}
src/android/app/src/main/res/layout/fragment_controller_inputs.xml
-18
View File
@@ -8,24 +8,6 @@
android:padding="16dp"
tools:context=".ControllerInputsFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="8dp"
android:text="@string/emulated_controller_label" />
<Spinner
android:id="@+id/emulated_controller_spinner"
android:layout_width="match_parent"
android:layout_height="48dp"
app:layout_constraintWidth_max="400dp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/controller_inputs_recycler_view"
android:layout_width="match_parent"
src/android/app/src/main/res/layout/fragment_settings.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsFragment">
<LinearLayout
android:id="@+id/settings_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</ScrollView>
src/android/app/src/main/res/layout/layout_button.xml
+5 -2
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/button_card"
style="?attr/materialCardViewFilledStyle"
android:layout_width="match_parent"
@@ -19,7 +20,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textAppearance="?attr/textAppearanceHeadline6" />
android:textAppearance="?attr/textAppearanceHeadline6"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/button_description"
@@ -28,6 +30,7 @@
android:layout_marginTop="8dp"
android:text="Description"
android:textAppearance="?attr/textAppearanceBody2"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorSecondary"
tools:ignore="HardcodedText" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
src/android/app/src/main/res/layout/layout_controller_header.xml → src/android/app/src/main/res/layout/layout_header.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/textview_controller_header"
android:id="@+id/textview_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"

Some files were not shown because too many files have changed in this diff Show More