From: Yu Date: Mon, 11 Jan 2021 21:52:48 +0000 (+0900) Subject: Fix jira issue TIZENIOT-2336 X-Git-Tag: accepted/tizen/unified/20210120.120839^0 X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fug-wifi-direct.git;a=commitdiff_plain;h=5d454b5d8ab0cfd80dcb3dc701566e69c978fb03 Fix jira issue TIZENIOT-2336 Description: Observe the button size, looks bigger comparing all other buttons Buttons should be resized according to the GUI guide Change-Id: I86ad63d664534a39dab9988cc885ca19d029d767 Signed-off-by: Yu jiung --- diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec index 9aeea3a..32588df 100644 --- a/packaging/ug-setting-wifidirect-efl.spec +++ b/packaging/ug-setting-wifidirect-efl.spec @@ -1,6 +1,6 @@ Name: ug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.12.0 +Version: 1.12.1 Release: 1 Group: Applications/Network License: Flora-1.1 diff --git a/ug-wifidirect/CMakeLists.txt b/ug-wifidirect/CMakeLists.txt index 2f0a5cf..f7eca8d 100644 --- a/ug-wifidirect/CMakeLists.txt +++ b/ug-wifidirect/CMakeLists.txt @@ -43,10 +43,20 @@ ADD_CUSTOM_TARGET(wfd_ug.edj ${CMAKE_CURRENT_SOURCE_DIR}/resources/wfd_ug.edc ${CMAKE_BINARY_DIR}/wfd_ug.edj DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources/wfd_ug.edc ) + +ADD_CUSTOM_TARGET(main_layout.edj + COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/resources/images + ${CMAKE_CURRENT_SOURCE_DIR}/resources/main_layout.edc ${CMAKE_BINARY_DIR}/main_layout.edj + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources/main_layout.edc +) + ADD_DEPENDENCIES(${PROJECT_NAME} wfd_ug.edj) +ADD_DEPENDENCIES(${PROJECT_NAME} main_layout.edj) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/wfd_ug.edj DESTINATION ${EDJDIR}) +INSTALL(FILES ${CMAKE_BINARY_DIR}/main_layout.edj DESTINATION ${EDJDIR}) + INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION /usr/share/packages) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png") diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h index 8610de2..b29831e 100644 --- a/ug-wifidirect/include/wfd_ug_view.h +++ b/ug-wifidirect/include/wfd_ug_view.h @@ -24,6 +24,7 @@ #define EDJDIR "/usr/apps/ug-setting-wifidirect-efl/res/edje/ug-setting-wifidirect-efl" #define WFD_UG_EDJ_PATH EDJDIR"/wfd_ug.edj" +#define WFD_UG_COMMON_MAIN_LAYOUT_EDJ_PATH EDJDIR"/main_layout.edj" /* Genlist new style for Tizen 2.4 */ #define WFD_GENLIST_1LINE_TEXT_STYLE "type1" @@ -62,6 +63,21 @@ #define WFD_UG_EDJ_ICON_SIZE 40 +gboolean wfd_ug_util_is_profile_common(void); + +enum { + WFD_UG_BIG_BUTTON, + WFD_UG_PREV_BUTTON, + WFD_UG_NEXT_BUTTON, +}; + +#define WFD_UG_BIG_BUTTON_EDC_PART \ + (wfd_ug_util_is_profile_common() ? "button_common.big" : "button.big") +#define WFD_UG_PREV_BUTTON_EDC_PART \ + (wfd_ug_util_is_profile_common() ? "button_common.prev" : "button.prev") +#define WFD_UG_NEXT_BUTTON_EDC_PART \ + (wfd_ug_util_is_profile_common() ? "button_common.next" : "button.next") + enum { HEAD_TEXT_TYPE_DIRECT, HEAD_TEXT_TYPE_DEACTIVATING, diff --git a/ug-wifidirect/resources/main_layout.edc b/ug-wifidirect/resources/main_layout.edc new file mode 100644 index 0000000..66854d8 --- /dev/null +++ b/ug-wifidirect/resources/main_layout.edc @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + +#define PADDING_SIZE 40 +#define PADDING_BOTTOM_SIZE 30 + +collections +{ + base_scale: 1.8; + + group { "main_layout"; + parts { + rect { "base"; + desc { "default"; + color: 238 239 241 255; + } + } + spacer { "padding.left"; scale; + desc { "default"; + min: PADDING_SIZE 0; + max: PADDING_SIZE -1; + fixed: 1 0; + align: 0.0 0.0; + rel.to: "base"; + } + } + spacer { "padding.right"; scale; + desc { "default"; + min: PADDING_SIZE 0; + max: PADDING_SIZE -1; + fixed: 1 0; + align: 1.0 0.0; + rel.to: "base"; + } + } + swallow { "elm.swallow.content"; + desc { "default"; + rel1 { relative: 1.0 0.0; to: "padding.left"; } + rel2 { relative: 0.0 0.0; + to_x: "padding.right"; + to_y: "padding.bottom"; + } + } + } + spacer { "padding.bottom"; scale; + desc { "default"; + min: 0 PADDING_BOTTOM_SIZE; + max: -1 PADDING_BOTTOM_SIZE; + fixed: 0 1; + align: 0.0 1.0; + rel.to: "base"; + } + } + } + } +} \ No newline at end of file diff --git a/ug-wifidirect/resources/wfd_ug.edc b/ug-wifidirect/resources/wfd_ug.edc index 068813e..833814b 100644 --- a/ug-wifidirect/resources/wfd_ug.edc +++ b/ug-wifidirect/resources/wfd_ug.edc @@ -3,6 +3,7 @@ #define TITLE_P_H 65 #define TITLE_L_H 30 #define TOOLBAR_H 154 +#define COMMON_TOOLBAR_H 77 #define POPUP_WITH_2_GL_ITEMS 200 #define RESOURCE_IMAGE( FILE_NAME ) \ @@ -340,6 +341,72 @@ collections { inherit: "default" 0.0; } } + part { + name: "button_common.big"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: 0 74; + max: -1 COMMON_TOOLBAR_H; + fixed: 0 0; + rel1 { + relative: 0.0 1.0; + offset: 21 -COMMON_TOOLBAR_H; + } + rel2 { + relative: 1.0 1.0; + offset: -21 0; + } + } + description { state: "horizontal" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "button_common.prev"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: 0 74; + max: -1 TOOLBAR_H; + fixed: 0 0; + rel1 { + relative: 0.2 1.0; + offset: 21 -COMMON_TOOLBAR_H; + } + rel2 { + relative: 0.4 1.0; + offset: -6 0; + } + } + description { state: "horizontal" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "button_common.next"; + type: SWALLOW; + scale: 1; + description { + state: "default" 0.0; + min: 0 74; + max: -1 TOOLBAR_H; + fixed: 0 0; + rel1 { + relative: 0.6 1.0; + offset: 6 -COMMON_TOOLBAR_H; + } + rel2 { + relative: 0.8 1.0; + offset: -21 0; + } + } + description { state: "horizontal" 0.0; + inherit: "default" 0.0; + } + } part { name: "elm.swallow.content"; type: SWALLOW; scale: 1; diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c index e2d4068..3a25c38 100644 --- a/ug-wifidirect/src/wfd_client.c +++ b/ug-wifidirect/src/wfd_client.c @@ -456,10 +456,10 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi */ if (ugd->disconnect_btn) { Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); ugd->disconnect_btn = NULL; - elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, ugd->scan_toolbar); } /* When connect is on ongoing and deactivte happened refresh scan */ @@ -911,7 +911,7 @@ void discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state, ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) { WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item); if (!ugd->conn_wfd_item) - elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, ugd->scan_toolbar); wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK_STOP", TRUE); if (ugd->multiconn_scan_stop_btn) @@ -1050,9 +1050,9 @@ void _connection_cb(int error_code, wifi_direct_connection_state_e connection_st WFD_IF_DEL_OBJ(ugd->act_popup); Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); - content = elm_object_part_content_unset(ugd->button_layout, "button.prev"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_PREV_BUTTON_EDC_PART); evas_object_hide(content); /* when disconnection, clear all the connected peers */ diff --git a/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c index 4db9230..cd21c29 100644 --- a/ug-wifidirect/src/wfd_ug.c +++ b/ug-wifidirect/src/wfd_ug.c @@ -181,9 +181,16 @@ static Evas_Object *_create_fullview(Evas_Object *parent, struct ug_data *ugd) return NULL; } - elm_layout_theme_set(base, "layout", "application", "default"); - evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL); + if (wfd_ug_util_is_profile_common()) { + elm_layout_file_set(base, WFD_UG_COMMON_MAIN_LAYOUT_EDJ_PATH, "main_layout"); + } else { + elm_layout_theme_set(base, "layout", "application", "default"); + + ugd->bg = _create_bg(ugd->win, "group_list"); + elm_object_part_content_set(ugd->base, "elm.swallow.bg", ugd->bg); + evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL); + } __FUNC_EXIT__; return base; @@ -398,8 +405,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, app_control_h control, if (ugd->base) { evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_DEL, wfd_ug_layout_del_cb, ugd); - ugd->bg = _create_bg(ugd->win, "group_list"); - elm_object_part_content_set(ugd->base, "elm.swallow.bg", ugd->bg); } else { DBG(LOG_ERROR, "Failed to create base layout\n"); return NULL; diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c index 517392f..bea85b2 100755 --- a/ug-wifidirect/src/wfd_ug_main_view.c +++ b/ug-wifidirect/src/wfd_ug_main_view.c @@ -31,6 +31,29 @@ #include "wfd_ug_view.h" #include "wfd_client.h" +#include + +#include + +gboolean wfd_ug_util_is_profile_common(void) +{ + gboolean result = FALSE; + char *profile_name = NULL; + + system_info_get_platform_string("http://tizen.org/feature/profile", &profile_name); + if (!profile_name) + return result; + + if (!strncasecmp(profile_name, "common", 6)) { + DBG(LOG_ERROR, "WiFi direct is on common platform\n"); + result = TRUE; + } + + free(profile_name); + + return result; +} + void scan_button_create(struct ug_data *ugd) { __FUNC_ENTER__; @@ -50,7 +73,7 @@ void scan_button_create(struct ug_data *ugd) FALSE); } evas_object_smart_callback_add(btn, "clicked", _scan_btn_cb, (void *)ugd); - elm_layout_content_set(ugd->button_layout, "button.big", btn); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, btn); ugd->scan_toolbar = btn; elm_object_part_content_set(ugd->naviframe, "toolbar", ugd->button_layout); @@ -422,10 +445,10 @@ static void _gl_peer_sel(void *data, Evas_Object *obj, void *event_info) if (ugd->disconnect_btn) { Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); ugd->disconnect_btn = NULL; - elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, ugd->scan_toolbar); } if (item) @@ -1310,10 +1333,10 @@ void wfd_ug_update_toolbar(struct ug_data *ugd) evas_object_smart_callback_add(btn, "clicked", _wfd_ug_cancel_connection_button_cb, (void *)ugd); /* Set button into "toolbar" swallow part */ - elm_object_part_content_set(ugd->button_layout, "button.next", btn); + elm_object_part_content_set(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART, btn); ugd->disconnect_btn = btn; evas_object_show(ugd->disconnect_btn); - elm_object_part_content_set(ugd->button_layout, "button.prev", + elm_object_part_content_set(ugd->button_layout, WFD_UG_PREV_BUTTON_EDC_PART, ugd->scan_toolbar); wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", FALSE); @@ -1337,12 +1360,12 @@ void wfd_ug_update_toolbar(struct ug_data *ugd) evas_object_smart_callback_add(btn, "clicked", _wfd_ug_disconnect_button_cb, (void *)ugd); /* Set button into "toolbar" swallow part */ - elm_object_part_content_set(ugd->button_layout, "button.next", btn); + elm_object_part_content_set(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART, btn); ugd->disconnect_btn = btn; evas_object_show(ugd->disconnect_btn); DBG(LOG_INFO, "button: disconnect button added\n"); } - elm_object_part_content_set(ugd->button_layout, "button.prev", + elm_object_part_content_set(ugd->button_layout, WFD_UG_PREV_BUTTON_EDC_PART, ugd->scan_toolbar); wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", TRUE); @@ -1352,10 +1375,10 @@ void wfd_ug_update_toolbar(struct ug_data *ugd) if (no_of_conn_dev == 0 && ugd->disconnect_btn != NULL) { DBG(LOG_INFO, "disconnect btn removed when conn failed\n"); Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); ugd->disconnect_btn = NULL; - elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, ugd->scan_toolbar); } wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN", TRUE); @@ -1842,11 +1865,11 @@ void _onoff_changed_cb(void *data, Evas_Object *obj, void *event_info) elm_object_disabled_set(ugd->on_off_check, TRUE); if (ugd->disconnect_btn) { Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); ugd->disconnect_btn = NULL; } - elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar); + elm_layout_content_set(ugd->button_layout, WFD_UG_BIG_BUTTON_EDC_PART, ugd->scan_toolbar); /* turn on/off wfd */ if (!ugd->wfd_onoff) { diff --git a/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c index ca3a9ea..2b4585a 100644 --- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c +++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c @@ -976,7 +976,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd) elm_object_domain_translatable_text_set(btn1, PACKAGE, "IDS_WIFI_SK_STOP"); } - elm_object_part_content_set(ugd->multiconn_layout, "button.prev", btn1); + elm_object_part_content_set(ugd->multiconn_layout, WFD_UG_PREV_BUTTON_EDC_PART, btn1); evas_object_smart_callback_add(btn1, "clicked", _multi_scan_btn_cb, (void *)ugd); evas_object_show(btn1); ugd->multiconn_scan_stop_btn = btn1; @@ -985,7 +985,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd) elm_object_style_set(btn2, "bottom"); elm_object_domain_translatable_text_set(btn2, PACKAGE, "IDS_WIFI_SK_CONNECT"); - elm_object_part_content_set(ugd->multiconn_layout, "button.next", btn2); + elm_object_part_content_set(ugd->multiconn_layout, WFD_UG_NEXT_BUTTON_EDC_PART, btn2); evas_object_smart_callback_add(btn2, "clicked", _connect_btn_cb, (void *)ugd); evas_object_show(btn2); ugd->multiconn_conn_btn = btn2; diff --git a/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c index d12786f..be0a70d 100755 --- a/ug-wifidirect/src/wfd_ug_popup.c +++ b/ug-wifidirect/src/wfd_ug_popup.c @@ -312,7 +312,7 @@ gboolean _wfd_disconnect_idle_cb(gpointer user_data) return FALSE; } Evas_Object *content; - content = elm_object_part_content_unset(ugd->button_layout, "button.next"); + content = elm_object_part_content_unset(ugd->button_layout, WFD_UG_NEXT_BUTTON_EDC_PART); WFD_IF_DEL_OBJ(content); wfd_ug_view_init_genlist(ugd, true);