Reset race now activates the 'Select car view'

Change-Id: Ieb37c1f0c2d50f1fbddb775f1a02c54c81b52889
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/inc/controller/controller_reset.h b/inc/controller/controller_reset.h
index b2bba51..eebbde1 100644 (file)
--- a/inc/controller/controller_reset.h
+++ b/inc/controller/controller_reset.h
@@ -23,7 +23,6 @@
 void controller_reset_init(t_view_update_cb view_update_cb);
 void controller_reset_destroy(void);
 void controller_reset_back(void);
-void controller_reset_next();
 
 void controller_reset_discard();
 void controller_reset_reset();

diff --git a/src/controller/controller_reset.c b/src/controller/controller_reset.c
index d92f133..0200e38 100644 (file)
--- a/src/controller/controller_reset.c
+++ b/src/controller/controller_reset.c
@@ -26,7 +26,7 @@ static s_controller s_info = {  0, };
 
 void controller_reset_destroy(void)
 {
-//     model_car_connection_end_connection();
+       model_car_connection_end_connection();
        s_info.view_update_cb = NULL;
 }
 
@@ -40,18 +40,14 @@ void controller_reset_back(void)
        controller_reset_destroy();
 }
 
-void controller_reset_next()
-{
-       view_manager_set_view(VIEW_NAME_INPUT);
-}
-
 void controller_reset_reset()
 {
        if(!model_car_connection_is_connected()) {
                view_manager_set_view(VIEW_NETWORK_FAILURE);
                return;
        }
-       view_manager_set_view(VIEW_NAME_INPUT);
+
+       view_manager_set_view(VIEW_CAR_SELECTION);
 }
 
 void controller_reset_discard()

diff --git a/src/view/view_car_selection.c b/src/view/view_car_selection.c
index 7844f96..e27e50b 100644 (file)
--- a/src/view/view_car_selection.c
+++ b/src/view/view_car_selection.c
@@ -103,13 +103,18 @@ static void _create_guard_items(void)
        elm_genlist_item_select_mode_set(s_info.last, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 }
 
-static void _refresh_button_clicked(void *data, Evas_Object *obj, void *event_info)
+static void _fill_genlist(void)
 {
        elm_genlist_clear(s_info.genlist);
        _create_default_genlist_items();
        controller_car_selection_start_get_car_names();
 }
 
+static void _refresh_button_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+       _fill_genlist();
+}
+
 static Evas_Object *_full_content_get_cb(void *data, Evas_Object *obj, const char *part)
 {
        Evas_Object *button = view_base_create_button(obj,  NULL, "Refresh", NULL, "racing_middle", _refresh_button_clicked, NULL);
@@ -271,7 +276,7 @@ static void _car_selection_create_gui(Evas_Object *parent, Eext_Circle_Surface *
 static void _show_cb(void)
 {
        controller_car_selection_init(_controller_car_selection_cb);
-       controller_car_selection_start_get_car_names();
+       _fill_genlist();
 }
 
 static void _hide_cb(void)