Merge pull request #10636 from t895/getBindingAdapterPosition

Android: Replace deprecated method calls for adapter position
dolphin-emu · May 7, 2022 · 4b6a473 · 4b6a473
2 parents 9858a79 + c048352
commit 4b6a473
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.../org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java b/.../org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java
@@ -59,7 +59,7 @@ public void onClick(View clicked)
 
     mCheckbox.toggle();
 
-    getAdapter().onBooleanClick(mItem, getAdapterPosition(), mCheckbox.isChecked());
+    getAdapter().onBooleanClick(mItem, getBindingAdapterPosition(), mCheckbox.isChecked());
 
     setStyle(mTextSettingName, mItem);
   }

diff --git a/.../java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/FilePickerViewHolder.java b/.../java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/FilePickerViewHolder.java
@@ -90,7 +90,7 @@ public void onClick(View clicked)
       return;
     }
 
-    int position = getAdapterPosition();
+    int position = getBindingAdapterPosition();
     if (mFilePicker.getRequestType() == MainPresenter.REQUEST_DIRECTORY)
     {
       getAdapter().onFilePickerDirectoryClick(mItem, position);

diff --git a/.../dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java b/.../dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java
@@ -61,7 +61,7 @@ public void onClick(View clicked)
       return;
     }
 
-    getAdapter().onInputBindingClick(mItem, getAdapterPosition());
+    getAdapter().onInputBindingClick(mItem, getBindingAdapterPosition());
 
     setStyle(mTextSettingName, mItem);
   }

diff --git a/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java b/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
@@ -61,7 +61,7 @@ public void onClick(View clicked)
       return;
     }
 
-    getAdapter().onInputBindingClick(mItem, getAdapterPosition());
+    getAdapter().onInputBindingClick(mItem, getBindingAdapterPosition());
 
     setStyle(mTextSettingName, mItem);
   }

diff --git a/...ain/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java b/...ain/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java
@@ -102,7 +102,7 @@ public boolean onLongClick(View clicked)
     builder
             .setPositiveButton(R.string.ok, (dialog, whichButton) ->
             {
-              getAdapter().clearSetting(item, getAdapterPosition());
+              getAdapter().clearSetting(item, getBindingAdapterPosition());
               bind(item);
               Toast.makeText(context, R.string.setting_cleared, Toast.LENGTH_SHORT).show();
               dialog.dismiss();

diff --git a/...ava/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java b/...ava/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java
@@ -98,7 +98,7 @@ public void onClick(View clicked)
       return;
     }
 
-    int position = getAdapterPosition();
+    int position = getBindingAdapterPosition();
     if (mItem instanceof SingleChoiceSetting)
     {
       getAdapter().onSingleChoiceClick((SingleChoiceSetting) mItem, position);

diff --git a/...main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java b/...main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java
@@ -67,7 +67,7 @@ public void onClick(View clicked)
       return;
     }
 
-    getAdapter().onSliderClick(mItem, getAdapterPosition());
+    getAdapter().onSliderClick(mItem, getBindingAdapterPosition());
 
     setStyle(mTextSettingName, mItem);
   }