Add colored loading icon on wifi menu

 - Fix for TSAM-10020

Change-Id: I77a8e85c89441d441102e32f9958ecb01f01b00e
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/include/layout/network.h b/include/layout/network.h
index 9227a02..0358c5d 100644 (file)
--- a/include/layout/network.h
+++ b/include/layout/network.h
@@ -87,7 +87,8 @@
 #define IC_LOCK_NETWORK_FOC_04_PNG "ic_lock_network_foc_04.png"
 #define IC_CHECK_NOR_PNG "ic_thumb_check_sel.png"
 #define IC_CHECK_FOC_PNG "ic_thumb_check_foc.png"
-#define IC_CHECK_FAIL_PNG "ic_thumb_failed.png"
+#define IC_CHECK_FAIL_NOR_PNG "ic_thumb_failed_sel.png"
+#define IC_CHECK_FAIL_FOC_PNG "ic_thumb_failed_foc.png"
 #define IC_NETWORK_LOADING_01_PNG "network_loading_01.png"
 #define IC_NETWORK_LOADING_02_PNG "network_loading_02.png"
 #define IC_NETWORK_LOADING_03_PNG "network_loading_03.png"
@@ -100,6 +101,18 @@
 #define IC_NETWORK_LOADING_10_PNG "network_loading_10.png"
 #define IC_NETWORK_LOADING_11_PNG "network_loading_11.png"
 #define IC_NETWORK_LOADING_12_PNG "network_loading_12.png"
+#define IC_NETWORK_LOADING_COL_01_PNG "network_loading_col_01.png"
+#define IC_NETWORK_LOADING_COL_02_PNG "network_loading_col_02.png"
+#define IC_NETWORK_LOADING_COL_03_PNG "network_loading_col_03.png"
+#define IC_NETWORK_LOADING_COL_04_PNG "network_loading_col_04.png"
+#define IC_NETWORK_LOADING_COL_05_PNG "network_loading_col_05.png"
+#define IC_NETWORK_LOADING_COL_06_PNG "network_loading_col_06.png"
+#define IC_NETWORK_LOADING_COL_07_PNG "network_loading_col_07.png"
+#define IC_NETWORK_LOADING_COL_08_PNG "network_loading_col_08.png"
+#define IC_NETWORK_LOADING_COL_09_PNG "network_loading_col_09.png"
+#define IC_NETWORK_LOADING_COL_10_PNG "network_loading_col_10.png"
+#define IC_NETWORK_LOADING_COL_11_PNG "network_loading_col_11.png"
+#define IC_NETWORK_LOADING_COL_12_PNG "network_loading_col_12.png"
 #define IC_NETWORK_WIRED_PROGRESS_PNG "ic_wired_progress.png"
 #define IC_NETWORK_WIRED_COMPLETE_PNG "ic_wired_complete.png"
 #define IC_NETWORK_WIRED_FAIL_PNG "ic_wired_fail.png"

diff --git a/res/images/ic_thumb_failed.png b/res/images/ic_thumb_failed_foc.png
similarity index 100%
rename from res/images/ic_thumb_failed.png
rename to res/images/ic_thumb_failed_foc.png

diff --git a/res/images/ic_thumb_failed_sel.png b/res/images/ic_thumb_failed_sel.png
new file mode 100644 (file)
index 0000000..f4cdd3c
Binary files /dev/null and b/res/images/ic_thumb_failed_sel.png differ

diff --git a/res/images/network_loading_col_01.png b/res/images/network_loading_col_01.png
new file mode 100644 (file)
index 0000000..42fd926
Binary files /dev/null and b/res/images/network_loading_col_01.png differ

diff --git a/res/images/network_loading_col_02.png b/res/images/network_loading_col_02.png
new file mode 100644 (file)
index 0000000..0924fe6
Binary files /dev/null and b/res/images/network_loading_col_02.png differ

diff --git a/res/images/network_loading_col_03.png b/res/images/network_loading_col_03.png
new file mode 100644 (file)
index 0000000..12d221b
Binary files /dev/null and b/res/images/network_loading_col_03.png differ

