frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Keyed...: Rename all the things

Browse Source 
Hooray for diamond interface inheritance.

Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2018-01-06 23:07:17 -06:00
parent 4d38993832
commit 4f2b6bef84
9 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
+6 -6
View File
@@ -11,7 +11,7 @@ import android.widget.TextView;
import com.wireguard.android.R;
import com.wireguard.android.util.Keyed;
import com.wireguard.android.util.KeyedObservableList;
import com.wireguard.android.util.ObservableKeyedList;
import com.wireguard.android.widget.ToggleSwitch;
import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -68,13 +68,13 @@ public final class BindingAdapters {
@BindingAdapter({"items", "layout"})
public static <K, E extends Keyed<? extends K>>
void setItems(final ListView view,
final KeyedObservableList<K, E> oldList, final int oldLayoutId,
final KeyedObservableList<K, E> newList, final int newLayoutId) {
final ObservableKeyedList<K, E> oldList, final int oldLayoutId,
final ObservableKeyedList<K, E> newList, final int newLayoutId) {
if (oldList == newList && oldLayoutId == newLayoutId)
return;
// The ListAdapter interface is not generic, so this cannot be checked.
@SuppressWarnings("unchecked") KeyedObservableListAdapter<K, E> adapter =
(KeyedObservableListAdapter<K, E>) view.getAdapter();
@SuppressWarnings("unchecked") ObservableKeyedListAdapter<K, E> adapter =
(ObservableKeyedListAdapter<K, E>) view.getAdapter();
// If the layout changes, any existing adapter must be replaced.
if (adapter != null && oldList != null && oldLayoutId != newLayoutId) {
adapter.setList(null);
@@ -84,7 +84,7 @@ public final class BindingAdapters {
if (newList == null || newLayoutId == 0)
return;
if (adapter == null) {
adapter = new KeyedObservableListAdapter<>(view.getContext(), newLayoutId, newList);
adapter = new ObservableKeyedListAdapter<>(view.getContext(), newLayoutId, newList);
view.setAdapter(adapter);
}
// Either the list changed, or this is an entirely new listener because the layout changed.
app/src/main/java/com/wireguard/android/databinding/KeyedObservableListAdapter.java → app/src/main/java/com/wireguard/android/databinding/ObservableKeyedListAdapter.java
+10 -10
View File
@@ -11,22 +11,22 @@ import android.widget.BaseAdapter;
import com.wireguard.android.BR;
import com.wireguard.android.util.Keyed;
import com.wireguard.android.util.KeyedObservableList;
import com.wireguard.android.util.ObservableKeyedList;
import java.lang.ref.WeakReference;
/**
* A generic {@code ListAdapter} backed by a {@code KeyedObservableList}.
* A generic {@code ListAdapter} backed by a {@code ObservableKeyedList}.
*/
class KeyedObservableListAdapter<K, E extends Keyed<? extends K>> extends BaseAdapter {
class ObservableKeyedListAdapter<K, E extends Keyed<? extends K>> extends BaseAdapter {
private final OnListChangedCallback<E> callback = new OnListChangedCallback<>(this);
private final int layoutId;
private final LayoutInflater layoutInflater;
private KeyedObservableList<K, E> list;
private ObservableKeyedList<K, E> list;
KeyedObservableListAdapter(final Context context, final int layoutId,
final KeyedObservableList<K, E> list) {
ObservableKeyedListAdapter(final Context context, final int layoutId,
final ObservableKeyedList<K, E> list) {
this.layoutId = layoutId;
layoutInflater = LayoutInflater.from(context);
setList(list);
@@ -72,7 +72,7 @@ class KeyedObservableListAdapter<K, E extends Keyed<? extends K>> extends BaseAd
return true;
}
void setList(final KeyedObservableList<K, E> newList) {
void setList(final ObservableKeyedList<K, E> newList) {
if (list != null)
list.removeOnListChangedCallback(callback);
list = newList;
@@ -85,15 +85,15 @@ class KeyedObservableListAdapter<K, E extends Keyed<? extends K>> extends BaseAd
private static final class OnListChangedCallback<E extends Keyed<?>>
extends ObservableList.OnListChangedCallback<ObservableList<E>> {
private final WeakReference<KeyedObservableListAdapter<?, E>> weakAdapter;
private final WeakReference<ObservableKeyedListAdapter<?, E>> weakAdapter;
private OnListChangedCallback(final KeyedObservableListAdapter<?, E> adapter) {
private OnListChangedCallback(final ObservableKeyedListAdapter<?, E> adapter) {
weakAdapter = new WeakReference<>(adapter);
}
@Override
public void onChanged(final ObservableList<E> sender) {
final KeyedObservableListAdapter adapter = weakAdapter.get();
final ObservableKeyedListAdapter adapter = weakAdapter.get();
if (adapter != null)
adapter.notifyDataSetChanged();
else