Skip to content
Snippets Groups Projects
Commit 144d75b0 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed a minor bug

parent 59b32b7b
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ import com.bignerdranch.expandablerecyclerview.Adapter.ExpandableRecyclerAdapter ...@@ -32,6 +32,7 @@ import com.bignerdranch.expandablerecyclerview.Adapter.ExpandableRecyclerAdapter
import com.bignerdranch.expandablerecyclerview.Model.ParentListItem; import com.bignerdranch.expandablerecyclerview.Model.ParentListItem;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Comparator;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap; import java.util.WeakHashMap;
...@@ -41,14 +42,14 @@ import de.kuschku.libquassel.syncables.types.interfaces.QNetwork; ...@@ -41,14 +42,14 @@ import de.kuschku.libquassel.syncables.types.interfaces.QNetwork;
import de.kuschku.quasseldroid_ng.ui.theme.AppContext; import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
import de.kuschku.util.observables.callbacks.ElementCallback; import de.kuschku.util.observables.callbacks.ElementCallback;
import de.kuschku.util.observables.callbacks.UICallback; import de.kuschku.util.observables.callbacks.UICallback;
import de.kuschku.util.observables.lists.AndroidObservableSortedList;
import de.kuschku.util.observables.lists.ObservableElement; import de.kuschku.util.observables.lists.ObservableElement;
import de.kuschku.util.observables.lists.ObservableSortedList;
import static de.kuschku.util.AndroidAssert.assertNotNull; import static de.kuschku.util.AndroidAssert.assertNotNull;
public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkViewHolder, BufferViewHolder> implements OnBufferClickListener, OnBufferLongClickListener { public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkViewHolder, BufferViewHolder> implements OnBufferClickListener, OnBufferLongClickListener {
private final AppContext context; private final AppContext context;
private final AndroidObservableSortedList<NetworkItem> items; private final ObservableSortedList<NetworkItem> items;
private final Map<QNetwork, NetworkItem> itemMap = new WeakHashMap<>(); private final Map<QNetwork, NetworkItem> itemMap = new WeakHashMap<>();
private final Map<Integer, BufferViewHolder> bufferViewHolderMap = new WeakHashMap<>(); private final Map<Integer, BufferViewHolder> bufferViewHolderMap = new WeakHashMap<>();
private final ObservableElement<Boolean> showAll = new ObservableElement<>(false); private final ObservableElement<Boolean> showAll = new ObservableElement<>(false);
...@@ -69,7 +70,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi ...@@ -69,7 +70,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi
@Override @Override
public void notifyItemChanged(QNetwork network) { public void notifyItemChanged(QNetwork network) {
if (items.contains(itemMap.get(network))) if (items.contains(itemMap.get(network)))
items.notifyItemChanged(items.indexOf(itemMap.get(network))); items.notifyItemChanged(itemMap.get(network));
} }
}; };
private WeakReference<RecyclerView> recyclerView = new WeakReference<>(null); private WeakReference<RecyclerView> recyclerView = new WeakReference<>(null);
...@@ -77,7 +78,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi ...@@ -77,7 +78,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi
private OnBufferClickListener bufferClickListener; private OnBufferClickListener bufferClickListener;
private ActionModeHandler actionModeHandler; private ActionModeHandler actionModeHandler;
private BufferViewConfigAdapter(AppContext context, AndroidObservableSortedList<NetworkItem> items) { private BufferViewConfigAdapter(AppContext context, ObservableSortedList<NetworkItem> items) {
super(items); super(items);
this.context = context; this.context = context;
this.items = items; this.items = items;
...@@ -135,9 +136,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi ...@@ -135,9 +136,7 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi
} }
public static BufferViewConfigAdapter of(AppContext context) { public static BufferViewConfigAdapter of(AppContext context) {
final AndroidObservableSortedList<NetworkItem> networkItems = new AndroidObservableSortedList<>(NetworkItem.class, new AndroidObservableSortedList.ItemComparator<NetworkItem>() { final ObservableSortedList<NetworkItem> networkItems = new ObservableSortedList<>((Comparator<NetworkItem>) (o1, o2) -> {
@Override
public int compare(NetworkItem o1, NetworkItem o2) {
assertNotNull(o1); assertNotNull(o1);
assertNotNull(o2); assertNotNull(o2);
...@@ -164,17 +163,6 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi ...@@ -164,17 +163,6 @@ public class BufferViewConfigAdapter extends ExpandableRecyclerAdapter<NetworkVi
return name1.compareToIgnoreCase(name2); return name1.compareToIgnoreCase(name2);
} }
} }
}
@Override
public boolean areContentsTheSame(NetworkItem oldItem, NetworkItem newItem) {
return oldItem == newItem;
}
@Override
public boolean areItemsTheSame(NetworkItem item1, NetworkItem item2) {
return item1.getNetwork().networkId() == item2.getNetwork().networkId();
}
}); });
return new BufferViewConfigAdapter(context, networkItems); return new BufferViewConfigAdapter(context, networkItems);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment