projects
/
apps
/
native
/
ug-mobile-ap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI issues are fixed
[apps/native/ug-mobile-ap.git]
/
include
/
mobile_hotspot.h
diff --git
a/include/mobile_hotspot.h
b/include/mobile_hotspot.h
index
e08e8b7
..
3fac392
100644
(file)
--- a/
include/mobile_hotspot.h
+++ b/
include/mobile_hotspot.h
@@
-33,7
+33,7
@@
extern "C" {
#endif
#if !defined(EDJDIR)
#endif
#if !defined(EDJDIR)
-#define EDJDIR "/usr/ug/res/edje/ug-
mobile-ap
"
+#define EDJDIR "/usr/ug/res/edje/ug-
setting-mobile-ap-ug
"
#endif
#if !defined(PREFIX)
#endif
#if !defined(PREFIX)
@@
-80,18
+80,15
@@
extern "C" {
#define __MOBILE_AP_FUNC_ENTER__ DBG("Entering: +\n")
#define __MOBILE_AP_FUNC_EXIT__ DBG("Exit: -\n")
#define __MOBILE_AP_FUNC_ENTER__ DBG("Entering: +\n")
#define __MOBILE_AP_FUNC_EXIT__ DBG("Exit: -\n")
-#define MOBILE_AP_IMG_DIR PREFIX"/res/images/ug-mobile-ap"
-
-#define MH_DEFAULT_PASSWORD "qwertyuiop"
+#define TETHERING_IMAGES_EDJ "tethering_images.edj"
+#define WIFI_ICON "Wifi.png"
+#define BT_ICON "Bluetooth.png"
+#define USB_ICON "USB.png"
#define DEVICE_NAME_LENGTH_MAX 31
#define WIFI_PASSPHRASE_LENGTH_MIN 8
#define WIFI_PASSPHRASE_LENGTH_MAX 63
#define MH_LABEL_LENGTH_MAX 1024
#define DEVICE_NAME_LENGTH_MAX 31
#define WIFI_PASSPHRASE_LENGTH_MIN 8
#define WIFI_PASSPHRASE_LENGTH_MAX 63
#define MH_LABEL_LENGTH_MAX 1024
-#define FONT_SIZE_20 20
-#define FONT_SIZE_25 25
-#define FONT_SIZE_30 30
-#define FONT_SIZE_32 32
#define _EDJ(obj) elm_layout_edje_get(obj)
#define _EDJ(obj) elm_layout_edje_get(obj)
@@
-105,12
+102,14
@@
typedef enum {
/* Two buttons pop-up */
MH_POP_WIFI_OFF_CONF,
MH_POP_WIFI_ON_CONF,
/* Two buttons pop-up */
MH_POP_WIFI_OFF_CONF,
MH_POP_WIFI_ON_CONF,
+ MH_POP_BT_ON_CONF,
MH_POP_USB_ON_CONF,
MH_POP_USB_ON_CONF,
+ MH_POP_USB_ON_PREVCONN_CONF,
+ MH_POP_ENTER_TO_WIFI_SETUP_CONF,
/* One button pop-up */
MH_POP_INFORMATION,
MH_POP_USB_CONNECT,
/* One button pop-up */
MH_POP_INFORMATION,
MH_POP_USB_CONNECT,
- MH_POP_WIFI_PASSWORD_SHORT,
/* No button & timeout pop-up */
MH_POP_INFORMATION_WO_BUTTON,
/* No button & timeout pop-up */
MH_POP_INFORMATION_WO_BUTTON,
@@
-125,7
+124,6
@@
typedef enum {
} mh_state_e;
typedef struct ap_app_main {
} mh_state_e;
typedef struct ap_app_main {
- Evas_Object *conform;
Evas_Object *genlist;
Evas_Object *back_btn;
Evas_Object *genlist;
Evas_Object *back_btn;
@@
-137,7
+135,6
@@
typedef struct ap_app_main {
Elm_Genlist_Item_Class *end_sp_itc;
Elm_Genlist_Item_Class *wifi_itc;
Elm_Genlist_Item_Class *setup_itc;
Elm_Genlist_Item_Class *end_sp_itc;
Elm_Genlist_Item_Class *wifi_itc;
Elm_Genlist_Item_Class *setup_itc;
- Elm_Genlist_Item_Class *setup_help_itc;
Elm_Genlist_Item_Class *bt_itc;
Elm_Genlist_Item_Class *usb_itc;
Elm_Genlist_Item_Class *help_itc;
Elm_Genlist_Item_Class *bt_itc;
Elm_Genlist_Item_Class *usb_itc;
Elm_Genlist_Item_Class *help_itc;
@@
-147,9
+144,9
@@
typedef struct ap_app_main {
Elm_Genlist_Item_Class *usage_itc;
Elm_Genlist_Item_Class *dev_itc[TETHERING_TYPE_MAX];
Elm_Genlist_Item_Class *usage_itc;
Elm_Genlist_Item_Class *dev_itc[TETHERING_TYPE_MAX];
+ Elm_Object_Item *sp_item[4];
Elm_Object_Item *wifi_item;
Elm_Object_Item *setup_item;
Elm_Object_Item *wifi_item;
Elm_Object_Item *setup_item;
- Elm_Object_Item *setup_help_item;
Elm_Object_Item *bt_item;
Elm_Object_Item *usb_item;
Elm_Object_Item *device_item;
Elm_Object_Item *bt_item;
Elm_Object_Item *usb_item;
Elm_Object_Item *device_item;
@@
-158,17
+155,19
@@
typedef struct ap_app_main {
int hotspot_mode;
int wifi_state;
int hotspot_mode;
int wifi_state;
+ int bt_state;
int usb_state;
int usb_state;
+ bool need_recover_wifi_tethering;
} mh_main_view_t;
typedef struct {
} mh_main_view_t;
typedef struct {
- E
vas_Object *conform
;
+ E
lm_Object_Item *navi_it
;
Evas_Object *genlist;
Evas_Object *back_btn;
Evas_Object *genlist;
Evas_Object *back_btn;
+ Evas_Object *title_back_btn;
Evas_Object *hide_btn;
Evas_Object *security_btn;
Evas_Object *hide_btn;
Evas_Object *security_btn;
- Evas_Object *pw_layout;
Evas_Object *pw_entry;
Elm_Genlist_Item_Class *sp_itc;
Evas_Object *pw_entry;
Elm_Genlist_Item_Class *sp_itc;
@@
-178,6
+177,7
@@
typedef struct {
Elm_Genlist_Item_Class *pw_itc;
Elm_Genlist_Item_Class *name_itc;
Elm_Genlist_Item_Class *pw_itc;
Elm_Genlist_Item_Class *name_itc;
+ Elm_Object_Item *sp_item[2];
Elm_Object_Item *hide_item;
Elm_Object_Item *security_item;
Elm_Object_Item *pw_item;
Elm_Object_Item *hide_item;
Elm_Object_Item *security_item;
Elm_Object_Item *pw_item;
@@
-188,6
+188,7
@@
typedef struct {
char device_name[DEVICE_NAME_LENGTH_MAX + 1];
char wifi_passphrase[WIFI_PASSPHRASE_LENGTH_MAX + 1];
char device_name[DEVICE_NAME_LENGTH_MAX + 1];
char wifi_passphrase[WIFI_PASSPHRASE_LENGTH_MAX + 1];
+ char wifi_passphrase_new[WIFI_PASSPHRASE_LENGTH_MAX + 1];
} mh_wifi_setting_view_t;
typedef struct {
} mh_wifi_setting_view_t;
typedef struct {
@@
-207,6
+208,9
@@
typedef struct {
connection_h conn_handle;
Evas_Object *win;
connection_h conn_handle;
Evas_Object *win;
+ Evas_Object *layout;
+ Evas_Object *bg;
+
Evas_Object *naviframe;
Evas_Object *popup;
Evas_Object *naviframe;
Evas_Object *popup;
@@
-218,12
+222,11
@@
typedef struct {
mh_data_usage_t data_statistics;
mh_clients_t clients;
mh_data_usage_t data_statistics;
mh_clients_t clients;
-
int popup_typ
e;
-
char popup_string[MH_LABEL_LENGTH_MAX]
;
+
enum ug_event rotate_stat
e;
+
Ecore_IMF_Input_Panel_State imf_state
;
} mh_appdata_t;
typedef struct {
} mh_appdata_t;
typedef struct {
- Evas_Object *base;
mh_appdata_t *ad;
ui_gadget_h ug;
} mh_ugdata_t;
mh_appdata_t *ad;
ui_gadget_h ug;
} mh_ugdata_t;