[TSAM-5643] Refactoring structure for NFC viewsubmit/tizen/20160628.234119accepted/tizen/wearable/20160629.021639accepted/tizen/mobile/20160629.021656accepted/tizen/common/20160629.222749

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I4cb01af41978c6e32062c024b306a8316cbd8160

4 files changed, 27 insertions, 40 deletions

diff --git a/wearable/app/include/nsa-main.h b/wearable/app/include/nsa-main.h
index ed13912..f1b70ae 100755
--- a/wearable/app/include/nsa-main.h
+++ b/wearable/app/include/nsa-main.h
@@ -43,42 +43,36 @@ extern "C"
 #define TABLE_PATH	TABLEDIR
 #define EDJ_FILE	EDJDIR"/"APPNAME".edj"
 
-typedef enum {
-	NSA_ERROR = -1,
-	NSA_OK = 0
-} nsa_result_e;
+enum {
+	V_MAIN = 0,
+	V_TAP_N_PAY
+};
 
-typedef enum {
-	NSA_OP_NONE = -1,
-	NSA_OP_NFC = 0,
-	NSA_OP_NFC_HELP = 1,
-	NSA_OP_SBEAM = 2,
-	NSA_OP_SBEAM_HELP = 3,
-	NSA_OP_TAP_N_PAY = 4
-} nsa_operation_type;
+typedef struct {
+	char *appid;
+	int aid_count;
+} wallet_info_t;
 
-struct appdata {
-	Evas_Object *win_main;
-	Evas_Object *ly_main;
-	Evas_Object *bg;
+typedef struct {
+	Evas_Object *main_win;
+	Evas_Object *main_layout;
+	Evas_Object *main_bg;
 	Evas_Object *conform;
 	Eext_Circle_Surface *circle_surface;
-	Evas_Object *navi_frame;
-	Evas_Object *popup;
-	Elm_Object_Item *base_navi_it;
-	GArray *circle_obj_list;
-	int circle_obj_list_idx;
-
-	nsa_operation_type op_type;
 
-	/* changeable UI */
-	Eina_List *color_table;
-	Eina_List *font_table;
+	Evas_Object *popup;
+	Evas_Object *navi_frame;
+	int current_view;
 
-	app_control_h caller_appctrl;
-};
+	char *payment_handler;
+	Elm_Object_Item *on_off;
+	Elm_Object_Item *tap_n_pay;
+	Evas_Object *main_genlist;
 
-inline Evas_Object *nsa_get_main_window(void);
+	int payment_wallet_cnt;
+	GArray *payment_wallet_list;
+	Evas_Object *radio_main;
+} appdata;
 
 #ifdef __cplusplus
 }
diff --git a/wearable/app/include/nsa-string.h b/wearable/app/include/nsa-string.h
index 479959a..3db18df 100755
--- a/wearable/app/include/nsa-string.h
+++ b/wearable/app/include/nsa-string.h
@@ -30,8 +30,6 @@ extern "C"
 #define POPUP_TEXT_SIZE	1024
 #define LABEL_TEXT_SIZE	1024
 
-#define _(s)   gettext(s)
-
 /////////////////////////////////////////////////////////////////////////////
 // NFC SETTING START ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 /////////////////////////////////////////////////////////////////////////////
diff --git a/wearable/app/include/nsa-ui-widget.h b/wearable/app/include/nsa-ui-widget.h
index 14761d0..47e0154 100644..100755
--- a/wearable/app/include/nsa-ui-widget.h
+++ b/wearable/app/include/nsa-ui-widget.h
@@ -30,13 +30,11 @@ extern "C"
 #endif /* __cplusplus */
 
 /************************** API **************************/
+Evas_Object* nsa_create_main_win(const char *name);
 Evas_Object *nsa_create_main_layout(Evas_Object *parent);
-Evas_Object *nsa_create_theme_layout(Evas_Object *parent,
-	const char *clas, const char *group, const char *style);
 Evas_Object *nsa_create_bg(Evas_Object *parent);
 Evas_Object* nsa_create_conformant(Evas_Object *parent);
-Evas_Object* nsa_create_edj_layout(Evas_Object* parent,
-	char *edc_path);
+Evas_Object* nsa_create_edj_layout(Evas_Object* parent, char *edc_path);
 
 #ifdef __cplusplus
 }
diff --git a/wearable/app/include/nsa-view.h b/wearable/app/include/nsa-view.h
index 410e0a0..2e2069f 100755
--- a/wearable/app/include/nsa-view.h
+++ b/wearable/app/include/nsa-view.h
@@ -31,11 +31,8 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-int _nsa_view_main_create(void *data);
-void _nsa_view_main_destroy(void *data);
-
-int _nsa_view_tap_n_pay_create(void *data);
-void _nsa_view_tap_n_pay_destroy(void *data);
+bool _nsa_view_main_create(void *data);
+bool _nsa_view_tap_n_pay_create(void *data);
 
 #ifdef __cplusplus
 }