Move status_layout test to default_ui test & Rename several functions 85/131085/6
authorjunkyu han <junkyu.han@samsung.com>
Thu, 25 May 2017 09:56:15 +0000 (18:56 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Thu, 25 May 2017 10:49:41 +0000 (19:49 +0900)
Change-Id: I7c3e6300a17f4aa3275413f0edb2ad9a71adeef4

21 files changed:
inc/moments/moments_status_view.h
inc/moments/moments_view_conf.h
res/edje/circle/moments_status_battery.edc [new file with mode: 0644]
res/edje/circle/moments_status_callsignal.edc [new file with mode: 0644]
res/edje/circle/moments_status_network.edc [new file with mode: 0644]
res/edje/circle/moments_status_simcard.edc [new file with mode: 0644]
res/edje/circle/moments_status_util_battery.edc [deleted file]
res/edje/circle/moments_status_util_callsignal.edc [deleted file]
res/edje/circle/moments_status_util_network.edc [deleted file]
res/edje/circle/moments_status_util_simcard.edc [deleted file]
src/moments/moments_manager.c
src/moments/moments_status_view.c
src/moments/moments_view.c
test/feature_test/group_feature_moments_controls_show.c
test/feature_test/group_feature_moments_controls_state.c
test/feature_test/group_feature_moments_default_ui.c
test/feature_test/group_feature_moments_status_behavior.c
test/feature_test/group_feature_moments_status_view_ui.c
test/feature_test/group_feature_moments_vi.c
test/feature_test/group_feature_status_area_layer_show.c
test/test_function.h

index 04e7384321956487426eebd2a43a8ccef96a65fc..25b46ac3973992b89da356625cd93a936ab5d520 100644 (file)
 
 #include <Elementary.h>
 
-#define STATUS_UTIL_ICON_MAX_COUNT_BT 3
-#define STATUS_UTIL_ICON_MAX_COUNT_3G 7
+#define STATUS_ICON_MAX_COUNT_BT 3
+#define STATUS_ICON_MAX_COUNT_3G 7
 
 typedef enum {
-       STATUS_UTIL_ICON_UNDEFINED = -1,
-       STATUS_UTIL_ICON_CALLSIGNAL = 0,
-       STATUS_UTIL_ICON_NETWORK = 1,
-       STATUS_UTIL_ICON_BLUETOOTH = 2,
-       STATUS_UTIL_ICON_HEADSET = 3,
-       STATUS_UTIL_ICON_NO_SIM = 4,
-       STATUS_UTIL_ICON_CALL_FORWARD,
-       STATUS_UTIL_ICON_GPS,
-       STATUS_UTIL_ICON_MAX_COUNT
-} status_util_icon_type_e;
-
-Evas_Object *moments_status_view_get_layout(void);
+       STATUS_ICON_UNDEFINED = -1,
+       STATUS_ICON_CALLSIGNAL = 0,
+       STATUS_ICON_NETWORK = 1,
+       STATUS_ICON_BLUETOOTH = 2,
+       STATUS_ICON_HEADSET = 3,
+       STATUS_ICON_NO_SIM = 4,
+       STATUS_ICON_CALL_FORWARD,
+       STATUS_ICON_GPS,
+       STATUS_ICON_MAX_COUNT
+} status_icon_type_e;
 
 Evas_Object *moments_status_view_create(Evas_Object *parent);
-void moments_destroy_status_ui(void);
+void moments_status_view_destroy(void);
 
 void moments_status_callsignal_icon_show(void);
 void moments_status_callsignal_icon_hide(void);
@@ -51,6 +49,6 @@ void moments_status_simcard_icon_hide(void);
 void moments_status_battery_update(int percent, int converted_percent, bool is_charging);
 void moments_status_callsignal_update(int strength, bool is_roaming);
 void moments_status_network_update(int network_type, int packet_type);
-void moments_status_update_util_icon_list(void);
+void moments_status_update_view(void);
 
 #endif
index eee27ef7c6e86a08ed5d0d765690932763ace3d1..f8ef353b02cc9f666c809991139c84517d414bf8 100755 (executable)
 #define MOMENTS_ANIMATION_SHOW_TIME 0.03
 #define MOMENTS_ANIMATION_DRAW_TIME 0.05
 
-#define MOMENTS_STATUS_UTIL_ICON_W (int)((24) * (SCALE_W))
-#define MOMENTS_STATUS_UTIL_ICON_H (int)((26) * (SCALE_H))
+#define MOMENTS_STATUS_ICON_W (int)((24) * (SCALE_W))
+#define MOMENTS_STATUS_ICON_H (int)((26) * (SCALE_H))
 
 #define MOMENTS_STATUS_BATTERY_ICON_W (int)((22) * (SCALE_W))
 #define MOMENTS_STATUS_BATTERY_ICON_H (int)((33) * (SCALE_H))
 #define MOMENTS_STATUS_BATTERY_ICON_X (int)((169) * (SCALE_W))
 #define MOMENTS_STATUS_BATTERY_ICON_Y (int)((0) * (SCALE_H))
 
-#define MOMENTS_STATUS_UTIL_POSITION_1_X (int)((135) * (SCALE_W))
-#define MOMENTS_STATUS_UTIL_POSITION_1_Y (int)((7) * (SCALE_H))
-
 #endif
