diff options
| author | JosJuice <josjuice@gmail.com> | 2022-12-24 09:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-24 09:09:17 +0100 |
| commit | b3bc9c41eac28abc69b8db079b4aa35598f4b5da (patch) | |
| tree | a8b96d5c8e919fff48e04c24b1af84c038e4a8e6 /Source/Android/app/src/main | |
| parent | 54a6c4a90dc02ccb2036f3309ded70f40403242a (diff) | |
| parent | cf8537576e98d0f9ee1dd03ee8c73e44bbc3cd88 (diff) | |
Merge pull request #11369 from t895/switch-fix
Android: Allow users to interact with switches in settings
Diffstat (limited to 'Source/Android/app/src/main')
2 files changed, 9 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java index 9364f1e3eb..ea7185b2ec 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java @@ -33,6 +33,15 @@ public final class SwitchSettingViewHolder extends SettingViewHolder mBinding.settingSwitch.setChecked(mItem.isChecked(getAdapter().getSettings())); + mBinding.settingSwitch.setEnabled(mItem.isEditable()); + + mBinding.settingSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> + { + getAdapter().onBooleanClick(mItem, mBinding.settingSwitch.isChecked()); + + setStyle(mBinding.textSettingName, mItem); + }); + setStyle(mBinding.textSettingName, mItem); } @@ -46,10 +55,6 @@ public final class SwitchSettingViewHolder extends SettingViewHolder } mBinding.settingSwitch.toggle(); - - getAdapter().onBooleanClick(mItem, mBinding.settingSwitch.isChecked()); - - setStyle(mBinding.textSettingName, mItem); } @Nullable @Override diff --git a/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml b/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml index aab0408c7b..9613a7337f 100644 --- a/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml +++ b/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml @@ -44,7 +44,6 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="24dp" - android:clickable="false" android:focusable="false" android:minHeight="0dp" android:minWidth="0dp" /> |