diff --git a/gg.c b/gg.c index c514187..f882303 100644 --- a/gg.c +++ b/gg.c @@ -36,8 +36,8 @@ _gg_image_result(struct memory_chunk* dd, void* _data, void *elm_data EINA_UNUSE elm_object_content_set(btn, icon); //evas_object_resize(icon, 40, 40); //efl_gfx_entity_scale_set(icon, - evas_object_size_hint_min_set(icon, 30, 30); - evas_object_size_hint_max_set(icon, 30, 30); + evas_object_size_hint_min_set(icon, 45, 45); + evas_object_size_hint_max_set(icon, 45, 45); } static void @@ -136,6 +136,8 @@ _gg_login_result(struct memory_chunk* dd, void* _data, void *elm_data EINA_UNUSE free(duped_data); } + printf("start_gg_api: %s\n", duped); + // TODO duped code... evas_object_del(info->hideme); _gg_get_tourneys(start_gg_api); @@ -223,6 +225,8 @@ _gg_tourneys_result(struct memory_chunk* dd, void* _data, void *elm_data EINA_UN Evas_Object* that; that = elm_button_add(tab_gg_sidebar); + evas_object_size_hint_min_set(that, 50, 50); + evas_object_size_hint_max_set(that, 50, 50); if (images && images->child) { @@ -236,7 +240,16 @@ _gg_tourneys_result(struct memory_chunk* dd, void* _data, void *elm_data EINA_UN ecore_con_url_get(ec_url); } else - elm_object_text_set(that, name); + { + Eina_Strbuf* strshort = eina_strbuf_new(); + eina_strbuf_append_printf(strshort, "%c", toupper(name[0])); + Evas_Object* lbl = elm_label_add(that); + elm_object_scale_set(lbl, 2.0); + elm_object_text_set(lbl, eina_strbuf_string_get(strshort)); + elm_object_content_set(that, lbl); + evas_object_show(lbl); + free(eina_strbuf_release(strshort)); + } elm_object_tooltip_text_set(that, name); @@ -250,6 +263,11 @@ _gg_tourneys_result(struct memory_chunk* dd, void* _data, void *elm_data EINA_UN static Eina_Bool _gg_scrape_result(struct memory_chunk* dd, void* data, void *elm_data EINA_UNUSED, int type EINA_UNUSED, void *event_info) { + if (!dd->data) + { + make_text_popup("Start.gg didn't load. Are you connected?"); + return EINA_FALSE; + } #define magiccode "script id=\"__NEXT_DATA__\" type=\"application/json\">" char* start_json = strstr(dd->data, magiccode); if (!start_json) @@ -388,7 +406,7 @@ _gg_scrape_homepage(char* token) Evas_Object* gg_create_view(Evas_Object* parent) { - Evas_Object* tb_it, * that; + Evas_Object* tb_it, * that, * ic; tab_gg = elm_box_add(parent); elm_box_horizontal_set(tab_gg, EINA_TRUE); evas_object_size_hint_weight_set(tab_gg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -404,15 +422,29 @@ gg_create_view(Evas_Object* parent) //evas_object_size_hint_weight_set(tab_gg_sidebar, 0.0, EVAS_HINT_EXPAND); //evas_object_size_hint_align_set(tab_gg_sidebar, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(tab_gg_sidebar, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(tab_gg_sidebar, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(tab_gg_sidebar, 0.5, 0.0); elm_box_pack_end(tab_gg, tab_gg_sidebar); that = elm_button_add(tab_gg_sidebar); - elm_object_text_set(that, "HOME"); + //elm_object_text_set(that, "HO"); + ic = elm_icon_add(that); + elm_icon_standard_set(ic, "home"); + evas_object_show(ic); + elm_object_content_set(that, ic); + elm_object_style_set(that, "anchor"); + evas_object_size_hint_min_set(that, 50, 30); elm_box_pack_end(tab_gg_sidebar, that); evas_object_show(that); that = elm_button_add(tab_gg_sidebar); - elm_object_text_set(that, "NOTIFS"); + //elm_object_text_set(that, "NOTIFS"); + ic = elm_icon_add(that); + elm_icon_standard_set(ic, "mail-unread"); + evas_object_show(ic); + elm_object_content_set(that, ic); + elm_object_style_set(that, "anchor"); + evas_object_size_hint_min_set(that, 50, 30); elm_box_pack_end(tab_gg_sidebar, that); evas_object_show(that); + + // Fake slpit //tb_it = elm_toolbar_item_append(tab_gg_sidebar, "home", NULL, _gg_sidebar_cb, NULL); //elm_toolbar_item_priority_set(tb_it, 100); //tb_it = elm_toolbar_item_append(tab_gg_sidebar, "mail-unread", NULL, _gg_sidebar_cb, NULL);