diff --git a/res/edje/circle/moments_status_battery.edc b/res/edje/circle/moments_status_battery.edc
new file mode 100644 (file)
index 0000000..5a1ee15
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../../../inc/moments/moments_view_edje_conf.h"
+
+#define BATTERY_DIR_PREFIX "Battery"
+
+#define DESCRIPTION_BATTERY(num)\
+       description {\
+               state: "battery_percent_"num;\
+               inherit: "default" 0.0;\
+               image.normal: BATTERY_DIR_PREFIX"/battery_"num".png";\
+       }\
+
+#define PROGRAM_BATTERY(num)\
+       program {\
+               name: "change_level_"num;\
+               signal: "change_percent_"num;\
+               source: "icon_image";\
+               action: STATE_SET "battery_percent_"num 0.0;\
+               target: "icon_image";\
+       }\
+
+collections {
+   group { STATUS_BATTERY_LAYOUT;
+      images {
+         image: BATTERY_DIR_PREFIX"/battery_00.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_05.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_10.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_15.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_20.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_25.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_30.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_35.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_40.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_45.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_50.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_55.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_60.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_65.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_70.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_75.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_80.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_85.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_90.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_95.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_100.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_bg.png" COMP;
+         image: BATTERY_DIR_PREFIX"/battery_charge.png" COMP;
+      }
+      parts {
+         part {
+            name: "battery_bg";
+            type: IMAGE;
+            mouse_events: 0;
+            repeat_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+                          color: 250 250 250 255;
+               image.normal: BATTERY_DIR_PREFIX"/battery_bg.png";
+            }
+         }
+         part {
+            name: "icon_image";
+            type: IMAGE;
+            description {
+                state: "default" 0.0;
+                align: 0.5 0.5;
+                rel1 { relative: 0.0 0.0; to: "battery_bg"; }
+                rel2 { relative: 1.0 1.0; to: "battery_bg"; }
+                image.normal: BATTERY_DIR_PREFIX"/battery_100.png";
+                               color: 250 250 250 255;
+            }
+                       description {
+                state: "hide";
+                inherit: "default" 0.0;
+                visible: 0;
+                       }
+                       DESCRIPTION_BATTERY(00);
+                       DESCRIPTION_BATTERY(05);
+                       DESCRIPTION_BATTERY(10);
+                       DESCRIPTION_BATTERY(15);
+                       DESCRIPTION_BATTERY(20);
+                       DESCRIPTION_BATTERY(25);
+                       DESCRIPTION_BATTERY(30);
+                       DESCRIPTION_BATTERY(35);
+                       DESCRIPTION_BATTERY(40);
+                       DESCRIPTION_BATTERY(45);
+                       DESCRIPTION_BATTERY(50);
+                       DESCRIPTION_BATTERY(55);
+                       DESCRIPTION_BATTERY(60);
+                       DESCRIPTION_BATTERY(65);
+                       DESCRIPTION_BATTERY(70);
+                       DESCRIPTION_BATTERY(75);
+                       DESCRIPTION_BATTERY(80);
+                       DESCRIPTION_BATTERY(85);
+                       DESCRIPTION_BATTERY(90);
+                       DESCRIPTION_BATTERY(95);
+                       DESCRIPTION_BATTERY(100);
+
+                }
+         part {
+            name: "battery_charge_image";
+            type: IMAGE;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1 { relative: 0.0 0.0; to: "battery_bg"; }
+               rel2 { relative: 1.0 1.0; to: "battery_bg"; }
+               visible: 0;
+                          color: 0 0 0 255;
+               image.normal: BATTERY_DIR_PREFIX"/battery_charge.png";
+            }
+                       description {
+               state: "show";
+               inherit: "default" 0.0;
+               visible: 1;     
+                       }
+         }
+      }
+
+         programs {
+               program {
+                       name: "hide_icon_image";
+                       signal: "hide_icon_image";
+                       source: "icon_image";
+                       action: STATE_SET "hide" 0.0;
+                       target: "icon_image";
+               }
+               PROGRAM_BATTERY(00);
+               PROGRAM_BATTERY(05);
+               PROGRAM_BATTERY(10);
+               PROGRAM_BATTERY(15);
+               PROGRAM_BATTERY(20);
+               PROGRAM_BATTERY(25);
+               PROGRAM_BATTERY(30);
+               PROGRAM_BATTERY(35);
+               PROGRAM_BATTERY(40);
+               PROGRAM_BATTERY(45);
+               PROGRAM_BATTERY(50);
+               PROGRAM_BATTERY(55);
+               PROGRAM_BATTERY(60);
+               PROGRAM_BATTERY(65);
+               PROGRAM_BATTERY(70);
+               PROGRAM_BATTERY(75);
+               PROGRAM_BATTERY(80);
+               PROGRAM_BATTERY(85);
+               PROGRAM_BATTERY(90);
+               PROGRAM_BATTERY(95);
+               PROGRAM_BATTERY(100);
+
+               program {
+                       name: "show_battery_charge";
+                       signal: "show_battery_charge";
+                       source: "battery_charge_image";
+                       action: STATE_SET "show" 0.0;
+                       target: "battery_charge_image";
+               }
+               program {
+                       name: "hide_battery_charge";
+                       signal: "hide_battery_charge";
+                       source: "battery_charge_image";
+                       action: STATE_SET "default" 0.0;
+                       target: "battery_charge_image";
+               }
+         }
+   }
+}
diff --git a/res/edje/circle/moments_status_callsignal.edc b/res/edje/circle/moments_status_callsignal.edc
new file mode 100644 (file)
index 0000000..2ae1b6e
--- /dev/null
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../../../inc/moments/moments_view_edje_conf.h"
+
+#define CALLSIGNAL_DIR_PREFIX "Callsignal"
+
+#define DESCRIPTION_CALLSIGNAL(num)\
+       description {\
+               state: "call_signal_"num;\
+               inherit: "default" 0.0;\
+               image.normal: CALLSIGNAL_DIR_PREFIX"/signal_strength_"num".png";\
+       }\
+
+#define DESCRIPTION_ROAMING_CALLSIGNAL(num)\
+       description {\
+               state: "roaming_call_signal_"num;\
+               inherit: "default" 0.0;\
+               image.normal: CALLSIGNAL_DIR_PREFIX"/roaming_strength_"num".png";\
+       }\
+
+#define PROGRAM_CALLSIGNAL(num)\
+       program {\
+               name: "change_strength_"num;\
+               signal: "change_callsignal_strength_"num;\
+               source: "icon_image";\
+               action: STATE_SET "call_signal_"num 0.0;\
+               target: "icon_image";\
+       }\
+
+#define PROGRAM_ROAMING_CALLSIGNAL(num)\
+       program {\
+               name: "change_roaming_strength_"num;\
+               signal: "change_roaming_callsignal_strength_"num;\
+               source: "icon_image";\
+               action: STATE_SET "roaming_call_signal_"num 0.0;\
+               target: "icon_image";\
+       }\
+
+collections {
+   group { STATUS_CALLSIGNAL_LAYOUT;
+      images {
+         image: CALLSIGNAL_DIR_PREFIX"/no_signal.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/indi_flight_mode.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_00.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_01.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_02.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_03.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_04.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_00.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_01.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_02.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_03.png" COMP;
+         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_04.png" COMP;
+      }
+      parts {
+         part {
+            name: "icon_image";
+            type: IMAGE;
+            description {
+                state: "default" 0.0;
+                align: 0.5 0.5;
+                rel1 { relative: 0.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+                image.normal: CALLSIGNAL_DIR_PREFIX"/no_signal.png";
+                               color: 250 250 250 255;
+            }
+                       description {
+                state: "hide";
+                inherit: "default" 0.0;
+                visible: 0;
+                       }
+                       description {
+                state: "flight_mode";
+                inherit: "default" 0.0;
+                image.normal: CALLSIGNAL_DIR_PREFIX"/indi_flight_mode.png";
+                       }
+                       DESCRIPTION_CALLSIGNAL(00);
+                       DESCRIPTION_CALLSIGNAL(01);
+                       DESCRIPTION_CALLSIGNAL(02);
+                       DESCRIPTION_CALLSIGNAL(03);
+                       DESCRIPTION_CALLSIGNAL(04);
+                       DESCRIPTION_ROAMING_CALLSIGNAL(00);
+                       DESCRIPTION_ROAMING_CALLSIGNAL(01);
+                       DESCRIPTION_ROAMING_CALLSIGNAL(02);
+                       DESCRIPTION_ROAMING_CALLSIGNAL(03);
+                       DESCRIPTION_ROAMING_CALLSIGNAL(04);
+
+                }
+      }
+
+         programs {
+               program {
+                       name: "hide_icon_image";
+                       signal: "hide_icon_image";
+                       source: "icon_image";
+                       action: STATE_SET "hide" 0.0;
+                       target: "icon_image";
+               }
+
+               program {
+                       name: "no_signal";
+                       signal: "change_to_no_signal";
+                       source: "icon_image";
+                       action: STATE_SET "default" 0.0;
+                       target: "icon_image";
+               }
+
+               program {
+                       name: "flight_mode";
+                       signal: "change_to_flight_mode";
+                       source: "icon_image";
+                       action: STATE_SET "flight_mode" 0.0;
+                       target: "icon_image";
+               }
+
+               PROGRAM_CALLSIGNAL(00);
+               PROGRAM_CALLSIGNAL(01);
+               PROGRAM_CALLSIGNAL(02);
+               PROGRAM_CALLSIGNAL(03);
+               PROGRAM_CALLSIGNAL(04);
+
+               PROGRAM_ROAMING_CALLSIGNAL(00);
+               PROGRAM_ROAMING_CALLSIGNAL(01);
+               PROGRAM_ROAMING_CALLSIGNAL(02);
+               PROGRAM_ROAMING_CALLSIGNAL(03);
+               PROGRAM_ROAMING_CALLSIGNAL(04);
+         }
+   }
+}
diff --git a/res/edje/circle/moments_status_network.edc b/res/edje/circle/moments_status_network.edc
new file mode 100644 (file)
index 0000000..78b1dd8
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../../../inc/moments/moments_view_edje_conf.h"
+
+#define NETWORK_DIR_PREFIX "Network"
+
+#define DESCRIPTION_NETWORK(name)\
+       description {\
+               state: "state_"name;\
+               inherit: "default" 0.0;\
+               image.normal: NETWORK_DIR_PREFIX"/"name".png";\
+       }\
+
+#define PROGRAM_NETWORK_TYPE(num)\
+       program {\
+               name: "network_type_"num;\
+               signal: "network_type_"num;\
+               source: "type_icon_image";\
+               action: STATE_SET "state_"num 0.0;\
+               target: "type_icon_image";\
+       }\
+
+#define PROGRAM_NETWORK_INOUT(num)\
+       program {\
+               name: "packet_"num;\
+               signal: "packet_"num;\
+               source: "inout_icon_image";\
+               action: STATE_SET "state_"num 0.0;\
+               target: "inout_icon_image";\
+       }\
+
+collections {
+   group { STATUS_NETWORK_LAYOUT;
+      images {
+         image: NETWORK_DIR_PREFIX"/gprs_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/edge_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/umts_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/hsdpa_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/hspa_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/lte_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/in_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/out_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/inout_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/no_inout_connected.png" COMP;
+         image: NETWORK_DIR_PREFIX"/wifi_connected_00.png" COMP;
+         image: NETWORK_DIR_PREFIX"/wifi_connected_01.png" COMP;
+         image: NETWORK_DIR_PREFIX"/wifi_connected_02.png" COMP;
+         image: NETWORK_DIR_PREFIX"/wifi_connected_03.png" COMP;
+         image: NETWORK_DIR_PREFIX"/wifi_connected_04.png" COMP;
+      }
+      parts {
+         part {
+            name: "type_icon_image";
+            type: IMAGE;
+            description {
+                state: "default" 0.0;
+                align: 0.5 0.5;
+                rel1 { relative: 0.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+                image.normal: NETWORK_DIR_PREFIX"/edge_connected.png";
+                               color: 250 250 250 255;
+            }
+                       description {
+                state: "hide";
+                inherit: "default" 0.0;
+                visible: 0;
+                       }
+                       DESCRIPTION_NETWORK("gprs_connected");
+                       DESCRIPTION_NETWORK("edge_connected");
+                       DESCRIPTION_NETWORK("umts_connected");
+                       DESCRIPTION_NETWORK("hsdpa_connected");
+                       DESCRIPTION_NETWORK("hspa_connected");
+                       DESCRIPTION_NETWORK("lte_connected");
+                       DESCRIPTION_NETWORK("wifi_connected_00");
+                       DESCRIPTION_NETWORK("wifi_connected_01");
+                       DESCRIPTION_NETWORK("wifi_connected_02");
+                       DESCRIPTION_NETWORK("wifi_connected_03");
+                       DESCRIPTION_NETWORK("wifi_connected_04");
+                }
+         part {
+            name: "inout_icon_image";
+            type: IMAGE;
+            description {
+                state: "default" 0.0;
+                align: 0.5 0.5;
+                rel1 { relative: 0.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+                image.normal: NETWORK_DIR_PREFIX"/no_inout_connected.png";
+                               color: 250 250 250 255;
+            }
+                       description {
+                state: "hide";
+                inherit: "default" 0.0;
+                visible: 0;
+                       }
+                       DESCRIPTION_NETWORK("no_inout_connected");
+                       DESCRIPTION_NETWORK("in_connected");
+                       DESCRIPTION_NETWORK("out_connected");
+                       DESCRIPTION_NETWORK("inout_connected");
+                }
+      }
+
+         programs {
+               program {
+                       name: "hide_icon_image";
+                       signal: "hide_icon_image";
+                       source: "type_icon_image";
+                       action: STATE_SET "hide" 0.0;
+                       target: "type_icon_image";
+                       target: "inout_icon_image";
+               }
+
+               PROGRAM_NETWORK_TYPE("gprs_connected");
+               PROGRAM_NETWORK_TYPE("edge_connected");
+               PROGRAM_NETWORK_TYPE("umts_connected");
+               PROGRAM_NETWORK_TYPE("hsdpa_connected");
+               PROGRAM_NETWORK_TYPE("hspa_connected");
+               PROGRAM_NETWORK_TYPE("lte_connected");
+               PROGRAM_NETWORK_TYPE("wifi_connected_00");
+               PROGRAM_NETWORK_TYPE("wifi_connected_01");
+               PROGRAM_NETWORK_TYPE("wifi_connected_02");
+               PROGRAM_NETWORK_TYPE("wifi_connected_03");
+               PROGRAM_NETWORK_TYPE("wifi_connected_04");
+               PROGRAM_NETWORK_INOUT("no_inout_connected");
+               PROGRAM_NETWORK_INOUT("in_connected");
+               PROGRAM_NETWORK_INOUT("out_connected");
+               PROGRAM_NETWORK_INOUT("inout_connected");
+         }
+   }
+}
+
diff --git a/res/edje/circle/moments_status_simcard.edc b/res/edje/circle/moments_status_simcard.edc
new file mode 100644 (file)
index 0000000..bef2e60
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../../../inc/moments/moments_view_edje_conf.h"
+
+#define SIMCARD_DIR_PREFIX "Simcard"
+
+collections {
+   group { STATUS_SIMCARD_LAYOUT;
+      images {
+         image: SIMCARD_DIR_PREFIX"/no_sim.png" COMP;
+      }
+      parts {
+         part {
+            name: "icon_image";
+            type: IMAGE;
+            description {
+                state: "default" 0.0;
+                align: 0.5 0.5;
+                rel1 { relative: 0.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+                image.normal: SIMCARD_DIR_PREFIX"/no_sim.png";
+                color: 250 250 250 255;
+            }
+                }
+      }
+   }
+}
+
+
diff --git a/res/edje/circle/moments_status_util_battery.edc b/res/edje/circle/moments_status_util_battery.edc
deleted file mode 100644 (file)
index 5a1ee15..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../../../inc/moments/moments_view_edje_conf.h"
-
-#define BATTERY_DIR_PREFIX "Battery"
-
-#define DESCRIPTION_BATTERY(num)\
-       description {\
-               state: "battery_percent_"num;\
-               inherit: "default" 0.0;\
-               image.normal: BATTERY_DIR_PREFIX"/battery_"num".png";\
-       }\
-
-#define PROGRAM_BATTERY(num)\
-       program {\
-               name: "change_level_"num;\
-               signal: "change_percent_"num;\
-               source: "icon_image";\
-               action: STATE_SET "battery_percent_"num 0.0;\
-               target: "icon_image";\
-       }\
-
-collections {
-   group { STATUS_BATTERY_LAYOUT;
-      images {
-         image: BATTERY_DIR_PREFIX"/battery_00.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_05.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_10.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_15.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_20.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_25.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_30.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_35.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_40.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_45.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_50.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_55.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_60.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_65.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_70.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_75.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_80.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_85.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_90.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_95.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_100.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_bg.png" COMP;
-         image: BATTERY_DIR_PREFIX"/battery_charge.png" COMP;
-      }
-      parts {
-         part {
-            name: "battery_bg";
-            type: IMAGE;
-            mouse_events: 0;
-            repeat_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-                          color: 250 250 250 255;
-               image.normal: BATTERY_DIR_PREFIX"/battery_bg.png";
-            }
-         }
-         part {
-            name: "icon_image";
-            type: IMAGE;
-            description {
-                state: "default" 0.0;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; to: "battery_bg"; }
-                rel2 { relative: 1.0 1.0; to: "battery_bg"; }
-                image.normal: BATTERY_DIR_PREFIX"/battery_100.png";
-                               color: 250 250 250 255;
-            }
-                       description {
-                state: "hide";
-                inherit: "default" 0.0;
-                visible: 0;
-                       }
-                       DESCRIPTION_BATTERY(00);
-                       DESCRIPTION_BATTERY(05);
-                       DESCRIPTION_BATTERY(10);
-                       DESCRIPTION_BATTERY(15);
-                       DESCRIPTION_BATTERY(20);
-                       DESCRIPTION_BATTERY(25);
-                       DESCRIPTION_BATTERY(30);
-                       DESCRIPTION_BATTERY(35);
-                       DESCRIPTION_BATTERY(40);
-                       DESCRIPTION_BATTERY(45);
-                       DESCRIPTION_BATTERY(50);
-                       DESCRIPTION_BATTERY(55);
-                       DESCRIPTION_BATTERY(60);
-                       DESCRIPTION_BATTERY(65);
-                       DESCRIPTION_BATTERY(70);
-                       DESCRIPTION_BATTERY(75);
-                       DESCRIPTION_BATTERY(80);
-                       DESCRIPTION_BATTERY(85);
-                       DESCRIPTION_BATTERY(90);
-                       DESCRIPTION_BATTERY(95);
-                       DESCRIPTION_BATTERY(100);
-
-                }
-         part {
-            name: "battery_charge_image";
-            type: IMAGE;
-            description {
-               state: "default" 0.0;
-               align: 0.5 0.5;
-               rel1 { relative: 0.0 0.0; to: "battery_bg"; }
-               rel2 { relative: 1.0 1.0; to: "battery_bg"; }
-               visible: 0;
-                          color: 0 0 0 255;
-               image.normal: BATTERY_DIR_PREFIX"/battery_charge.png";
-            }
-                       description {
-               state: "show";
-               inherit: "default" 0.0;
-               visible: 1;     
-                       }
-         }
-      }
-
-         programs {
-               program {
-                       name: "hide_icon_image";
-                       signal: "hide_icon_image";
-                       source: "icon_image";
-                       action: STATE_SET "hide" 0.0;
-                       target: "icon_image";
-               }
-               PROGRAM_BATTERY(00);
-               PROGRAM_BATTERY(05);
-               PROGRAM_BATTERY(10);
-               PROGRAM_BATTERY(15);
-               PROGRAM_BATTERY(20);
-               PROGRAM_BATTERY(25);
-               PROGRAM_BATTERY(30);
-               PROGRAM_BATTERY(35);
-               PROGRAM_BATTERY(40);
-               PROGRAM_BATTERY(45);
-               PROGRAM_BATTERY(50);
-               PROGRAM_BATTERY(55);
-               PROGRAM_BATTERY(60);
-               PROGRAM_BATTERY(65);
-               PROGRAM_BATTERY(70);
-               PROGRAM_BATTERY(75);
-               PROGRAM_BATTERY(80);
-               PROGRAM_BATTERY(85);
-               PROGRAM_BATTERY(90);
-               PROGRAM_BATTERY(95);
-               PROGRAM_BATTERY(100);
-
-               program {
-                       name: "show_battery_charge";
-                       signal: "show_battery_charge";
-                       source: "battery_charge_image";
-                       action: STATE_SET "show" 0.0;
-                       target: "battery_charge_image";
-               }
-               program {
-                       name: "hide_battery_charge";
-                       signal: "hide_battery_charge";
-                       source: "battery_charge_image";
-                       action: STATE_SET "default" 0.0;
-                       target: "battery_charge_image";
-               }
-         }
-   }
-}
diff --git a/res/edje/circle/moments_status_util_callsignal.edc b/res/edje/circle/moments_status_util_callsignal.edc
deleted file mode 100644 (file)
index 2ae1b6e..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../../../inc/moments/moments_view_edje_conf.h"
-
-#define CALLSIGNAL_DIR_PREFIX "Callsignal"
-
-#define DESCRIPTION_CALLSIGNAL(num)\
-       description {\
-               state: "call_signal_"num;\
-               inherit: "default" 0.0;\
-               image.normal: CALLSIGNAL_DIR_PREFIX"/signal_strength_"num".png";\
-       }\
-
-#define DESCRIPTION_ROAMING_CALLSIGNAL(num)\
-       description {\
-               state: "roaming_call_signal_"num;\
-               inherit: "default" 0.0;\
-               image.normal: CALLSIGNAL_DIR_PREFIX"/roaming_strength_"num".png";\
-       }\
-
-#define PROGRAM_CALLSIGNAL(num)\
-       program {\
-               name: "change_strength_"num;\
-               signal: "change_callsignal_strength_"num;\
-               source: "icon_image";\
-               action: STATE_SET "call_signal_"num 0.0;\
-               target: "icon_image";\
-       }\
-
-#define PROGRAM_ROAMING_CALLSIGNAL(num)\
-       program {\
-               name: "change_roaming_strength_"num;\
-               signal: "change_roaming_callsignal_strength_"num;\
-               source: "icon_image";\
-               action: STATE_SET "roaming_call_signal_"num 0.0;\
-               target: "icon_image";\
-       }\
-
-collections {
-   group { STATUS_CALLSIGNAL_LAYOUT;
-      images {
-         image: CALLSIGNAL_DIR_PREFIX"/no_signal.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/indi_flight_mode.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_00.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_01.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_02.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_03.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/signal_strength_04.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_00.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_01.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_02.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_03.png" COMP;
-         image: CALLSIGNAL_DIR_PREFIX"/roaming_strength_04.png" COMP;
-      }
-      parts {
-         part {
-            name: "icon_image";
-            type: IMAGE;
-            description {
-                state: "default" 0.0;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; }
-                rel2 { relative: 1.0 1.0; }
-                image.normal: CALLSIGNAL_DIR_PREFIX"/no_signal.png";
-                               color: 250 250 250 255;
-            }
-                       description {
-                state: "hide";
-                inherit: "default" 0.0;
-                visible: 0;
-                       }
-                       description {
-                state: "flight_mode";
-                inherit: "default" 0.0;
-                image.normal: CALLSIGNAL_DIR_PREFIX"/indi_flight_mode.png";
-                       }
-                       DESCRIPTION_CALLSIGNAL(00);
-                       DESCRIPTION_CALLSIGNAL(01);
-                       DESCRIPTION_CALLSIGNAL(02);
-                       DESCRIPTION_CALLSIGNAL(03);
-                       DESCRIPTION_CALLSIGNAL(04);
-                       DESCRIPTION_ROAMING_CALLSIGNAL(00);
-                       DESCRIPTION_ROAMING_CALLSIGNAL(01);
-                       DESCRIPTION_ROAMING_CALLSIGNAL(02);
-                       DESCRIPTION_ROAMING_CALLSIGNAL(03);
-                       DESCRIPTION_ROAMING_CALLSIGNAL(04);
-
-                }
-      }
-
-         programs {
-               program {
-                       name: "hide_icon_image";
-                       signal: "hide_icon_image";
-                       source: "icon_image";
-                       action: STATE_SET "hide" 0.0;
-                       target: "icon_image";
-               }
-
-               program {
-                       name: "no_signal";
-                       signal: "change_to_no_signal";
-                       source: "icon_image";
-                       action: STATE_SET "default" 0.0;
-                       target: "icon_image";
-               }
-
-               program {
-                       name: "flight_mode";
-                       signal: "change_to_flight_mode";
-                       source: "icon_image";
-                       action: STATE_SET "flight_mode" 0.0;
-                       target: "icon_image";
-               }
-
-               PROGRAM_CALLSIGNAL(00);
-               PROGRAM_CALLSIGNAL(01);
-               PROGRAM_CALLSIGNAL(02);
-               PROGRAM_CALLSIGNAL(03);
-               PROGRAM_CALLSIGNAL(04);
-
-               PROGRAM_ROAMING_CALLSIGNAL(00);
-               PROGRAM_ROAMING_CALLSIGNAL(01);
-               PROGRAM_ROAMING_CALLSIGNAL(02);
-               PROGRAM_ROAMING_CALLSIGNAL(03);
-               PROGRAM_ROAMING_CALLSIGNAL(04);
-         }
-   }
-}
diff --git a/res/edje/circle/moments_status_util_network.edc b/res/edje/circle/moments_status_util_network.edc
deleted file mode 100644 (file)
index 78b1dd8..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../../../inc/moments/moments_view_edje_conf.h"
-
-#define NETWORK_DIR_PREFIX "Network"
-
-#define DESCRIPTION_NETWORK(name)\
-       description {\
-               state: "state_"name;\
-               inherit: "default" 0.0;\
-               image.normal: NETWORK_DIR_PREFIX"/"name".png";\
-       }\
-
-#define PROGRAM_NETWORK_TYPE(num)\
-       program {\
-               name: "network_type_"num;\
-               signal: "network_type_"num;\
-               source: "type_icon_image";\
-               action: STATE_SET "state_"num 0.0;\
-               target: "type_icon_image";\
-       }\
-
-#define PROGRAM_NETWORK_INOUT(num)\
-       program {\
-               name: "packet_"num;\
-               signal: "packet_"num;\
-               source: "inout_icon_image";\
-               action: STATE_SET "state_"num 0.0;\
-               target: "inout_icon_image";\
-       }\
-
-collections {
-   group { STATUS_NETWORK_LAYOUT;
-      images {
-         image: NETWORK_DIR_PREFIX"/gprs_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/edge_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/umts_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/hsdpa_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/hspa_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/lte_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/in_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/out_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/inout_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/no_inout_connected.png" COMP;
-         image: NETWORK_DIR_PREFIX"/wifi_connected_00.png" COMP;
-         image: NETWORK_DIR_PREFIX"/wifi_connected_01.png" COMP;
-         image: NETWORK_DIR_PREFIX"/wifi_connected_02.png" COMP;
-         image: NETWORK_DIR_PREFIX"/wifi_connected_03.png" COMP;
-         image: NETWORK_DIR_PREFIX"/wifi_connected_04.png" COMP;
-      }
-      parts {
-         part {
-            name: "type_icon_image";
-            type: IMAGE;
-            description {
-                state: "default" 0.0;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; }
-                rel2 { relative: 1.0 1.0; }
-                image.normal: NETWORK_DIR_PREFIX"/edge_connected.png";
-                               color: 250 250 250 255;
-            }
-                       description {
-                state: "hide";
-                inherit: "default" 0.0;
-                visible: 0;
-                       }
-                       DESCRIPTION_NETWORK("gprs_connected");
-                       DESCRIPTION_NETWORK("edge_connected");
-                       DESCRIPTION_NETWORK("umts_connected");
-                       DESCRIPTION_NETWORK("hsdpa_connected");
-                       DESCRIPTION_NETWORK("hspa_connected");
-                       DESCRIPTION_NETWORK("lte_connected");
-                       DESCRIPTION_NETWORK("wifi_connected_00");
-                       DESCRIPTION_NETWORK("wifi_connected_01");
-                       DESCRIPTION_NETWORK("wifi_connected_02");
-                       DESCRIPTION_NETWORK("wifi_connected_03");
-                       DESCRIPTION_NETWORK("wifi_connected_04");
-                }
-         part {
-            name: "inout_icon_image";
-            type: IMAGE;
-            description {
-                state: "default" 0.0;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; }
-                rel2 { relative: 1.0 1.0; }
-                image.normal: NETWORK_DIR_PREFIX"/no_inout_connected.png";
-                               color: 250 250 250 255;
-            }
-                       description {
-                state: "hide";
-                inherit: "default" 0.0;
-                visible: 0;
-                       }
-                       DESCRIPTION_NETWORK("no_inout_connected");
-                       DESCRIPTION_NETWORK("in_connected");
-                       DESCRIPTION_NETWORK("out_connected");
-                       DESCRIPTION_NETWORK("inout_connected");
-                }
-      }
-
-         programs {
-               program {
-                       name: "hide_icon_image";
-                       signal: "hide_icon_image";
-                       source: "type_icon_image";
-                       action: STATE_SET "hide" 0.0;
-                       target: "type_icon_image";
-                       target: "inout_icon_image";
-               }
-
-               PROGRAM_NETWORK_TYPE("gprs_connected");
-               PROGRAM_NETWORK_TYPE("edge_connected");
-               PROGRAM_NETWORK_TYPE("umts_connected");
-               PROGRAM_NETWORK_TYPE("hsdpa_connected");
-               PROGRAM_NETWORK_TYPE("hspa_connected");
-               PROGRAM_NETWORK_TYPE("lte_connected");
-               PROGRAM_NETWORK_TYPE("wifi_connected_00");
-               PROGRAM_NETWORK_TYPE("wifi_connected_01");
-               PROGRAM_NETWORK_TYPE("wifi_connected_02");
-               PROGRAM_NETWORK_TYPE("wifi_connected_03");
-               PROGRAM_NETWORK_TYPE("wifi_connected_04");
-               PROGRAM_NETWORK_INOUT("no_inout_connected");
-               PROGRAM_NETWORK_INOUT("in_connected");
-               PROGRAM_NETWORK_INOUT("out_connected");
-               PROGRAM_NETWORK_INOUT("inout_connected");
-         }
-   }
-}
-
diff --git a/res/edje/circle/moments_status_util_simcard.edc b/res/edje/circle/moments_status_util_simcard.edc
deleted file mode 100644 (file)
index bef2e60..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../../../inc/moments/moments_view_edje_conf.h"
-
-#define SIMCARD_DIR_PREFIX "Simcard"
-
-collections {
-   group { STATUS_SIMCARD_LAYOUT;
-      images {
-         image: SIMCARD_DIR_PREFIX"/no_sim.png" COMP;
-      }
-      parts {
-         part {
-            name: "icon_image";
-            type: IMAGE;
-            description {
-                state: "default" 0.0;
-                align: 0.5 0.5;
-                rel1 { relative: 0.0 0.0; }
-                rel2 { relative: 1.0 1.0; }
-                image.normal: SIMCARD_DIR_PREFIX"/no_sim.png";
-                color: 250 250 250 255;
-            }
-                }
-      }
-   }
-}
-
-
index 6e8f0d55254371b344f39a76a5837b2dd17d3805..7273f289cfb82c3e65db3b81316a5c96d9ae34dc 100755 (executable)
@@ -35,14 +35,12 @@ static struct __manager_s {
        Evas_Object *win;
        Evas_Object *bg_scroller;
        Evas_Object *layout;
-       Evas_Object *status_layout;
        bool visible;
        bool on_initialization;
 } s_info = {
        .win = NULL,
        .bg_scroller = NULL,
        .layout = NULL,
-       .status_layout = NULL,
        .visible = false,
        .on_initialization = false,
 };
