summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/source/src/java/org/libreoffice/ColorPaletteAdapter.java4
-rw-r--r--android/source/src/java/org/libreoffice/ColorPickerAdapter.java8
2 files changed, 5 insertions, 7 deletions
diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
index d126ef1ed1a5..e5e078934c71 100644
--- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
@@ -38,7 +38,7 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte
}
@Override
- public void onBindViewHolder(final ColorPaletteViewHolder holder, final int position) {
+ public void onBindViewHolder(final ColorPaletteViewHolder holder, int position) {
holder.colorBox.setBackgroundColor(color_palette[upperSelectedBox][position]);
if (selectedBox == position) {
@@ -50,7 +50,7 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte
holder.colorBox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- setPosition(position);
+ setPosition(holder.getAdapterPosition());
}
});
if (animate) //it will only animate when the upper color box is selected
diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
index 897084c9e607..8c5f2744bcfe 100644
--- a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPickerAdapter.java
@@ -39,7 +39,7 @@ public class ColorPickerAdapter extends RecyclerView.Adapter<ColorPickerAdapter.
}
@Override
- public void onBindViewHolder(final ColorPickerViewHolder holder, final int position) {
+ public void onBindViewHolder(final ColorPickerViewHolder holder, int position) {
holder.colorBox.setBackgroundColor(colorList[position]);
if (selectedBox != position)
@@ -51,12 +51,10 @@ public class ColorPickerAdapter extends RecyclerView.Adapter<ColorPickerAdapter.
holder.colorBox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- setPosition(position);
- colorPaletteListener.applyColor(colorList[position]);
+ setPosition(holder.getAdapterPosition());
+ colorPaletteListener.applyColor(colorList[holder.getAdapterPosition()]);
}
});
-
-
}
@Override