diff --git a/src/android/app/src/main/java/info/cemu/Cemu/inputoverlay/InputOverlaySettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/inputoverlay/InputOverlaySettingsFragment.java index 32b5dfc3..9fbfb71a 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/inputoverlay/InputOverlaySettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/inputoverlay/InputOverlaySettingsFragment.java @@ -15,7 +15,7 @@ import java.util.stream.IntStream; import info.cemu.Cemu.R; import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; -import info.cemu.Cemu.guibasecomponents.CheckboxRecyclerViewItem; +import info.cemu.Cemu.guibasecomponents.ToggleRecyclerViewItem; import info.cemu.Cemu.guibasecomponents.GenericRecyclerViewAdapter; import info.cemu.Cemu.guibasecomponents.SelectionAdapter; import info.cemu.Cemu.guibasecomponents.SingleSelectionRecyclerViewItem; @@ -40,7 +40,7 @@ public class InputOverlaySettingsFragment extends Fragment { var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); - CheckboxRecyclerViewItem inputOverlayCheckbox = new CheckboxRecyclerViewItem( + ToggleRecyclerViewItem inputOverlayToggle = new ToggleRecyclerViewItem( getString(R.string.input_overlay), getString(R.string.enable_input_overlay), overlaySettings.isOverlayEnabled(), @@ -48,9 +48,9 @@ public class InputOverlaySettingsFragment extends Fragment { overlaySettings.setOverlayEnabled(checked); overlaySettings.saveSettings(); }); - genericRecyclerViewAdapter.addRecyclerViewItem(inputOverlayCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(inputOverlayToggle); - CheckboxRecyclerViewItem vibrateOnTouchCheckbox = new CheckboxRecyclerViewItem( + ToggleRecyclerViewItem vibrateOnTouchToggle = new ToggleRecyclerViewItem( getString(R.string.vibrate), getString(R.string.enable_vibrate_on_touch), overlaySettings.isVibrateOnTouchEnabled(), @@ -58,7 +58,7 @@ public class InputOverlaySettingsFragment extends Fragment { overlaySettings.setVibrateOnTouchEnabled(checked); overlaySettings.saveSettings(); }); - genericRecyclerViewAdapter.addRecyclerViewItem(vibrateOnTouchCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(vibrateOnTouchToggle); SliderRecyclerViewItem alphaSlider = new SliderRecyclerViewItem( getString(R.string.alpha_slider), diff --git a/src/android/app/src/main/java/info/cemu/Cemu/settings/audio/AudioSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/settings/audio/AudioSettingsFragment.java index edf4212c..459b46d2 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/settings/audio/AudioSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/settings/audio/AudioSettingsFragment.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; import info.cemu.Cemu.R; import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; -import info.cemu.Cemu.guibasecomponents.CheckboxRecyclerViewItem; +import info.cemu.Cemu.guibasecomponents.ToggleRecyclerViewItem; import info.cemu.Cemu.guibasecomponents.GenericRecyclerViewAdapter; import info.cemu.Cemu.guibasecomponents.SelectionAdapter; import info.cemu.Cemu.guibasecomponents.SingleSelectionRecyclerViewItem; @@ -37,10 +37,10 @@ public class AudioSettingsFragment extends Fragment { GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); - CheckboxRecyclerViewItem tvDeviceCheckbox = new CheckboxRecyclerViewItem(getString(R.string.tv), + ToggleRecyclerViewItem tvDeviceToggle = new ToggleRecyclerViewItem(getString(R.string.tv), getString(R.string.tv_audio_description), NativeSettings.getAudioDeviceEnabled(true), checked -> NativeSettings.setAudioDeviceEnabled(checked, true)); - genericRecyclerViewAdapter.addRecyclerViewItem(tvDeviceCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(tvDeviceToggle); var tvChannelsChoices = Stream.of(NativeSettings.AUDIO_CHANNELS_MONO, NativeSettings.AUDIO_CHANNELS_STEREO, NativeSettings.AUDIO_CHANNELS_SURROUND) .map(channels -> new SelectionAdapter.ChoiceItem<>(t -> t.setText(channelsToResourceNameId(channels)), channels)) @@ -63,10 +63,10 @@ public class AudioSettingsFragment extends Fragment { value -> (int) value + "%"); genericRecyclerViewAdapter.addRecyclerViewItem(tvVolumeSlider); - CheckboxRecyclerViewItem padDeviceCheckbox = new CheckboxRecyclerViewItem(getString(R.string.gamepad), + ToggleRecyclerViewItem padDeviceToggle = new ToggleRecyclerViewItem(getString(R.string.gamepad), getString(R.string.gamepad_audio_description), NativeSettings.getAudioDeviceEnabled(false), checked -> NativeSettings.setAudioDeviceEnabled(checked, false)); - genericRecyclerViewAdapter.addRecyclerViewItem(padDeviceCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(padDeviceToggle); var gamepadChannelsChoices = List.of(new SelectionAdapter.ChoiceItem<>(t -> t.setText(channelsToResourceNameId(NativeSettings.AUDIO_CHANNELS_STEREO)), NativeSettings.AUDIO_CHANNELS_STEREO)); int gamepadChannels = NativeSettings.getAudioDeviceChannels(false); diff --git a/src/android/app/src/main/java/info/cemu/Cemu/settings/graphics/GraphicsSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/settings/graphics/GraphicsSettingsFragment.java index 9185399c..d6038120 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/settings/graphics/GraphicsSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/settings/graphics/GraphicsSettingsFragment.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; import info.cemu.Cemu.R; import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; -import info.cemu.Cemu.guibasecomponents.CheckboxRecyclerViewItem; +import info.cemu.Cemu.guibasecomponents.ToggleRecyclerViewItem; import info.cemu.Cemu.guibasecomponents.GenericRecyclerViewAdapter; import info.cemu.Cemu.guibasecomponents.SelectionAdapter; import info.cemu.Cemu.guibasecomponents.SingleSelectionRecyclerViewItem; @@ -55,8 +55,8 @@ public class GraphicsSettingsFragment extends Fragment { GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); - CheckboxRecyclerViewItem asyncShaderCheckbox = new CheckboxRecyclerViewItem(getString(R.string.async_shader_compile), getString(R.string.async_shader_compile_description), NativeSettings.getAsyncShaderCompile(), NativeSettings::setAsyncShaderCompile); - genericRecyclerViewAdapter.addRecyclerViewItem(asyncShaderCheckbox); + ToggleRecyclerViewItem asyncShaderToggle = new ToggleRecyclerViewItem(getString(R.string.async_shader_compile), getString(R.string.async_shader_compile_description), NativeSettings.getAsyncShaderCompile(), NativeSettings::setAsyncShaderCompile); + genericRecyclerViewAdapter.addRecyclerViewItem(asyncShaderToggle); int vsyncMode = NativeSettings.getVSyncMode(); var vsyncChoices = Stream.of(NativeSettings.VSYNC_MODE_OFF, NativeSettings.VSYNC_MODE_DOUBLE_BUFFERING, NativeSettings.VSYNC_MODE_TRIPLE_BUFFERING) @@ -71,8 +71,8 @@ public class GraphicsSettingsFragment extends Fragment { }); genericRecyclerViewAdapter.addRecyclerViewItem(vsyncModeSelection); - CheckboxRecyclerViewItem accurateBarriersCheckbox = new CheckboxRecyclerViewItem(getString(R.string.accurate_barriers), getString(R.string.accurate_barriers_description), NativeSettings.getAccurateBarriers(), NativeSettings::setAccurateBarriers); - genericRecyclerViewAdapter.addRecyclerViewItem(accurateBarriersCheckbox); + ToggleRecyclerViewItem accurateBarriersToggle = new ToggleRecyclerViewItem(getString(R.string.accurate_barriers), getString(R.string.accurate_barriers_description), NativeSettings.getAccurateBarriers(), NativeSettings::setAccurateBarriers); + genericRecyclerViewAdapter.addRecyclerViewItem(accurateBarriersToggle); int fullscreenScalingMode = NativeSettings.getFullscreenScaling(); var fullscreenScalingChoices = Stream.of(NativeSettings.FULLSCREEN_SCALING_KEEP_ASPECT_RATIO, NativeSettings.FULLSCREEN_SCALING_STRETCH) diff --git a/src/android/app/src/main/java/info/cemu/Cemu/settings/overlay/OverlaySettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/settings/overlay/OverlaySettingsFragment.java index 571863a7..06a74d01 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/settings/overlay/OverlaySettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/settings/overlay/OverlaySettingsFragment.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; import info.cemu.Cemu.R; import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; -import info.cemu.Cemu.guibasecomponents.CheckboxRecyclerViewItem; +import info.cemu.Cemu.guibasecomponents.ToggleRecyclerViewItem; import info.cemu.Cemu.guibasecomponents.GenericRecyclerViewAdapter; import info.cemu.Cemu.guibasecomponents.HeaderRecyclerViewItem; import info.cemu.Cemu.guibasecomponents.SelectionAdapter; @@ -80,30 +80,30 @@ public class OverlaySettingsFragment extends Fragment { value -> (int) value + "%"); genericRecyclerViewAdapter.addRecyclerViewItem(overlayTextScale); - CheckboxRecyclerViewItem overlayFps = new CheckboxRecyclerViewItem(getString(R.string.fps), + ToggleRecyclerViewItem overlayFps = new ToggleRecyclerViewItem(getString(R.string.fps), getString(R.string.fps_overlay_description), NativeSettings.isOverlayFPSEnabled(), NativeSettings::setOverlayFPSEnabled); genericRecyclerViewAdapter.addRecyclerViewItem(overlayFps); - CheckboxRecyclerViewItem drawCallsCheckbox = new CheckboxRecyclerViewItem(getString(R.string.draw_calls_per_frame), + ToggleRecyclerViewItem drawCallsToggle = new ToggleRecyclerViewItem(getString(R.string.draw_calls_per_frame), getString(R.string.draw_calls_per_frame_overlay_description), NativeSettings.isOverlayDrawCallsPerFrameEnabled(), NativeSettings::setOverlayDrawCallsPerFrameEnabled); - genericRecyclerViewAdapter.addRecyclerViewItem(drawCallsCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(drawCallsToggle); - CheckboxRecyclerViewItem cpuUsageCheckbox = new CheckboxRecyclerViewItem(getString(R.string.cpu_usage), + ToggleRecyclerViewItem cpuUsageToggle = new ToggleRecyclerViewItem(getString(R.string.cpu_usage), getString(R.string.cpu_usage_overlay_description), NativeSettings.isOverlayCPUUsageEnabled(), NativeSettings::setOverlayCPUUsageEnabled); - genericRecyclerViewAdapter.addRecyclerViewItem(cpuUsageCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(cpuUsageToggle); - CheckboxRecyclerViewItem ramUsageCheckbox = new CheckboxRecyclerViewItem(getString(R.string.ram_usage), + ToggleRecyclerViewItem ramUsageToggle = new ToggleRecyclerViewItem(getString(R.string.ram_usage), getString(R.string.ram_usage_overlay_description), NativeSettings.isOverlayRAMUsageEnabled(), NativeSettings::setOverlayRAMUsageEnabled); - genericRecyclerViewAdapter.addRecyclerViewItem(ramUsageCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(ramUsageToggle); - CheckboxRecyclerViewItem debugCheckbox = new CheckboxRecyclerViewItem(getString(R.string.debug), + ToggleRecyclerViewItem debugToggle = new ToggleRecyclerViewItem(getString(R.string.debug), getString(R.string.debug_overlay_description), NativeSettings.isOverlayDebugEnabled(), NativeSettings::setOverlayDebugEnabled); - genericRecyclerViewAdapter.addRecyclerViewItem(debugCheckbox); + genericRecyclerViewAdapter.addRecyclerViewItem(debugToggle); genericRecyclerViewAdapter.addRecyclerViewItem(new HeaderRecyclerViewItem(R.string.notifications)); int notificationsPosition = NativeSettings.getNotificationsPosition(); @@ -125,17 +125,17 @@ public class OverlaySettingsFragment extends Fragment { value -> (int) value + "%"); genericRecyclerViewAdapter.addRecyclerViewItem(notificationTextScale); - CheckboxRecyclerViewItem controllerProfiles = new CheckboxRecyclerViewItem(getString(R.string.controller_profiles), + ToggleRecyclerViewItem controllerProfiles = new ToggleRecyclerViewItem(getString(R.string.controller_profiles), getString(R.string.controller_profiles_notification_description), NativeSettings.isNotificationControllerProfilesEnabled(), NativeSettings::setNotificationControllerProfilesEnabled); genericRecyclerViewAdapter.addRecyclerViewItem(controllerProfiles); - CheckboxRecyclerViewItem shaderCompiler = new CheckboxRecyclerViewItem(getString(R.string.shader_compiler), + ToggleRecyclerViewItem shaderCompiler = new ToggleRecyclerViewItem(getString(R.string.shader_compiler), getString(R.string.shader_compiler_notification_description), NativeSettings.isNotificationShaderCompilerEnabled(), NativeSettings::setNotificationShaderCompilerEnabled); genericRecyclerViewAdapter.addRecyclerViewItem(shaderCompiler); - CheckboxRecyclerViewItem friendList = new CheckboxRecyclerViewItem(getString(R.string.friend_list), + ToggleRecyclerViewItem friendList = new ToggleRecyclerViewItem(getString(R.string.friend_list), getString(R.string.friend_list_notification_description), NativeSettings.isNotificationFriendListEnabled(), NativeSettings::setNotificationFriendListEnabled); genericRecyclerViewAdapter.addRecyclerViewItem(friendList);