@@ -93,7 +91,6 @@ void moments_init(Evas_Object *win, Evas_Object *bg_scroller)
 
        s_info.layout = moments_create_ui(s_info.win);
 
-       moments_status_view_create(s_info.win);
        __moments_register_status_util_callback();
        __moments_initialize_status_util();
 
@@ -106,7 +103,6 @@ void moments_fini(void)
 
        __moments_unregister_status_util_callback();
        moments_destroy_ui();
-       moments_destroy_status_ui();
 
        s_info.layout = NULL;
        s_info.bg_scroller = NULL;
@@ -336,7 +332,7 @@ static void __moments_manager_update_status_view(int is_flight, int _service_sta
        moments_status_callsignal_update(callsignal_strength, is_roaming);
        moments_status_network_update(wifi_state == VCONFKEY_WIFI_CONNECTED ? (int)network_type + MOMENT_STATUS_SIGNAL_WIFI_INDEX : (int)network_type, (int)network_type == 0 ? (int)network_type : (int)packet_type+15);
 
-       moments_status_update_util_icon_list();
+       moments_status_update_view();
 }
 
 static void __moments_status_call_network_service_state_changed_cb(telephony_h handle, telephony_noti_e noti_id, void *data, void *user_data)
@@ -398,7 +394,7 @@ static void __moments_status_util_simcard_state_changed_cb(telephony_h handle, t
                _D("Sim is unavailable, Show NO_SIM icon");
                moments_status_simcard_icon_show();
        }