diff --git a/res/images/network_loading_col_04.png b/res/images/network_loading_col_04.png
new file mode 100644 (file)
index 0000000..b51654e
Binary files /dev/null and b/res/images/network_loading_col_04.png differ

diff --git a/res/images/network_loading_col_05.png b/res/images/network_loading_col_05.png
new file mode 100644 (file)
index 0000000..38284fb
Binary files /dev/null and b/res/images/network_loading_col_05.png differ

diff --git a/res/images/network_loading_col_06.png b/res/images/network_loading_col_06.png
new file mode 100644 (file)
index 0000000..1dd31af
Binary files /dev/null and b/res/images/network_loading_col_06.png differ

diff --git a/res/images/network_loading_col_07.png b/res/images/network_loading_col_07.png
new file mode 100644 (file)
index 0000000..38b8e85
Binary files /dev/null and b/res/images/network_loading_col_07.png differ

diff --git a/res/images/network_loading_col_08.png b/res/images/network_loading_col_08.png
new file mode 100644 (file)
index 0000000..e877b99
Binary files /dev/null and b/res/images/network_loading_col_08.png differ

diff --git a/res/images/network_loading_col_09.png b/res/images/network_loading_col_09.png
new file mode 100644 (file)
index 0000000..e28114c
Binary files /dev/null and b/res/images/network_loading_col_09.png differ

diff --git a/res/images/network_loading_col_10.png b/res/images/network_loading_col_10.png
new file mode 100644 (file)
index 0000000..b157df3
Binary files /dev/null and b/res/images/network_loading_col_10.png differ

diff --git a/res/images/network_loading_col_11.png b/res/images/network_loading_col_11.png
new file mode 100644 (file)
index 0000000..9c1af65
Binary files /dev/null and b/res/images/network_loading_col_11.png differ

diff --git a/res/images/network_loading_col_12.png b/res/images/network_loading_col_12.png
new file mode 100644 (file)
index 0000000..dc6c569
Binary files /dev/null and b/res/images/network_loading_col_12.png differ

