implement android.widget.Spinner using GtkDropDown

Helper classes from ListView implementation are reused. The declarations
have been moved to a new header file AdaperView.h

src/api-impl-jni/widgets/AdapterView.h

@@ -0,0 +1,31 @@
+#ifndef _ADAPTER_VIEW_H_
+#define _ADAPTER_VIEW_H_
+
+#include <gtk/gtk.h>
+#include <jni.h>
+
+/*
+ * RangeListModel:
+ * Implementation of GListModel for use in AdapterView subclasses.
+ * Provides RangeListItems, which are created on demand.
+ */
+struct _RangeListModel {
+	GObject parent_instance;
+	GtkWidget *list_view;
+	jobject jobject;
+	jobject adapter;
+	guint n_items;
+};
+G_DECLARE_FINAL_TYPE(RangeListModel, range_list_model, RANGE, LIST_MODEL, GObject)
+
+/*
+ * RangeListItem:
+ * Dummy type to be returned by RangeListModel. Contains nothing, but a reference to the RangeListModel.
+ */
+struct _RangeListItem {
+	GObject parent_instance;
+	RangeListModel *model;
+};
+G_DECLARE_FINAL_TYPE(RangeListItem, range_list_item, RANGE, LIST_ITEM, GObject)
+
+#endif // _ADAPTER_VIEW_H_

src/api-impl-jni/widgets/android_widget_AbsListView.c

@@ -6,17 +6,10 @@
 #include "../util.h"
 
 #include "WrapperWidget.h"
+#include "AdapterView.h"
 
 #include "../generated_headers/android_widget_AbsListView.h"
 
-struct _RangeListModel {
-	GObject parent_instance;
-	GtkListView *list_view;
-	jobject jobject;
-	jobject adapter;
-	guint n_items;
-};
-G_DECLARE_FINAL_TYPE(RangeListModel, range_list_model, RANGE, LIST_MODEL, GObject)
 static void range_list_model_init(RangeListModel *list_model) {}
 static void range_list_model_class_init(RangeListModelClass *class) {}
 
@@ -27,24 +20,32 @@ static guint range_list_model_get_n_items(GListModel *list_model)
 
 static gpointer range_list_model_get_item(GListModel *list_model, guint index)
 {
-	return g_object_ref(list_model);
+	if (index >= RANGE_LIST_MODEL(list_model)->n_items)
+		return NULL;
+	RangeListItem *item = g_object_new(range_list_item_get_type(), NULL);
+	item->model = RANGE_LIST_MODEL(list_model);
+	return item;
 }
 
 static void range_list_model_model_init(GListModelInterface *iface)
 {
 	iface->get_n_items = range_list_model_get_n_items;
-	iface->get_item_type = (GType (*)(GListModel *))range_list_model_get_type;
+	iface->get_item_type = (GType (*)(GListModel *))range_list_item_get_type;
 	iface->get_item = range_list_model_get_item;
 }
 
 G_DEFINE_TYPE_WITH_CODE(RangeListModel, range_list_model, G_TYPE_OBJECT,
 		G_IMPLEMENT_INTERFACE(G_TYPE_LIST_MODEL, range_list_model_model_init))
 