-       moments_status_update_util_icon_list();
+       moments_status_update_view();
 }
 
 static void __moments_get_callsignal_state(bool *is_roaming, int *strength)
index 95d959449694df40f60d2f9c3c422217da181dcd..f2b919709cb9bd1f28f0d94eb2c1559ca00089b7 100644 (file)
 #include "apps/apps_conf.h"
 
 #define STATUS_LAYOUT_EDJE EDJE_DIR"/circle/moments_status_layout.edj"
-#define STATUS_UTIL_BATTERY_EDJE EDJE_DIR"/circle/moments_status_util_battery.edj"
-#define STATUS_UTIL_CALLSIGNAL_EDJE EDJE_DIR"/circle/moments_status_util_callsignal.edj"
-#define STATUS_UTIL_NETWORK_EDJE EDJE_DIR"/circle/moments_status_util_network.edj"
-#define STATUS_UTIL_SIMCARD_EDJE EDJE_DIR"/circle/moments_status_util_simcard.edj"
+#define STATUS_BATTERY_EDJE EDJE_DIR"/circle/moments_status_battery.edj"
+#define STATUS_CALLSIGNAL_EDJE EDJE_DIR"/circle/moments_status_callsignal.edj"
+#define STATUS_NETWORK_EDJE EDJE_DIR"/circle/moments_status_network.edj"
+#define STATUS_SIMCARD_EDJE EDJE_DIR"/circle/moments_status_simcard.edj"
 
 static struct __status_view_s {
        Evas_Object *status_layout;
@@ -55,23 +55,23 @@ static struct __status_view_s {
        .status_simcard = NULL,
 };
 
-static status_util_icon_type_e __status_util_icon_priority_bt[STATUS_UTIL_ICON_MAX_COUNT_BT] = {
-       STATUS_UTIL_ICON_BLUETOOTH,
-       STATUS_UTIL_ICON_NETWORK,
-       STATUS_UTIL_ICON_HEADSET
+static status_icon_type_e __status_icon_priority_bt[STATUS_ICON_MAX_COUNT_BT] = {
+       STATUS_ICON_BLUETOOTH,
+       STATUS_ICON_NETWORK,
+       STATUS_ICON_HEADSET
 };
 
-static status_util_icon_type_e __status_util_icon_priority_3g[STATUS_UTIL_ICON_MAX_COUNT_3G] = {
-       STATUS_UTIL_ICON_CALLSIGNAL,
-       STATUS_UTIL_ICON_NETWORK,
-       STATUS_UTIL_ICON_BLUETOOTH,
-       STATUS_UTIL_ICON_HEADSET,
-       STATUS_UTIL_ICON_NO_SIM,
-       STATUS_UTIL_ICON_CALL_FORWARD,
-       STATUS_UTIL_ICON_GPS
+static status_icon_type_e __status_icon_priority_3g[STATUS_ICON_MAX_COUNT_3G] = {
+       STATUS_ICON_CALLSIGNAL,
+       STATUS_ICON_NETWORK,
+       STATUS_ICON_BLUETOOTH,
+       STATUS_ICON_HEADSET,
+       STATUS_ICON_NO_SIM,
+       STATUS_ICON_CALL_FORWARD,
+       STATUS_ICON_GPS
 };
 
-static status_util_icon_type_e __status_util_icon_position[STATUS_UTIL_ICON_MAX_COUNT + 1][2] = {
+static status_icon_type_e __status_icon_position[STATUS_ICON_MAX_COUNT + 1][2] = {
        { 135, 7 }, { 104, 18 }, { 201, 7 }, { 232, 18 }, { 74, 36 }, { 262, 36 }, { 45, 59 }, { 291, 59 }
 };
 
@@ -97,129 +97,43 @@ static char *__status_network_type_signal[19] = {
        "packet_inout_connected"
 };
 
-static Evas_Object *__status_util_icon_list[STATUS_UTIL_ICON_MAX_COUNT] = { NULL, };
-static bool __status_util_icon_is_appended[STATUS_UTIL_ICON_MAX_COUNT] = { false, };
-static Eina_List *__status_util_icon_type_list = NULL;
+static Evas_Object *__status_icon_list[STATUS_ICON_MAX_COUNT] = { NULL, };
+static bool __status_icon_is_appended[STATUS_ICON_MAX_COUNT] = { false, };
+static Eina_List *__status_icon_type_list = NULL;
 
 static Evas_Object *__moments_status_create_base_layout(Evas_Object *parent);
-static Evas_Object *__moments_status_create_battery(Evas_Object *parent);
-static void __moments_status_register_util_icon_type_to_list(status_util_icon_type_e type);
-static void __moments_status_unregister_util_icon_type_from_list(status_util_icon_type_e type);
-static status_util_icon_type_e __status_get_prev_type_by_priority(status_util_icon_type_e type);
-static void __status_append_icon_type_to_type_list(status_util_icon_type_e type, status_util_icon_type_e prev_type);
-static void __status_prepend_icon_type_to_type_list(status_util_icon_type_e type);
-
-Evas_Object *moments_status_view_get_layout(void)
-{
-       return s_info.status_layout;
-}
+static void __register_icon_type_to_list(status_icon_type_e type);
+static void __unregister_icon_type_from_list(status_icon_type_e type);
+static status_icon_type_e __get_prev_type_by_priority(status_icon_type_e type);
+static void __append_icon_type_to_type_list(status_icon_type_e type, status_icon_type_e prev_type);
+static void __prepend_icon_type_to_type_list(status_icon_type_e type);
+
+static Evas_Object *__create_battery(Evas_Object *parent);
+static Evas_Object *__create_callsignal(Evas_Object *parent);
+static Evas_Object *__create_network(Evas_Object *parent);
+static Evas_Object *__create_simcard(Evas_Object *parent);
 
 Evas_Object *moments_status_view_create(Evas_Object *parent)
 {
        s_info.status_layout = __moments_status_create_base_layout(parent);
 
-       s_info.status_battery = __moments_status_create_battery(s_info.status_layout);
+       s_info.status_battery = __create_battery(s_info.status_layout);
 
        return s_info.status_layout;
 }
 
-void moments_status_callsignal_icon_show(void)
-{
-       s_info.status_callsignal = elm_layout_add(s_info.status_layout);
-       if (!s_info.status_callsignal || !elm_layout_file_set(s_info.status_callsignal, util_get_res_file_path(STATUS_UTIL_CALLSIGNAL_EDJE), STATUS_CALLSIGNAL_LAYOUT)) {
-               _E("Failed to create callsignal layout");
-               return;
-       }
-       evas_object_size_hint_min_set(s_info.status_callsignal, MOMENTS_STATUS_UTIL_ICON_W, MOMENTS_STATUS_UTIL_ICON_H);
-       evas_object_size_hint_align_set(s_info.status_callsignal, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_weight_set(s_info.status_callsignal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_move(s_info.status_callsignal, OUTSIDE_X, OUTSIDE_Y);
-       evas_object_show(s_info.status_callsignal);
-
-       __status_util_icon_list[STATUS_UTIL_ICON_CALLSIGNAL] = s_info.status_callsignal;
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_CALLSIGNAL] = true;
-
-       __moments_status_register_util_icon_type_to_list(STATUS_UTIL_ICON_CALLSIGNAL);
-}
-
-void moments_status_callsignal_icon_hide(void)
+void moments_status_view_destroy(void)
 {
-       __moments_status_unregister_util_icon_type_from_list(STATUS_UTIL_ICON_CALLSIGNAL);
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_CALLSIGNAL] = false;
+       _D("%s", __func__);
 
        if (s_info.status_callsignal) evas_object_del(s_info.status_callsignal);
        s_info.status_callsignal = NULL;
-       __status_util_icon_list[STATUS_UTIL_ICON_CALLSIGNAL] = NULL;
-}
-
-void moments_status_network_icon_show(void)
-{
-       s_info.status_network = elm_layout_add(s_info.status_layout);
-       if (!s_info.status_network || !elm_layout_file_set(s_info.status_network, util_get_res_file_path(STATUS_UTIL_NETWORK_EDJE), STATUS_NETWORK_LAYOUT)) {
-               _E("Failed to create network layout");
-               return;
-       }
-       evas_object_size_hint_min_set(s_info.status_network, MOMENTS_STATUS_UTIL_ICON_W, MOMENTS_STATUS_UTIL_ICON_H);
-       evas_object_size_hint_align_set(s_info.status_network, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_weight_set(s_info.status_network, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_move(s_info.status_network, OUTSIDE_X, OUTSIDE_Y);
-       evas_object_show(s_info.status_network);
-
-       __status_util_icon_list[STATUS_UTIL_ICON_NETWORK] = s_info.status_network;
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_NETWORK] = true;
-
-       __moments_status_register_util_icon_type_to_list(STATUS_UTIL_ICON_NETWORK);
-}
-
-void moments_status_network_icon_hide(void)
-{
-       __moments_status_unregister_util_icon_type_from_list(STATUS_UTIL_ICON_NETWORK);
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_NETWORK] = false;
 
        if (s_info.status_network) evas_object_del(s_info.status_network);
-       s_info.status_network= NULL;
-       __status_util_icon_list[STATUS_UTIL_ICON_NETWORK] = NULL;
-}
-
-void moments_status_simcard_icon_show(void)
-{
-       s_info.status_simcard = elm_layout_add(s_info.status_layout);
-       if (!s_info.status_simcard || !elm_layout_file_set(s_info.status_simcard, util_get_res_file_path(STATUS_UTIL_SIMCARD_EDJE), STATUS_SIMCARD_LAYOUT)) {
-               _E("Failed to create simcard layout");
-               return;
-       }
-       evas_object_size_hint_min_set(s_info.status_simcard, MOMENTS_STATUS_UTIL_ICON_W, MOMENTS_STATUS_UTIL_ICON_H);
-       evas_object_size_hint_align_set(s_info.status_simcard, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_weight_set(s_info.status_simcard, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_move(s_info.status_simcard, OUTSIDE_X, OUTSIDE_Y);
-       evas_object_show(s_info.status_simcard);
-
-       __status_util_icon_list[STATUS_UTIL_ICON_NO_SIM] = s_info.status_simcard;
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_NO_SIM] = true;
-
-       __moments_status_register_util_icon_type_to_list(STATUS_UTIL_ICON_NO_SIM);
-}
-
-void moments_status_simcard_icon_hide(void)
-{
-       __moments_status_unregister_util_icon_type_from_list(STATUS_UTIL_ICON_NO_SIM);
-       __status_util_icon_is_appended[STATUS_UTIL_ICON_NO_SIM] = false;
+       s_info.status_network = NULL;
 
        if (s_info.status_simcard) evas_object_del(s_info.status_simcard);
        s_info.status_simcard = NULL;
-       __status_util_icon_list[STATUS_UTIL_ICON_NO_SIM] = NULL;
-}
-
-void moments_destroy_status_ui(void)
-{
-       _D("%s", __func__);
-       if (moments_check_is_3g_device()) {
-               if (s_info.status_callsignal) evas_object_del(s_info.status_callsignal);
-               s_info.status_callsignal = NULL;
-
-               if (s_info.status_network) evas_object_del(s_info.status_network);
-               s_info.status_network = NULL;
-       }
 
        if (s_info.status_battery) evas_object_del(s_info.status_battery);
        s_info.status_battery = NULL;
@@ -251,6 +165,27 @@ void moments_status_battery_update(int percent, int converted_percent, bool is_c
        }
 }
 
+
+void moments_status_callsignal_icon_show(void)
+{
+       s_info.status_callsignal = __create_callsignal(s_info.status_layout);
+
+       __status_icon_list[STATUS_ICON_CALLSIGNAL] = s_info.status_callsignal;
+       __status_icon_is_appended[STATUS_ICON_CALLSIGNAL] = true;
+
+       __register_icon_type_to_list(STATUS_ICON_CALLSIGNAL);
+}
+
+void moments_status_callsignal_icon_hide(void)
+{
+       __unregister_icon_type_from_list(STATUS_ICON_CALLSIGNAL);
+       __status_icon_is_appended[STATUS_ICON_CALLSIGNAL] = false;
+
+       if (s_info.status_callsignal) evas_object_del(s_info.status_callsignal);
+       s_info.status_callsignal = NULL;
+       __status_icon_list[STATUS_ICON_CALLSIGNAL] = NULL;
+}
+
 void moments_status_callsignal_update(int strength, bool is_roaming)
 {
        _D("Update callsignal strength[%d], is_roaming[%d]", strength, is_roaming);
@@ -270,6 +205,26 @@ void moments_status_callsignal_update(int strength, bool is_roaming)
        elm_object_signal_emit(s_info.status_callsignal, callsignal_buf, "icon_image");
 }
 
+void moments_status_network_icon_show(void)
+{
+       s_info.status_network = __create_network(s_info.status_layout);
+
+       __status_icon_list[STATUS_ICON_NETWORK] = s_info.status_network;
+       __status_icon_is_appended[STATUS_ICON_NETWORK] = true;
+
+       __register_icon_type_to_list(STATUS_ICON_NETWORK);
+}
+
+void moments_status_network_icon_hide(void)
+{
+       __unregister_icon_type_from_list(STATUS_ICON_NETWORK);
+       __status_icon_is_appended[STATUS_ICON_NETWORK] = false;
+
+       if (s_info.status_network) evas_object_del(s_info.status_network);
+       s_info.status_network= NULL;
+       __status_icon_list[STATUS_ICON_NETWORK] = NULL;
+}
+
 void moments_status_network_update(int network_type, int packet_type)
 {
        _D("Update network_type[%d], packet_type[%d]", network_type, packet_type);
@@ -283,14 +238,34 @@ void moments_status_network_update(int network_type, int packet_type)
        }
 }
 
-void moments_status_update_util_icon_list(void)
+void moments_status_simcard_icon_show(void)
+{
+       s_info.status_simcard = __create_simcard(s_info.status_layout);
+
+       __status_icon_list[STATUS_ICON_NO_SIM] = s_info.status_simcard;
+       __status_icon_is_appended[STATUS_ICON_NO_SIM] = true;
+
+       __register_icon_type_to_list(STATUS_ICON_NO_SIM);
+}
+
+void moments_status_simcard_icon_hide(void)
 {
-       _D("Update status util icon list");
+       __unregister_icon_type_from_list(STATUS_ICON_NO_SIM);
+       __status_icon_is_appended[STATUS_ICON_NO_SIM] = false;
+
+       if (s_info.status_simcard) evas_object_del(s_info.status_simcard);
+       s_info.status_simcard = NULL;
+       __status_icon_list[STATUS_ICON_NO_SIM] = NULL;
+}
+
+void moments_status_update_view(void)
+{
+       _D("Update status icon list");
        int i;
        void *data = NULL;
-       for (i = 0; i < STATUS_UTIL_ICON_MAX_COUNT; i++)
+       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++)
        {
-               Evas_Object *icon = __status_util_icon_list[i];
+               Evas_Object *icon = __status_icon_list[i];
                if (icon) {
                        elm_grid_unpack(s_info.status_grid, icon);
                        evas_object_move(icon, OUTSIDE_X, OUTSIDE_Y);
@@ -300,30 +275,30 @@ void moments_status_update_util_icon_list(void)
        Eina_List *list = NULL;
 
        i = 0;
-       EINA_LIST_FOREACH(__status_util_icon_type_list, list, data) {
-               status_util_icon_type_e type = (status_util_icon_type_e)data;
-               elm_grid_pack(s_info.status_grid, __status_util_icon_list[type], __status_util_icon_position[i][0], __status_util_icon_position[i][1], MOMENTS_STATUS_UTIL_ICON_W, MOMENTS_STATUS_UTIL_ICON_H);
+       EINA_LIST_FOREACH(__status_icon_type_list, list, data) {
+               status_icon_type_e type = (status_icon_type_e)data;
+               elm_grid_pack(s_info.status_grid, __status_icon_list[type], __status_icon_position[i][0], __status_icon_position[i][1], MOMENTS_STATUS_ICON_W, MOMENTS_STATUS_ICON_H);
                i++;
        }
 }
 
-static status_util_icon_type_e __status_get_prev_type_by_priority(status_util_icon_type_e type)
+static status_icon_type_e __get_prev_type_by_priority(status_icon_type_e type)
 {
        int i;
-       status_util_icon_type_e prev_type = -1;
-       for (i = 0; i < STATUS_UTIL_ICON_MAX_COUNT; i++)
+       status_icon_type_e prev_type = -1;
+       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++)
        {
-               status_util_icon_type_e cur_type = -1;
+               status_icon_type_e cur_type = -1;
                if (moments_check_is_3g_device()) {
-                       cur_type = __status_util_icon_priority_3g[i];
-               } else {
-                       cur_type = __status_util_icon_priority_bt[i];
+                       cur_type = __status_icon_priority_3g[i];
+               } else if (!moments_check_is_3g_device() && i < STATUS_ICON_MAX_COUNT_BT) {
+                       cur_type = __status_icon_priority_bt[i];
                }
 
                if (cur_type == type)
                        break;
 
-               if (__status_util_icon_is_appended[cur_type]) {
+               if (__status_icon_is_appended[cur_type]) {
                        prev_type = cur_type;
                }
        }
@@ -331,51 +306,51 @@ static status_util_icon_type_e __status_get_prev_type_by_priority(status_util_ic
        return prev_type;
 }
 
-static void __status_prepend_icon_type_to_type_list(status_util_icon_type_e type)
+static void __prepend_icon_type_to_type_list(status_icon_type_e type)
 {
-       __status_util_icon_type_list = eina_list_prepend(__status_util_icon_type_list, (void *)type);
+       __status_icon_type_list = eina_list_prepend(__status_icon_type_list, (void *)type);
 }
 
-static void __status_append_icon_type_to_type_list(status_util_icon_type_e type, status_util_icon_type_e prev_type)
+static void __append_icon_type_to_type_list(status_icon_type_e type, status_icon_type_e prev_type)
 {
        Eina_List *list = NULL;
        void * data = NULL;
 
-       EINA_LIST_FOREACH(__status_util_icon_type_list, list, data) {
-               status_util_icon_type_e type_compared = (status_util_icon_type_e)data;
+       EINA_LIST_FOREACH(__status_icon_type_list, list, data) {
+               status_icon_type_e type_compared = (status_icon_type_e)data;
                if (type_compared == prev_type) {
-                       __status_util_icon_type_list = eina_list_append_relative_list(__status_util_icon_type_list, (void *)type, list);
+                       __status_icon_type_list = eina_list_append_relative_list(__status_icon_type_list, (void *)type, list);
                        break;
                }
        }
 }
 
-static void __moments_status_register_util_icon_type_to_list(status_util_icon_type_e type)
+static void __register_icon_type_to_list(status_icon_type_e type)
 {
-       status_util_icon_type_e prev_type = -1;
+       status_icon_type_e prev_type = -1;
 
        if (moments_get_is_on_initialization()) {
-               prev_type = __status_get_prev_type_by_priority(type);
+               prev_type = __get_prev_type_by_priority(type);
 
                if (prev_type < 0) {
-                       __status_prepend_icon_type_to_type_list(type);
+                       __prepend_icon_type_to_type_list(type);
                } else {
-                       __status_append_icon_type_to_type_list(type, prev_type);
+                       __append_icon_type_to_type_list(type, prev_type);
                }
        } else {
-               __status_util_icon_type_list = eina_list_append(__status_util_icon_type_list, (void *)type);
+               __status_icon_type_list = eina_list_append(__status_icon_type_list, (void *)type);
        }
 }
 
-static void __moments_status_unregister_util_icon_type_from_list(status_util_icon_type_e type)
+static void __unregister_icon_type_from_list(status_icon_type_e type)
 {
        Eina_List *list = NULL;
        void *data = NULL;
 
-       EINA_LIST_FOREACH(__status_util_icon_type_list, list, data) {
-               status_util_icon_type_e cur_type = (status_util_icon_type_e)data;
+       EINA_LIST_FOREACH(__status_icon_type_list, list, data) {
+               status_icon_type_e cur_type = (status_icon_type_e)data;
                if (cur_type == type) {
-                       __status_util_icon_type_list = eina_list_remove_list(__status_util_icon_type_list, list);
+                       __status_icon_type_list = eina_list_remove_list(__status_icon_type_list, list);
                        break;
                }
        }
@@ -415,10 +390,10 @@ __fail:
        return NULL;
 }
 
-static Evas_Object *__moments_status_create_battery(Evas_Object *parent)
+static Evas_Object *__create_battery(Evas_Object *parent)
 {
        Evas_Object *status_battery = elm_layout_add(parent);
-       if (!status_battery || !elm_layout_file_set(status_battery, util_get_res_file_path(STATUS_UTIL_BATTERY_EDJE), STATUS_BATTERY_LAYOUT)) {
+       if (!status_battery || !elm_layout_file_set(status_battery, util_get_res_file_path(STATUS_BATTERY_EDJE), STATUS_BATTERY_LAYOUT)) {
                _E("Failed to create battery layout");
                return NULL;
        }
@@ -432,14 +407,61 @@ static Evas_Object *__moments_status_create_battery(Evas_Object *parent)
        return status_battery;
 }
 
-static int __status_get_util_icon_position_index(status_util_icon_type_e type)
+static Evas_Object *__create_callsignal(Evas_Object *parent)
+{
+       Evas_Object *callsignal = elm_layout_add(parent);
+       if (!callsignal || !elm_layout_file_set(callsignal, util_get_res_file_path(STATUS_CALLSIGNAL_EDJE), STATUS_CALLSIGNAL_LAYOUT)) {
+               _E("Failed to create callsignal layout");
+               return NULL;
+       }
+       evas_object_size_hint_min_set(callsignal, MOMENTS_STATUS_ICON_W, MOMENTS_STATUS_ICON_H);
+       evas_object_size_hint_align_set(callsignal, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(callsignal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_move(callsignal, OUTSIDE_X, OUTSIDE_Y);
+       evas_object_show(callsignal);
+
+       return callsignal;
+}
+
+static Evas_Object *__create_network(Evas_Object *parent)
+{
+       Evas_Object *network = elm_layout_add(parent);
+       if (!network || !elm_layout_file_set(network, util_get_res_file_path(STATUS_NETWORK_EDJE), STATUS_NETWORK_LAYOUT)) {
+               _E("Failed to create network layout");
+               return NULL;
+       }
+       evas_object_size_hint_min_set(network, MOMENTS_STATUS_ICON_W, MOMENTS_STATUS_ICON_H);
+       evas_object_size_hint_align_set(network, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(network, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_move(network, OUTSIDE_X, OUTSIDE_Y);
+       evas_object_show(network);
+
+       return network;
+}
+static Evas_Object *__create_simcard(Evas_Object *parent)
+{
+       Evas_Object *simcard = elm_layout_add(parent);
+       if (!simcard || !elm_layout_file_set(simcard, util_get_res_file_path(STATUS_SIMCARD_EDJE), STATUS_SIMCARD_LAYOUT)) {
+               _E("Failed to create simcard layout");
+               return NULL;
+       }
+       evas_object_size_hint_min_set(simcard, MOMENTS_STATUS_ICON_W, MOMENTS_STATUS_ICON_H);
+       evas_object_size_hint_align_set(simcard, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(simcard, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_move(simcard, OUTSIDE_X, OUTSIDE_Y);
+       evas_object_show(simcard);
+
+       return simcard;
+}
+
+static int __get_icon_position_index(status_icon_type_e type)
 {
        Eina_List *list = NULL;
        void *data = NULL;
 
        int i = 0;
-       EINA_LIST_FOREACH(__status_util_icon_type_list, list, data) {
-               status_util_icon_type_e type_in_list = (status_util_icon_type_e)data;
+       EINA_LIST_FOREACH(__status_icon_type_list, list, data) {
+               status_icon_type_e type_in_list = (status_icon_type_e)data;
                if (type == type_in_list) return i;
                i++;
        }
@@ -448,6 +470,11 @@ static int __status_get_util_icon_position_index(status_util_icon_type_e type)
 
 #include <test.h>
 #if TEST_MODE
+Evas_Object *__t__get_moments_status_layout(void)
+{
+       return s_info.status_layout;
+}
+
 Evas_Object * __t__get_moments_status_grid(void)
 {
        return s_info.status_grid;
@@ -473,8 +500,8 @@ Evas_Object *__t__get_moments_status_simcard(void)
        return s_info.status_simcard;
 }
 
-int __t__get_moments_status_util_icon_index(status_util_icon_type_e type)
+int __t__get_moments_status_icon_index(int type)
 {
-       return __status_get_util_icon_position_index(type);
+       return __get_icon_position_index(type);
 }
 #endif
index 6be607a3b78e7c664f083ea1e826a843b6a102f1..02fae1994786b3d6d10de0f1e1dad2397ebb882c 100755 (executable)
@@ -40,6 +40,7 @@
 
 static struct __view_s {
        Evas_Object *win;
+       Evas_Object *status_layout;
        Evas_Object *background_layout;
        Evas_Object *size_setter;
        Evas_Object *center_layout;
@@ -51,6 +52,7 @@ static struct __view_s {
        bool is_show;
 } s_info = {
        .win = NULL,
+       .status_layout = NULL,
        .background_layout = NULL,
        .size_setter = NULL,
        .center_layout = NULL,
@@ -98,6 +100,7 @@ Evas_Object *moments_create_ui(Evas_Object *base_win)
        _D("%s", __func__);
 
        s_info.win = base_win;
+
        s_info.background_layout = __create_base_layout(base_win);
        if (s_info.background_layout == NULL) goto __fail;
 
@@ -108,6 +111,9 @@ Evas_Object *moments_create_ui(Evas_Object *base_win)
 
        s_info.control_layout = moments_control_view_create(s_info.background_layout);
 
+       s_info.status_layout = moments_status_view_create(base_win);
+       if (s_info.status_layout == NULL) goto __fail;
+
        evas_object_event_callback_add(s_info.background_layout, EVAS_CALLBACK_MOUSE_DOWN, __down_cb, NULL);
        evas_object_event_callback_add(s_info.background_layout, EVAS_CALLBACK_MOUSE_MOVE, __move_cb, NULL);
        evas_object_event_callback_add(s_info.background_layout, EVAS_CALLBACK_MOUSE_UP, __up_cb, NULL);
@@ -137,6 +143,8 @@ void moments_destroy_ui(void)
 
        if (s_info.background_layout) evas_object_del(s_info.background_layout);
        s_info.background_layout = NULL;
+
+       moments_status_view_destroy();
 }
 
 bool moments_view_show(void)
@@ -144,14 +152,14 @@ bool moments_view_show(void)
        _D("%s", __func__);
 
        if (!s_info.background_layout) return false;
-       if (!moments_status_view_get_layout()) return false;
+       if (!s_info.status_layout) return false;
 
        if (animator_is_ongoing()) {
                animator_stop();
        }
 
        evas_object_show(s_info.background_layout);
-       evas_object_show(moments_status_view_get_layout());
+       evas_object_show(s_info.status_layout);
 
        MOVEMENT movement_info[2];
        movement_info[0].start_x = 0;
@@ -166,7 +174,7 @@ bool moments_view_show(void)
        movement_info[1].dest_y = 0;
        movement_info[1].duration = MOMENTS_ANIMATION_SHOW_TIME;
 
-       Evas_Object *layout[2] = {s_info.background_layout, moments_status_view_get_layout()};
+       Evas_Object *layout[2] = {s_info.background_layout, s_info.status_layout};
        moments_view_animator_move(layout, movement_info, NULL);
 
        return true;
@@ -177,7 +185,7 @@ bool moments_view_hide(void)
        _D("%s", __func__);
 
        if (!s_info.background_layout) return false;
-       if (!moments_status_view_get_layout()) return false;
+       if (!s_info.status_layout) return false;
 
        if (animator_is_ongoing()) {
                animator_stop();
@@ -194,14 +202,14 @@ bool moments_view_hide(void)
        movement_info[0].dest_y = -WINDOW_H;
        movement_info[0].duration = MOMENTS_ANIMATION_DRAW_TIME;
 
-       evas_object_geometry_get(moments_status_view_get_layout(), &x, &y, &w, &h);
+       evas_object_geometry_get(s_info.status_layout, &x, &y, &w, &h);
        movement_info[1].start_x = x;
        movement_info[1].start_y = y;
        movement_info[1].dest_x = 0;
        movement_info[1].dest_y = -MOMENTS_INIT_H;
        movement_info[1].duration = MOMENTS_ANIMATION_DRAW_TIME;
 
-       Evas_Object *layout[2] = {s_info.background_layout, moments_status_view_get_layout()};
+       Evas_Object *layout[2] = {s_info.background_layout, s_info.status_layout};
        moments_view_animator_move(layout, movement_info, __hide_complete_cb);
 
        return true;
@@ -360,14 +368,14 @@ static void __put_down(void)
        movement_info[0].dest_y = 0;
        movement_info[0].duration = MOMENTS_ANIMATION_DRAW_TIME;
 
-       evas_object_geometry_get(moments_status_view_get_layout(), &x, &y, &w, &h);
+       evas_object_geometry_get(s_info.status_layout, &x, &y, &w, &h);
        movement_info[1].start_x = x;
        movement_info[1].start_y = y;
        movement_info[1].dest_x = 0;
        movement_info[1].dest_y = 0;
        movement_info[1].duration = MOMENTS_ANIMATION_DRAW_TIME;
 
-       Evas_Object *layout[2] = {s_info.background_layout, moments_status_view_get_layout()};
+       Evas_Object *layout[2] = {s_info.background_layout, s_info.status_layout};
 
        moments_view_animator_move(layout, movement_info, __pull_down_complete_cb);
 }
@@ -404,8 +412,8 @@ static void __hide_complete_cb(void)
        evas_object_hide(s_info.background_layout);
        evas_object_move(s_info.background_layout, OUTSIDE_X, OUTSIDE_Y);
 
-       evas_object_hide(moments_status_view_get_layout());
-       evas_object_move(moments_status_view_get_layout(), OUTSIDE_X, OUTSIDE_Y);
+       evas_object_hide(s_info.status_layout);
+       evas_object_move(s_info.status_layout, OUTSIDE_X, OUTSIDE_Y);
 
        evas_object_color_set(s_info.control_layout, 255, 255, 255, 0);
 }
index 5eac8208f86dfb53999c83e7aa9bebc88f83673a..11171644b75f2f0623ce679d1af30c5193f634c2 100755 (executable)
@@ -18,7 +18,7 @@ static struct {
        .group = NULL,
 };
 
-static void __group_set_up(void *data)
+static void __group_set_up(void)
 {
        if (moments_get_visible() == false) {
                main_s * info = main_get_info();
@@ -34,7 +34,7 @@ static void __group_set_up(void *data)
        TEST_GROUP_SET_UP_DONE(0.05, s_info.group);
 }
 
-static void __group_tear_down(void *data)
+static void __group_tear_down(void)
 {
        if (moments_get_visible()) {
                moments_hide();
index 117359b39b84138ed1215191cc36ec4e8bbc0746..e4eb5300e4d02bccf486a6d8e04cc6765af2daa0 100755 (executable)
@@ -19,7 +19,7 @@ static struct {
        .group = NULL,
 };
 
-static void __group_set_up(void *data)
+static void __group_set_up(void)
 {
        if (moments_get_visible() == false) {
                main_s * info = main_get_info();
@@ -35,7 +35,7 @@ static void __group_set_up(void *data)
        TEST_GROUP_SET_UP_DONE(0.05, s_info.group);
 }
 
-static void __group_tear_down(void *data)
+static void __group_tear_down(void)
 {
        moments_control_init();
 
index 30cbd48c65d41764e680d0ef48cfdd9fc11aab5e..2896d76d4897f80dd4bcce191e07c857407e90b2 100755 (executable)
@@ -7,6 +7,7 @@
 #include "common_conf.h"
 #include "moments/moments_status_view.h"
 #include "moments/moments_view_conf.h"
+#include "moments/moments_view_edje_conf.h"
 #include "home_app_manager.h"
 #include "../test_function.h"
 
@@ -46,6 +47,7 @@ static unit_case_func_t __case_check_hide(void *data)
 {
        Evas_Object *background_layout =  __t__get_moments_view_layout();
        TEST_ASSERT_TRUE_UPGRADE(background_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(background_layout) == EINA_FALSE);
 
        int x = 0, y = 0, w = 0, h = 0;
        evas_object_geometry_get(background_layout, &x, &y, &w, &h);
@@ -55,8 +57,9 @@ static unit_case_func_t __case_check_hide(void *data)
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_H, h);
 
-       Evas_Object *status_layout = moments_status_view_get_layout();
+       Evas_Object *status_layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE_UPGRADE(status_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_layout) == EINA_FALSE);
 
        evas_object_geometry_get(status_layout, &x, &y, &w, &h);
 
@@ -65,8 +68,30 @@ static unit_case_func_t __case_check_hide(void *data)
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
 
+       Evas_Object *status_grid = __t__get_moments_status_grid();
+       TEST_ASSERT_TRUE_UPGRADE(status_grid != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(elm_object_part_content_get(status_layout, STATUS_CONTENT) != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_grid) == EINA_TRUE);
+
+       evas_object_geometry_get(status_grid, &x, &y, &w, &h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_X, x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_Y, y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
+
+       Evas_Object *status_battery = __t__get_moments_status_battery();
+       TEST_ASSERT_TRUE_UPGRADE(status_battery != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_battery));
+
+       evas_object_geometry_get(status_battery, &x, &y, &w, &h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_X + MOMENTS_STATUS_BATTERY_ICON_X, x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_Y + MOMENTS_STATUS_BATTERY_ICON_Y, y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_H, h);
+
        Evas_Object *center_layout = __t__get_moments_center_layout();
        TEST_ASSERT_TRUE_UPGRADE(center_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(center_layout) == EINA_TRUE);
 
        evas_object_geometry_get(center_layout, &x, &y, &w, &h);
 
@@ -77,6 +102,7 @@ static unit_case_func_t __case_check_hide(void *data)
 
        Evas_Object *control_layout = __t__get_moments_control_layout();
        TEST_ASSERT_TRUE_UPGRADE(control_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(control_layout) == EINA_TRUE);
 
        evas_object_geometry_get(control_layout, &x, &y, &w, &h);
 
@@ -104,6 +130,7 @@ static unit_case_func_t __continue_check_half(void *data)
 
        Evas_Object *background_layout =  __t__get_moments_view_layout();
        TEST_ASSERT_TRUE_UPGRADE(background_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(background_layout) == EINA_TRUE);
 
        int x = 0, y = 0, w = 0, h = 0;
        evas_object_geometry_get(background_layout, &x, &y, &w, &h);
@@ -113,8 +140,9 @@ static unit_case_func_t __continue_check_half(void *data)
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_H, h);
 
-       Evas_Object *status_layout = moments_status_view_get_layout();
+       Evas_Object *status_layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE_UPGRADE(status_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_layout) == EINA_TRUE);
 
        evas_object_geometry_get(status_layout, &x, &y, &w, &h);
 
@@ -123,8 +151,30 @@ static unit_case_func_t __continue_check_half(void *data)
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
 
+       Evas_Object *status_grid = __t__get_moments_status_grid();
+       TEST_ASSERT_TRUE_UPGRADE(status_grid != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(elm_object_part_content_get(status_layout, STATUS_CONTENT) != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_grid) == EINA_TRUE);
+
+       evas_object_geometry_get(status_grid, &x, &y, &w, &h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(0, x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(0, y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
+
+       Evas_Object *status_battery = __t__get_moments_status_battery();
+       TEST_ASSERT_TRUE_UPGRADE(status_battery != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(status_battery) == EINA_TRUE);
+
+       evas_object_geometry_get(status_battery, &x, &y, &w, &h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_X, x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_Y, y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_H, h);
+
        Evas_Object *center_layout = __t__get_moments_center_layout();
        TEST_ASSERT_TRUE_UPGRADE(center_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(center_layout) == EINA_TRUE);
 
        evas_object_geometry_get(center_layout, &x, &y, &w, &h);
 
@@ -135,6 +185,7 @@ static unit_case_func_t __continue_check_half(void *data)
 
        Evas_Object *control_layout = __t__get_moments_control_layout();
        TEST_ASSERT_TRUE_UPGRADE(control_layout != NULL);
+       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(control_layout) == EINA_TRUE);
 
        evas_object_geometry_get(control_layout, &x, &y, &w, &h);
 
@@ -173,7 +224,7 @@ static unit_case_func_t __continue_check_full(void *data)
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_H, h);
 
-       Evas_Object *status_layout = moments_status_view_get_layout();
+       Evas_Object *status_layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE_UPGRADE(status_layout != NULL);
 
        evas_object_geometry_get(status_layout, &x, &y, &w, &h);
index e041b959dfb753b0b01050ed3752ea2aeeb9109a..859a95359d21e6d3a52cc34b4c39f69c0230aff2 100755 (executable)
 #define STATUS_CONTENT "status_content"
 #define STATUS_LAYOUT_EDJE "/usr/apps/org.tizen.w-home/res/edje/circle/moments_status_layout.edj"
 
-extern Evas_Object *__t__get_moments_status_battery(void);
-extern Evas_Object *__t__get_moments_status_callsignal(void);
-extern Evas_Object *__t__get_moments_status_network(void);
-static void __t__moments_status_restore_icons(void);
-extern void __t__moments_restore_status_battery(void);
-extern void __t__moments_restore_status_call_network_service_state(void);
-extern void __t__layout_mouse_down(Evas_Object *layout, int down_x, int down_y);
-extern void __t__layout_mouse_up(Evas_Object *layout, int down_x, int down_y);
-extern void    __t__moments_manager_update_status_view(int is_flight, int service_state, int wifi_state);
-
 static unit_case_func_t __case_check_status_flight_on(void *data);
 static unit_case_func_t __case_check_status_flightoff_serviceoff_wifioff(void *data);
 static unit_case_func_t __case_check_status_flightoff_serviceon_wifioff(void *data);
 
+static void __status_restore_icons(void);
+
 static struct {
        int current_step;
        Ecore_Timer * group_timer;
@@ -87,9 +79,9 @@ static void __tear_down(void)
        s_info.group->tear_down_complete(s_info.group);
 }
 
-static void __group_tear_down(void *data)
+static void __group_tear_down(void)
 {
-       __t__moments_status_restore_icons();
+       __status_restore_icons();
 
        if (moments_get_visible()) {
                main_s * info = main_get_info();
@@ -109,7 +101,7 @@ static unit_case_func_t __case_check_status_flight_on(void *data)
        main_s *info = main_get_info();
        TEST_ASSERT_TRUE_UPGRADE(info != NULL);
 
-       Evas_Object *layout = moments_status_view_get_layout();
+       Evas_Object *layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE_UPGRADE(layout != NULL);
 
        Evas_Object *callsignal = __t__get_moments_status_callsignal();
@@ -121,7 +113,7 @@ static unit_case_func_t __case_check_status_flight_on(void *data)
        Evas_Object *network = __t__get_moments_status_network();
        if (!network) {
                moments_status_network_icon_show();
-               moments_status_update_util_icon_list();
+               moments_status_update_view();
                network_is_for_test = true;
                TEST_CASE_CONTINUE(0.1, __case_check_status_flight_on, NULL);
        }
@@ -245,7 +237,7 @@ void group_feature_moments_status_behavior(unit_group_t * group)
        TEST_GROUP_RUN(s_info.group);
 }
 
-static void __t__moments_status_restore_icons(void)
+static void __status_restore_icons(void)
 {
        if (call_is_for_test) {
                moments_status_callsignal_icon_hide();
index 24e01a4c5abca574653160c42c17d2f433169537..277a883d278dc2d716cb6eff3557ceb1c0e8dd9f 100755 (executable)
@@ -9,6 +9,7 @@
 #include "home_app_manager.h"
 #include "common_conf.h"
 #include "moments/moments_view_conf.h"
+#include "../test/test_function.h"
 
 #include <Elementary.h>
 #include <app.h>
 #define STATUS_CONTENT "status_content"
 #define STATUS_LAYOUT_EDJE "/usr/apps/org.tizen.w-home/res/edje/circle/moments_status_layout.edj"
 
-extern Evas_Object *__t__get_moments_view_base_window(void);
-extern Evas_Object *__t__get_moments_status_grid(void);
-extern Evas_Object *__t__get_moments_status_battery(void);
-extern Evas_Object *__t__get_moments_status_callsignal(void);
-extern Evas_Object *__t__get_moments_status_callsignal(void);
-extern Evas_Object *__t__get_moments_status_network(void);
-extern Evas_Object *__t__get_moments_status_simcard(void);
-extern int __t__get_moments_status_util_icon_index(status_util_icon_type_e type);
-static void __t__moments_status_restore_icons(void);
-extern void __t__moments_restore_status_battery(void);
-extern void __t__moments_restore_status_call_network_service_state(void);
-extern void __t__layout_mouse_down(Evas_Object *layout, int down_x, int down_y);
-extern void __t__layout_mouse_up(Evas_Object *layout, int down_x, int down_y);
-
-static unit_case_func_t __case_check_status_view_layout(void *data);
 static unit_case_func_t __case_check_status_view_battery(void *data);
 static unit_case_func_t __case_check_status_view_callsignal(void *data);
 static unit_case_func_t __case_check_status_view_network(void *data);
 static unit_case_func_t __case_check_status_view_simcard(void *data);
 
+static void __status_restore_icons(void);
+
 static struct {
-       int current_step;
-       Ecore_Timer * group_timer;
        unit_group_t * group;
-       int current_case;
-       void(*case_pool[TEST_CASE_MAX + 1])(bool * is_passed);
 } s_info = {
-       .current_step = 0,
-       .group_timer = NULL,
        .group = NULL,
-       .current_case = 0,
-       .case_pool = {
-                                       NULL,
-                               },
 };
 
-static int __t_status_util_icon_position[STATUS_UTIL_ICON_MAX_COUNT + 1][2] = {
+static int __t_status_icon_position[STATUS_ICON_MAX_COUNT + 1][2] = {
        { 135, 7 }, { 104, 18 }, { 201, 7 }, { 232, 18 }, { 74, 36 }, { 262, 36 }, { 45, 59 }, { 291, 59 }
 };
 
-static char *__t__callsignal_type[13] = {
+static char *__callsignal_type[13] = {
        "default",
        "call_signal_00",
        "call_signal_01",
@@ -71,7 +49,7 @@ static char *__t__callsignal_type[13] = {
        "flight_mode"
 };
 
-static char *__t__network_type[19] = {
+static char *__network_type[19] = {
        "hide",
        "no_service",
        "emergency",
@@ -93,19 +71,22 @@ static char *__t__network_type[19] = {
        "state_inout_connected"
 };
 
-static void __set_up(void)
+static void __group_set_up(void)
 {
-       s_info.group->set_up_complete(s_info.group);
-}
+       if (moments_get_visible() == false) {
+               main_s * info = main_get_info();
 
-static void __tear_down(void)
-{
-       s_info.group->tear_down_complete(s_info.group);
+               __t__layout_mouse_down(info->layout, 180, 50);
+
+               TEST_GROUP_SET_UP_DONE(0.6, s_info.group);
+       }
+
+       TEST_GROUP_SET_UP_DONE(0.0, s_info.group);
 }
 
-static void __group_tear_down(void *data)
+static void __group_tear_down(void)
 {
-       __t__moments_status_restore_icons();
+       __status_restore_icons();
 
        if (moments_get_visible()) {
                main_s * info = main_get_info();
@@ -117,35 +98,14 @@ static void __group_tear_down(void *data)
        TEST_GROUP_TEAR_DOWN_DONE(0.1, s_info.group);
 }
 
-static unit_case_func_t __case_check_status_view_layout(void *data)
+static void __set_up(void)
 {
-       if (moments_get_visible()) {
-               TEST_CASE_CONTINUE(0.1, __case_check_status_view_layout, NULL);
-       }
-
-       Evas_Object *layout = moments_status_view_get_layout();
-       TEST_ASSERT_TRUE_UPGRADE(layout != NULL);
-       const char *status_layout_file = NULL;
-       elm_layout_file_get(layout, &status_layout_file, NULL);
-       TEST_ASSERT_EQUAL_STRING_UPGRADE(STATUS_LAYOUT_EDJE, status_layout_file);
-       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(layout) == false);
-       int x, y, w, h;
-       evas_object_geometry_get(layout, &x, &y, &w, &h);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_X, x);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_Y, y);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
-
-       Evas_Object *grid = __t__get_moments_status_grid();
-       TEST_ASSERT_TRUE_UPGRADE(grid != NULL);
-       TEST_ASSERT_TRUE_UPGRADE(elm_object_part_content_get(layout, STATUS_CONTENT) != NULL);
-       evas_object_geometry_get(grid, &x, &y, &w, &h);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_X, x);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_Y, y);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(WINDOW_W, w);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_INIT_H, h);
+       s_info.group->set_up_complete(s_info.group);
+}
 
-       TEST_CASE_DONE(s_info.group);
+static void __tear_down(void)
+{
+       s_info.group->tear_down_complete(s_info.group);
 }
 
 static char battery_text[5] = { 0, };
@@ -162,23 +122,14 @@ static unit_case_func_t __case_check_status_view_battery(void *data)
        Evas_Object *battery = __t__get_moments_status_battery();
        TEST_ASSERT_TRUE_UPGRADE(battery != NULL);
        TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(battery));
+
        int x, y, w, h;
        evas_object_geometry_get(battery, &x, &y, &w, &h);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_X + MOMENTS_STATUS_BATTERY_ICON_X, x);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(OUTSIDE_Y + MOMENTS_STATUS_BATTERY_ICON_Y, y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_X, x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_Y, y);
        TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_W, w);
        TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_BATTERY_ICON_H, h);
 
-       main_s *info = main_get_info();
-       TEST_ASSERT_TRUE_UPGRADE(info != NULL);
-       TEST_ASSERT_TRUE_UPGRADE(info->layout != NULL);
-
-       Evas_Object *layout = moments_status_view_get_layout();
-       TEST_ASSERT_TRUE_UPGRADE(layout != NULL);
-
-       __t__layout_mouse_down(info->layout, 180, 50);
-       TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(layout) == true);
-
        static int percent = 0;
        __set_battery_percent(percent);
        moments_status_battery_update(0, 0, percent % 2);
@@ -190,7 +141,7 @@ static unit_case_func_t __continue_check_status_battery_icon_change(void *data)
        double val = 0.0;
        int percent = *(int *)data;
 
-       Evas_Object *layout = moments_status_view_get_layout();
+       Evas_Object *layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE_UPGRADE(layout != NULL);
 
        Evas_Object *battery = __t__get_moments_status_battery();
@@ -228,7 +179,7 @@ static unit_case_func_t __case_check_status_view_callsignal(void *data)
        Evas_Object *callsignal = __t__get_moments_status_callsignal();
        if (!callsignal) {
                moments_status_callsignal_icon_show();
-               moments_status_update_util_icon_list();
+               moments_status_update_view();
                call_is_for_test = true;
                TEST_CASE_CONTINUE(0.1, __case_check_status_view_callsignal, NULL);
        }
@@ -239,8 +190,8 @@ static unit_case_func_t __case_check_status_view_callsignal(void *data)
        evas_object_geometry_get(callsignal, &x, &y, &w, &h);
        TEST_ASSERT_EQUAL_INT_UPGRADE(135, x);
        TEST_ASSERT_EQUAL_INT_UPGRADE(7, y);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_W, w);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_H, h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_H, h);
 
        moments_status_callsignal_update(call_strength, is_roaming);
 
@@ -254,7 +205,7 @@ static unit_case_func_t __continue_check_status_callsignal_icon_change(void *dat
        Evas_Object *callsignal = __t__get_moments_status_callsignal();
        TEST_ASSERT_TRUE_UPGRADE(callsignal != NULL);
 
-       TEST_ASSERT_EQUAL_STRING_UPGRADE(__t__callsignal_type[call_signal_index], edje_object_part_state_get(elm_layout_edje_get(callsignal), "icon_image", &val));
+       TEST_ASSERT_EQUAL_STRING_UPGRADE(__callsignal_type[call_signal_index], edje_object_part_state_get(elm_layout_edje_get(callsignal), "icon_image", &val));
 
        if (strength == 5 && !is_roaming) {
                TEST_CASE_DONE(s_info.group);
@@ -294,7 +245,7 @@ static unit_case_func_t __case_check_status_view_network(void *data)
        Evas_Object *network = __t__get_moments_status_network();
        if (!network) {
                moments_status_network_icon_show();
-               moments_status_update_util_icon_list();
+               moments_status_update_view();
                network_is_for_test = true;
                TEST_CASE_CONTINUE(0.1, __case_check_status_view_network, NULL);
        }
@@ -305,8 +256,8 @@ static unit_case_func_t __case_check_status_view_network(void *data)
        evas_object_geometry_get(network, &x, &y, &w, &h);
        TEST_ASSERT_EQUAL_INT_UPGRADE(104, x);
        TEST_ASSERT_EQUAL_INT_UPGRADE(18, y);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_W, w);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_H, h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_H, h);
 
        moments_status_network_update(network_state.network_type, network_state.packet_type);
        network_state.packet_type += 1;
@@ -322,8 +273,8 @@ static unit_case_func_t __continue_check_status_network_icon_change(void *data)
        Evas_Object *network = __t__get_moments_status_network();
        TEST_ASSERT_TRUE_UPGRADE(network != NULL);
 
-       TEST_ASSERT_EQUAL_STRING_UPGRADE(__t__network_type[network_state->network_type], edje_object_part_state_get(elm_layout_edje_get(network), "type_icon_image", &val));
-       TEST_ASSERT_EQUAL_STRING_UPGRADE(__t__network_type[network_state->packet_type], edje_object_part_state_get(elm_layout_edje_get(network), "inout_icon_image", &val));
+       TEST_ASSERT_EQUAL_STRING_UPGRADE(__network_type[network_state->network_type], edje_object_part_state_get(elm_layout_edje_get(network), "type_icon_image", &val));
+       TEST_ASSERT_EQUAL_STRING_UPGRADE(__network_type[network_state->packet_type], edje_object_part_state_get(elm_layout_edje_get(network), "inout_icon_image", &val));
 
        if (network_state->network_type == 14 && network_state->packet_type == 18) {
                TEST_CASE_DONE(s_info.group);
@@ -351,25 +302,25 @@ static unit_case_func_t __case_check_status_view_simcard(void *data)
        Evas_Object *simcard = __t__get_moments_status_simcard();
        if (!simcard) {
                moments_status_simcard_icon_show();
-               moments_status_update_util_icon_list();
+               moments_status_update_view();
                simcard_is_for_test = true;
                TEST_CASE_CONTINUE(0.6, __case_check_status_view_simcard, NULL);
        }
 
        TEST_ASSERT_TRUE_UPGRADE(evas_object_visible_get(simcard));
 
-       int index = __t__get_moments_status_util_icon_index(STATUS_UTIL_ICON_NO_SIM);
+       int index = __t__get_moments_status_icon_index(STATUS_ICON_NO_SIM);
        TEST_ASSERT_TRUE_UPGRADE(index >= 0);
 
        int x, y, w, h;
        evas_object_geometry_get(simcard, &x, &y, &w, &h);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(__t_status_util_icon_position[index][0], x);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(__t_status_util_icon_position[index][1], y);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_W, w);
-       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_UTIL_ICON_H, h);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(__t_status_icon_position[index][0], x);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(__t_status_icon_position[index][1], y);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_W, w);
+       TEST_ASSERT_EQUAL_INT_UPGRADE(MOMENTS_STATUS_ICON_H, h);
 
        moments_status_simcard_icon_hide();
-       moments_status_update_util_icon_list();
+       moments_status_update_view();
 
        TEST_CASE_CONTINUE(0.6, __continue_check_status_simcard_icon_change, simcard);
 }
@@ -388,7 +339,7 @@ void group_feature_moments_status_view_ui(unit_group_t * group)
        s_info.group->set_up = __set_up;
        s_info.group->tear_down = __tear_down;
 
-       TEST_CASE_ADD(s_info.group, __case_check_status_view_layout, NULL);
+       TEST_GROUP_SET_UP(s_info.group, __group_set_up);
        TEST_CASE_ADD(s_info.group, __case_check_status_view_battery, NULL);
        TEST_CASE_ADD(s_info.group, __case_check_status_view_callsignal, NULL);
        TEST_CASE_ADD(s_info.group, __case_check_status_view_network, NULL);
@@ -398,7 +349,7 @@ void group_feature_moments_status_view_ui(unit_group_t * group)
        TEST_GROUP_RUN(s_info.group);
 }
 
-static void __t__moments_status_restore_icons(void)
+static void __status_restore_icons(void)
 {
        if (call_is_for_test) {
                moments_status_callsignal_icon_hide();
index 52db4baf0e7ead44a7fa5fddee5d8da432c43538..049e4cba29a8c0431df12fea31b5e4050f147c18 100755 (executable)
@@ -80,7 +80,7 @@ static void __case_touch_down_top(bool * is_passed)
 
        TEST_ASSERT_TRUE(moments_get_visible());
 
-       Evas_Object * layout = moments_status_view_get_layout();
+       Evas_Object * layout = __t__get_moments_status_layout();
 
        TEST_ASSERT_TRUE(layout != NULL);
        TEST_ASSERT_TRUE(evas_object_visible_get(layout) == EINA_TRUE);
index 6541feea2b54d532b44ed86f199b941eac5e8c00..100aebfabe4f9164c23b5531f347479ef786c3f6 100755 (executable)
@@ -59,7 +59,7 @@ static void __case_touch_down_top(bool * is_passed)
 
        TEST_ASSERT_TRUE(moments_get_visible());
 
-       Evas_Object * layout = moments_status_view_get_layout();
+       Evas_Object * layout = __t__get_moments_status_layout();
 
        TEST_ASSERT_TRUE(layout != NULL);
        TEST_ASSERT_TRUE(evas_object_visible_get(layout) == EINA_TRUE);
@@ -86,7 +86,7 @@ static void __case_touch_up(bool * is_passed)
 
 static void __case_check_status_layout_state_show(bool * is_passed)
 {
-       Evas_Object * layout = moments_status_view_get_layout();
+       Evas_Object * layout = __t__get_moments_status_layout();
        TEST_ASSERT_TRUE(layout != NULL);
        TEST_ASSERT_TRUE(evas_object_visible_get(layout) == EINA_TRUE);
 
@@ -103,7 +103,7 @@ static void __case_check_status_layout_state_show(bool * is_passed)
 
 static void __case_check_icon_state_show(bool * is_passed)
 {
-       Evas_Object * layout = moments_status_view_get_layout();
+       Evas_Object * layout = __t__get_moments_status_layout();
 
        TEST_ASSERT_TRUE(layout != NULL);
        TEST_ASSERT_TRUE(evas_object_visible_get(layout) == EINA_TRUE);
index 6ee5ffd8105e7fcf4513a2ab17a476936fdaabc5..53f718f42e10c6f9e8ffc2d0e7d3b518a88c300c 100755 (executable)
@@ -8,8 +8,6 @@
 #include <app.h>
 #include <Evas.h>
 
-
-extern Evas_Object * __t__get_moments_status_view_layout(void);
 extern Evas_Object * __t__get_moments_view_layout(void);
 extern Evas_Object * __t__get_moments_center_layout(void);
 extern Evas_Object * __t__get_moments_size_setter(void);
@@ -40,6 +38,17 @@ extern void __t__moments_get_network_strength_and_packet_type(int *network_type,
 
 extern void __t__pull_down_complete_cb(void);
 
+extern Evas_Object *__t__get_moments_status_layout(void);
+extern Evas_Object *__t__get_moments_status_grid(void);
+extern Evas_Object *__t__get_moments_status_battery(void);
+extern Evas_Object *__t__get_moments_status_callsignal(void);
+extern Evas_Object *__t__get_moments_status_network(void);
+extern Evas_Object *__t__get_moments_status_simcard(void);
+extern void __t__moments_restore_status_battery(void);
+extern void __t__moments_restore_status_call_network_service_state(void);
+extern void __t__moments_manager_update_status_view(int is_flight, int service_state, int wifi_state);
+extern int __t__get_moments_status_icon_index(int type);
+
 #endif
 #endif