diff --git a/res/widget/gengrid_network.edc b/res/widget/gengrid_network.edc
index d43ba9d..27defec 100644 (file)
--- a/res/widget/gengrid_network.edc
+++ b/res/widget/gengrid_network.edc
@@ -48,7 +48,8 @@ group {
                image, IC_LOCK_NETWORK_FOC_04_PNG COMP;
                image, IC_CHECK_NOR_PNG COMP;
                image, IC_CHECK_FOC_PNG COMP;
-               image, IC_CHECK_FAIL_PNG COMP;
+               image, IC_CHECK_FAIL_NOR_PNG COMP;
+               image, IC_CHECK_FAIL_FOC_PNG COMP;
                image, IC_NETWORK_LOADING_01_PNG COMP;
                image, IC_NETWORK_LOADING_02_PNG COMP;
                image, IC_NETWORK_LOADING_03_PNG COMP;
@@ -61,6 +62,18 @@ group {
                image, IC_NETWORK_LOADING_10_PNG COMP;
                image, IC_NETWORK_LOADING_11_PNG COMP;
                image, IC_NETWORK_LOADING_12_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_01_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_02_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_03_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_04_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_05_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_06_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_07_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_08_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_09_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_10_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_11_PNG COMP;
+               image, IC_NETWORK_LOADING_COL_12_PNG COMP;
        }
 
        script {
@@ -372,11 +385,13 @@ group {
                        description {
                                state, "unfocused" 0.0;
                                inherit, "default" 0.0;
+                               color, 51 51 51 255;
                                map.on, 1;
                        }
                        description {
                                state, "selected" 0.0;
                                inherit, "focused" 0.0;
+                               color, 51 51 51 255;
                        }
                }
 
@@ -441,9 +456,16 @@ group {
                                map.on, 1;
                        }
                        description {
-                               state, "fail" 0.0;
+                               state, "focused.failed" 0.0;
+                               inherit, "default" 0.0;
+                               image.normal, IC_CHECK_FAIL_FOC_PNG;
+                               visible, 1;
+                               map.on, 1;
+                       }
+                       description {
+                               state, "unfocused.failed" 0.0;
                                inherit, "default" 0.0;
-                               image.normal, IC_CHECK_FAIL_PNG;
+                               image.normal, IC_CHECK_FAIL_NOR_PNG;
                                visible, 1;
                                map.on, 1;
                        }
@@ -488,6 +510,25 @@ group {
                                }
                                visible, 1;
                        }
+                       description {
+                               state, "colored" 0.0;
+                               inherit, "default" 0.0;
+                               image {
+                                       normal, IC_NETWORK_LOADING_COL_01_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_02_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_03_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_04_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_05_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_06_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_07_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_08_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_09_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_10_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_11_PNG;
+                                       tween, IC_NETWORK_LOADING_COL_12_PNG;
+                               }
+                               visible, 1;
+                       }
                }
 
                part {
@@ -607,7 +648,10 @@ group {
 
                                state = get_int(connecting_state);
                                if (state == CONNECTION_STATE_FAIL) {
-                                       set_state(PART:"part.check.icon", "fail", 0.0);
+                                       set_state(PART:"part.check.icon", "focused.failed", 0.0);
+                               } else if (state == CONNECTION_STATE_PROGRESS) {
+                                       run_program(PROGRAM:"stop_state_loop");
+                                       run_program(PROGRAM:"loading_state_loop");
                                }
 
                                set_state(PART:PART_WIFI_NAME, "focused", 0.0);
@@ -642,6 +686,9 @@ group {
                                if (state == CONNECTION_STATE_FAIL) {
                                        set_int(connecting_state, CONNECTION_STATE_DISCONNECTED);
                                        set_state(PART:"part.check.icon", "unfocused.unchecked", 0.0);
+                               } else if (state == CONNECTION_STATE_PROGRESS) {
+                                       run_program(PROGRAM:"stop_state_loop");
+                                       run_program(PROGRAM:"loading_state_loop_unfocused");
                                }
 
                                set_state(PART:PART_WIFI_NAME, "unfocused", 0.0);
@@ -756,7 +803,7 @@ group {
 
                                state = get_int(connecting_state);
                                if (state == CONNECTION_STATE_FAIL) {
-                                       set_state(PART:"part.check.icon", "fail", 0.0);
+                                       set_state(PART:"part.check.icon", "unfocused.failed", 0.0);
                                }
                        }
                }
@@ -785,25 +832,58 @@ group {
                }
 
                program {
+                       name, "loading_state_loop_unfocused";
+                       source, SRC_ELM;
+                       action, STATE_SET "colored" 0.0;
+                       target, "part.loading.icon";
+                       transition, LINEAR 0.5;
+                       after, "after_loading_started";
+               }
+
+               program {
                        name, "after_loading_started";
                        script {
-                               run_program(PROGRAM:"loading_state_loop");
+                               new focused;
+
+                               set_int(connecting_state, CONNECTION_STATE_PROGRESS);
+                               focused = get_int(is_focused);
+                               if (focused == STATE_FOCUSED) {
+                                       run_program(PROGRAM:"loading_state_loop");
+                               } else {
+                                       run_program(PROGRAM:"loading_state_loop_unfocused");
+                               }
                        }
                }
 
                program {
+                       name, "stop_state_loop";
                        signal, SIG_LOADING_STOP;
                        source, SRC_ELM;
                        action, STATE_SET "default" 0.0;
                        target, "part.loading.icon";
+                       after, "after_loading_stopped";
+               }
+
+               program {
+                       name, "after_loading_stopped";
+                       script {
+                               set_int(connecting_state, CONNECTION_STATE_DISCONNECTED);
+                       }
                }
 
                program {
                        signal, SIG_CONNECTION_FAIL;
                        source, SRC_ELM;
                        script {
+                               new focused;
+
                                set_int(connecting_state, CONNECTION_STATE_FAIL);
-                               set_state(PART:"part.check.icon", "fail", 0.0);
+                               focused = get_int(is_focused);
+                               if (focused == STATE_FOCUSED) {
+                                       set_state(PART:"part.check.icon", "focused.failed", 0.0);
+                               } else {
+                                       set_state(PART:"part.check.icon", "unfocused.failed", 0.0);
+                               }
                        }
                }
        }