+static void range_list_item_class_init(RangeListItemClass *cls){}
+static void range_list_item_init(RangeListItem *self){}
+G_DEFINE_TYPE(RangeListItem, range_list_item, G_TYPE_OBJECT)
+
 static void on_click(GtkGestureClick *gesture, int n_press, double x, double y, GtkListItem *list_item)
 {
 	JNIEnv *env = get_jni_env();
 	guint position = gtk_list_item_get_position(list_item);
-	RangeListModel *model = RANGE_LIST_MODEL(gtk_list_item_get_item(list_item));
+	RangeListModel *model = RANGE_LIST_ITEM(gtk_list_item_get_item(list_item))->model;
 	jobject listener = g_object_get_data(G_OBJECT(model->list_view), "on_click_listener");
 	if (!listener)
 		return;
@@ -63,7 +64,7 @@ static void bind_listitem_cb(GtkListItemFactory *factory, GtkListItem *list_item
 
 	guint index = gtk_list_item_get_position(list_item);
 	WrapperWidget *wrapper = WRAPPER_WIDGET(gtk_list_item_get_child(list_item));
-	RangeListModel *model = RANGE_LIST_MODEL(gtk_list_item_get_item(list_item));
+	RangeListModel *model = RANGE_LIST_ITEM(gtk_list_item_get_item(list_item))->model;
 	int n_items = g_list_model_get_n_items(G_LIST_MODEL(model));
 	if (index >= n_items) {
 		printf("invalid index: %d >= %d\n", index, n_items);
@@ -98,7 +99,7 @@ JNIEXPORT jlong JNICALL Java_android_widget_AbsListView_native_1constructor(JNIE
 	g_signal_connect(factory, "unbind", G_CALLBACK(unbind_listitem_cb), NULL);
 	RangeListModel *model = g_object_new(range_list_model_get_type(), NULL);
 	GtkWidget *list_view = gtk_list_view_new(GTK_SELECTION_MODEL(gtk_single_selection_new(G_LIST_MODEL(model))), factory);
-	model->list_view = GTK_LIST_VIEW(list_view);
+	model->list_view = list_view;
 	model->jobject = _REF(this);
 	GtkWidget *scrolled_window = gtk_scrolled_window_new();
 	gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(scrolled_window), TRUE);

src/api-impl-jni/widgets/android_widget_AbsSpinner.c

@@ -0,0 +1,71 @@
+#include <gtk/gtk.h>
+
+#include "../defines.h"
+#include "../util.h"
+
+#include "WrapperWidget.h"
+#include "AdapterView.h"
+
+#include "../generated_headers/android_widget_AbsSpinner.h"
+
+static void bind_listitem_cb(GtkListItemFactory *factory, GtkListItem *list_item)
+{
+	JNIEnv *env = get_jni_env();
+
+	guint index = gtk_list_item_get_position(list_item);
+	WrapperWidget *wrapper = WRAPPER_WIDGET(gtk_list_item_get_child(list_item));
+	RangeListModel *model = RANGE_LIST_ITEM(gtk_list_item_get_item(list_item))->model;
+	int n_items = g_list_model_get_n_items(G_LIST_MODEL(model));
+	if (index >= n_items) {
+		printf("invalid index: %d >= %d\n", index, n_items);
+		exit(0);
+	}
+	jmethodID getView = _METHOD(_CLASS(model->adapter), "getDropDownView", "(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;");
+	jobject view = (*env)->CallObjectMethod(env, model->adapter, getView, index, wrapper ? wrapper->jobj : NULL, model->jobject);
+	view = _REF(view);
+	GtkWidget *child = gtk_widget_get_parent(GTK_WIDGET(_PTR(_GET_LONG_FIELD(view, "widget"))));
+	gtk_list_item_set_child(list_item, child);
+}
+
+JNIEXPORT jlong JNICALL Java_android_widget_AbsSpinner_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs)
+{
+	GtkWidget *wrapper = g_object_ref(wrapper_widget_new());
+	GtkListItemFactory *factory = gtk_signal_list_item_factory_new();
+	g_signal_connect(factory, "bind", G_CALLBACK(bind_listitem_cb), NULL);
+	RangeListModel *model = g_object_new(range_list_model_get_type(), NULL);
+	GtkWidget *dropdown = gtk_drop_down_new(G_LIST_MODEL(model), NULL);
+	gtk_drop_down_set_factory(GTK_DROP_DOWN(dropdown), factory);
+	model->list_view = dropdown;
+	model->jobject = _REF(this);
+	wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), dropdown);
+	gtk_widget_set_name(dropdown, "Spinner");
+	return _INTPTR(dropdown);
+}
+
+JNIEXPORT void JNICALL Java_android_widget_AbsSpinner_native_1setAdapter(JNIEnv *env, jobject this, jlong widget_ptr, jobject adapter)
+{
+	GtkDropDown *dropdown = GTK_DROP_DOWN(_PTR(widget_ptr));
+	RangeListModel *model = RANGE_LIST_MODEL(gtk_drop_down_get_model(dropdown));
+
+	if (model->adapter)
+		_UNREF(model->adapter);
+	model->adapter = adapter ? _REF(adapter) : NULL;
+	guint old_n_items = model->n_items;
+	model->n_items = adapter ? (*env)->CallIntMethod(env, adapter, _METHOD(_CLASS(adapter), "getCount", "()I")) : 0;
+	g_list_model_items_changed(G_LIST_MODEL(model), 0, old_n_items, model->n_items);
+}
+
+static void on_selected_changed(GtkDropDown *dropdown, GParamSpec *pspec, jobject listener)
+{
+	JNIEnv *env = get_jni_env();
+	int index = gtk_drop_down_get_selected(dropdown);
+	RangeListModel *model = RANGE_LIST_ITEM(gtk_drop_down_get_selected_item(dropdown))->model;
+	jmethodID onItemSelected = _METHOD(_CLASS(listener), "onItemSelected", "(Landroid/widget/AdapterView;Landroid/view/View;IJ)V");
+	(*env)->CallVoidMethod(env, listener, onItemSelected, model->jobject, NULL, index, (long)0);
+}
+
+JNIEXPORT void JNICALL Java_android_widget_AbsSpinner_setOnItemSelectedListener(JNIEnv *env, jobject this, jobject listener)
+{
+	GtkDropDown *dropdown = GTK_DROP_DOWN(_PTR(_GET_LONG_FIELD(this, "widget")));
+	g_signal_connect(dropdown, "notify::selected", G_CALLBACK(on_selected_changed), _REF(listener));
+}