AdapterView: implement setAdapter / getAdapter() properly

This commit is contained in:
Julian Winkler
2024-02-17 15:26:59 +01:00
parent 85f750d76b
commit b9b28619dd
6 changed files with 32 additions and 9 deletions

View File

@@ -209,11 +209,11 @@ JNIEXPORT jlong JNICALL Java_android_widget_AbsListView_native_1constructor
/* /*
* Class: android_widget_AbsListView * Class: android_widget_AbsListView
* Method: setAdapter * Method: native_setAdapter
* Signature: (Landroid/widget/ListAdapter;)V * Signature: (JLandroid/widget/ListAdapter;)V
*/ */
JNIEXPORT void JNICALL Java_android_widget_AbsListView_setAdapter JNIEXPORT void JNICALL Java_android_widget_AbsListView_native_1setAdapter
(JNIEnv *, jobject, jobject); (JNIEnv *, jobject, jlong, jobject);
/* /*
* Class: android_widget_AbsListView * Class: android_widget_AbsListView

View File

@@ -104,10 +104,14 @@ JNIEXPORT jlong JNICALL Java_android_widget_AbsListView_native_1constructor(JNIE
return _INTPTR(scrolled_window); return _INTPTR(scrolled_window);
} }
JNIEXPORT void JNICALL Java_android_widget_AbsListView_setAdapter(JNIEnv *env, jobject this, jobject adapter) JNIEXPORT void JNICALL Java_android_widget_AbsListView_native_1setAdapter(JNIEnv *env, jobject this, jlong widget_ptr, jobject adapter)
{ {
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW(_PTR(_GET_LONG_FIELD(this, "widget"))); GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW(_PTR(widget_ptr));
GtkListView *list_view = GTK_LIST_VIEW(gtk_scrolled_window_get_child(scrolled_window)); GtkListView *list_view = GTK_LIST_VIEW(gtk_scrolled_window_get_child(scrolled_window));
if (!adapter) {
gtk_list_view_set_model(list_view, NULL);
return;
}
RangeListModel *model = g_object_new(range_list_model_get_type(), NULL); RangeListModel *model = g_object_new(range_list_model_get_type(), NULL);
model->list_view = list_view; model->list_view = list_view;
model->jobject = _REF(this); model->jobject = _REF(this);

View File

@@ -17,12 +17,16 @@ public abstract class AbsListView extends AdapterView {
@Override @Override
protected native long native_constructor(Context context, AttributeSet attrs); protected native long native_constructor(Context context, AttributeSet attrs);
protected native void native_setAdapter(long widget, ListAdapter adapter);
public void setChoiceMode(int choiceMode) {} public void setChoiceMode(int choiceMode) {}
public void setOnScrollListener(OnScrollListener onScrollListener) {} public void setOnScrollListener(OnScrollListener onScrollListener) {}
public native void setAdapter(ListAdapter adapter); public void setAdapter(ListAdapter adapter) {
super.setAdapter(adapter);
native_setAdapter(this.widget, adapter);
}
public native void setItemChecked(int position, boolean value); public native void setItemChecked(int position, boolean value);
@@ -37,6 +41,10 @@ public abstract class AbsListView extends AdapterView {
public int getListPaddingBottom() {return 0;} public int getListPaddingBottom() {return 0;}
public ListAdapter getAdapter() {
return (ListAdapter) super.getAdapter();
}
public int pointToPosition(int x, int y) { public int pointToPosition(int x, int y) {
return -1; return -1;
} }

View File

@@ -7,6 +7,8 @@ import android.view.ViewGroup;
public abstract class AdapterView extends ViewGroup { public abstract class AdapterView extends ViewGroup {
private Adapter adapter;
public AdapterView(Context context) { public AdapterView(Context context) {
super(context); super(context);
} }
@@ -22,7 +24,8 @@ public abstract class AdapterView extends ViewGroup {
public void onItemClick(AdapterView parent, View view, int position, long id); public void onItemClick(AdapterView parent, View view, int position, long id);
} }
public void setAdapter(SpinnerAdapter adapter) { public void setAdapter(Adapter adapter) {
this.adapter = adapter;
} }
public void setSelection(int i) { public void setSelection(int i) {
@@ -33,4 +36,8 @@ public abstract class AdapterView extends ViewGroup {
public void setOnItemClickListener(AdapterView.OnItemClickListener listener) {} public void setOnItemClickListener(AdapterView.OnItemClickListener listener) {}
public void setSelection(int position, boolean animate) {} public void setSelection(int position, boolean animate) {}
public Adapter getAdapter() {
return adapter;
}
} }

View File

@@ -27,7 +27,7 @@ import android.view.ViewGroup;
* {@link ListAdapter} interface} and {@link Spinner} (by implementing the * {@link ListAdapter} interface} and {@link Spinner} (by implementing the
* specialized {@link SpinnerAdapter} interface. * specialized {@link SpinnerAdapter} interface.
*/ */
public abstract class BaseAdapter implements /*ListAdapter,*/ SpinnerAdapter { public abstract class BaseAdapter implements ListAdapter, SpinnerAdapter {
private final DataSetObservable mDataSetObservable = new DataSetObservable(); private final DataSetObservable mDataSetObservable = new DataSetObservable();
public boolean hasStableIds() { public boolean hasStableIds() {
return false; return false;

View File

@@ -13,4 +13,8 @@ public class Spinner extends AbsSpinner {
super(context, attributeSet); super(context, attributeSet);
} }
public void setAdapter(SpinnerAdapter adapter) {
super.setAdapter(adapter);
}
} }