From: Denis Dolzhenko Date: Fri, 17 Jun 2016 08:23:41 +0000 (+0300) Subject: TSAM-4839 Text on thread message list don't change font size X-Git-Tag: submit/tizen/20160617.133130~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e946eb322b0b7ddd1ebc1bc96003d7a39debdb97;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git TSAM-4839 Text on thread message list don't change font size Added: custom thread genlist theme Change-Id: I5c6ad36a838854ecfce090243577495989d8446a Signed-off-by: Denis Dolzhenko --- diff --git a/edje/images/list_ic_user_thumb_masking.png b/edje/images/list_ic_user_thumb_masking.png old mode 100755 new mode 100644 index 6532233..66ae050 Binary files a/edje/images/list_ic_user_thumb_masking.png and b/edje/images/list_ic_user_thumb_masking.png differ diff --git a/inc/Resource.h b/inc/Resource.h index 28aa7f7..630eb1d 100644 --- a/inc/Resource.h +++ b/inc/Resource.h @@ -31,6 +31,7 @@ // Edj: #define IMAGES_EDJ_PATH EDJ_PATH"/images.edj" #define BUTTON_THEME_EDJ_PATH EDJ_PATH"/button_theme.edj" +#define THREAD_THEME_EDJ_PATH EDJ_PATH"/thread_genlist_theme.edj" #define BUBBLE_THEME_EDJ_PATH EDJ_PATH"/bubble_theme.edj" #define MSG_INPUT_PANEL_EDJ_PATH EDJ_PATH"/msg_input_panel.edj" @@ -53,12 +54,11 @@ // Images(res): -#define THUMB_CONTACT_IMG_PATH IMAGE_PATH"/list_ic_contacts.png" -#define THUMB_GROUP_IMG_PATH IMAGE_PATH"/list_ic_group.png" -#define THUMB_CB_IMG_PATH IMAGE_PATH"/list_ic_cb_message.png" -#define THUMB_PUSH_IMG_PATH IMAGE_PATH"/list_ic_push_message.png" -#define THUMB_OTA_IMG_PATH IMAGE_PATH"/list_ic_OTA_message.png" -#define THUMB_USER_MASK_74x74_IMG_PATH IMAGE_PATH"/list_ic_user_thumb_masking.png" +#define THUMB_CONTACT_IMG_PATH IMAGE_PATH"/messages_conversation_thumb_single.png" +#define THUMB_GROUP_IMG_PATH IMAGE_PATH"/messages_conversation_thumb_multi.PNG" +#define THUMB_CB_IMG_PATH IMAGE_PATH"/messages_conversation_thumb_cb.png" +#define THUMB_PUSH_IMG_PATH IMAGE_PATH"/messages_conversation_thumb_push.png" +#define THUMB_OTA_IMG_PATH IMAGE_PATH"/messages_conversation_thumb_OTA.PNG" #define MSG_THREAD_FLOATING_BTN_ICON IMAGE_PATH"/message_floating_button_icon.png" #define TEST_IMG_PATH IMAGE_PATH"/cat.jpeg" diff --git a/project_def.prop b/project_def.prop index 80ee026..c59fba1 100644 --- a/project_def.prop +++ b/project_def.prop @@ -60,7 +60,7 @@ USER_EDCS_FONT_DIRS_ABS = # EDC Flags USER_EXT_EDC_KEYS = EDC0 -USER_EXT_EDC0_EDCS = res/edje/msg_title.edc res/edje/msg_body.edc res/edje/conv_layout.edc res/edje/bubble_theme.edc res/edje/viewer_layout.edc res/edje/msg_thread.edc res/edje/smil_item.edc res/edje/msg_input_panel.edc res/edje/select_all.edc res/edje/recipient_panel.edc res/edje/viewer_player.edc res/edje/conv_list.edc res/edje/viewer_subject_layout.edc res/edje/conv_contact_list_layout.edc res/edje/contact_search.edc res/edje/button_theme.edc res/edje/msg_thumbnail.edc res/edje/images.edc +USER_EXT_EDC0_EDCS = res/edje/msg_title.edc res/edje/msg_body.edc res/edje/conv_layout.edc res/edje/bubble_theme.edc res/edje/viewer_layout.edc res/edje/msg_thread.edc res/edje/smil_item.edc res/edje/msg_input_panel.edc res/edje/select_all.edc res/edje/thread_genlist_theme.edc res/edje/recipient_panel.edc res/edje/viewer_player.edc res/edje/conv_list.edc res/edje/viewer_subject_layout.edc res/edje/conv_contact_list_layout.edc res/edje/contact_search.edc res/edje/button_theme.edc res/edje/msg_thumbnail.edc res/edje/images.edc USER_EXT_EDC0_EDCS_IMAGE_DIRS = edje/images res/images USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = USER_EXT_EDC0_EDCS_SOUND_DIRS = edje/sounds diff --git a/res/edje/thread_genlist_theme.edc b/res/edje/thread_genlist_theme.edc new file mode 100755 index 0000000..e00968b --- /dev/null +++ b/res/edje/thread_genlist_theme.edc @@ -0,0 +1,570 @@ +// Based on: https://review.tizen.org/gerrit/gitweb?p=profile/mobile/platform/core/uifw/efl-theme-tizen-mobile.git +// Change-Id: Ia2b0040915500522d0a5bfc39348d6b046c4d3a3 + +#include "macros.inl" + +#define STYLE_TAGS \ + tag: "br" "\n";\ + tag: "ps" "ps";\ + tag: "tab" "\t";\ + tag: "b" "+ font_weight=Bold"; + +#define STYLE_TAG_MATCH \ + tag: "match" "+ color=#3db8cc"; + +#define GENLIST_ITEM_1LINE_HEIGHT_INC 120 +#define GENLIST_ITEM_2LINE_HEIGHT_INC 144 +#define GENLIST_ITEM_LR_PADDING_INC 32 +#define GENLIST_ITEM_TOP_PADDING_INC 23 +#define GENLIST_ITEM_BOTTOM_PADDING_INC 24 // including bottom line +#define GENLIST_ITEM_TYPE_BA_PADDING_INC 32 +#define GENLIST_ITEM_TYPE_DC_PADDING_INC 32 +#define GENLIST_ITEM_TYPE_AD_PADDING_INC 32 +#define GENLIST_ITEM_MAIN_LINE_HEIGHT_INC 54 +#define GENLIST_ITEM_MAIN_LINE_ICON_TEXT_PADDING_INC 12 +#define GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 32 +#define GENLIST_ITEM_SUB_LINE_HEIGHT_INC 43 +#define GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 32 +#define GENLIST_ITEM_END_TEXT_WIDTH_INC 121 + +//No use to Combination +#define LIST_BOTTOMLINE_HEIGHT 2 + +collections { + BASE_SCALE; + styles { + // ************* list main text ********** // + style { name: "list_text_main"; + base: "color=#737373FF font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_main_dim"; + base: "color=#737373A3 font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0"; + // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024D text_class=T024D ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_main_press"; + base: "color=#737373FF font=Tizen:style=Regular font_size=32 text_class=tizen ellipsis=1.0"; + // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color=#ffffff color_class=T024P text_class=T024P ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_end"; + base: "color=#737373FF font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_end_dim"; + base: "color=#737373A3 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_end_press"; + base: "color=#737373A3 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_sub_end"; + base: "color=#737373FF font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_sub_end_dim"; + base: "color=#737373A3 font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_sub_end_press"; + base: "color=#737373FF font=Tizen:style=Regular font_size=30 text_class=tizen ellipsis=1.0 align=right"; + STYLE_TAGS + STYLE_TAG_MATCH + } + // ************* list sub text ********** // + style { name: "list_text_sub_01"; + base: "color=#070707FF font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0"; + // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023 text_class=T023 ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_sub_01_dim"; + base: "color=#0707077F font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0"; + // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023D text_class=T023D ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + style { name: "list_text_sub_01_press"; + base: "color=#070707FF font=Tizen:style=Regular font_size=40 text_class=list_item ellipsis=1.0"; + // (Changeable UI) base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color=#ffffff color_class=T023P text_class=T023P ellipsis=1.0"; + STYLE_TAGS + STYLE_TAG_MATCH + } + } + group { name: "elm/genlist/item/msg_thread/default"; + alias: "elm/genlist/item_compress/msg_thread/default"; + alias: "elm/genlist/tree/msg_thread/default"; + alias: "elm/genlist/tree_compress/msg_thread/default"; + data.item: "texts" "elm.text elm.text.end elm.text.sub elm.text.sub.end"; + data.item: "contents" "elm.swallow.icon elm.swallow.icon.0 elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.end"; + script { + public end_icon_visible = 0; + public sub_end_text_visible = 0; + } + parts { + // base spacer for item min height + spacer { "base"; scale; + desc { "default"; + min: 0 GENLIST_ITEM_1LINE_HEIGHT_INC; + } + desc { "sub_text_visible"; + min: 0 GENLIST_ITEM_2LINE_HEIGHT_INC; + } + } + // background of item + rect { name: "bg"; + desc { state: "default"; + rel1 { to: "base"; relative: 0.0 0.0; } + rel2 { to: "base"; relative: 1.0 1.0; } + color: 0 0 0 0; + } + desc { state: "pressed"; inherit: "default"; + color: 0 0 0 10; + } + desc { state: "disabled"; inherit: "default"; + color: 0 0 0 0; + } + } + // swallow area for banded color + swallow { "elm.swallow.bg"; scale; + desc { "default"; + rel1 { to: "bg"; relative: 0.0 0.0; } + rel2 { to: "bg"; relative: 1.0 1.0; } + } + } + // left outside padding + spacer { "elm.padding.left"; scale; + desc { "default"; + fixed: 1 0; + min: GENLIST_ITEM_LR_PADDING_INC 0; + align: 0.0 0.5; + rel1 { to: "elm.swallow.bg"; relative: 0.0 0.0; } + rel2 { to: "elm.swallow.bg"; relative: 0.0 1.0; } + } + } + // right outside padding + spacer { "elm.padding.right"; scale; + desc { "default"; + fixed: 1 0; + min: GENLIST_ITEM_LR_PADDING_INC 0; + align: 1.0 0.5; + rel1 { to: "elm.swallow.bg"; relative: 1.0 0.0; } + rel2 { to: "elm.swallow.bg"; relative: 1.0 1.0; } + } + } + // top outside padding + spacer { "elm.padding.top"; scale; + desc { "default"; + fixed: 0 1; + min: 0 GENLIST_ITEM_TOP_PADDING_INC; + max: -1 GENLIST_ITEM_TOP_PADDING_INC; + align: 0.5 0.0; + rel1 { to: "elm.swallow.bg"; relative: 0.0 0.0; } + rel2 { to: "elm.swallow.bg"; relative: 1.0 0.0; } + } + } + // bottom outside padding + spacer { "elm.padding.bottom"; scale; + desc { "default"; + fixed: 0 1; + min: 0 GENLIST_ITEM_BOTTOM_PADDING_INC; + max: -1 GENLIST_ITEM_BOTTOM_PADDING_INC; + align: 0.5 1.0; + rel1 { to: "elm.swallow.bg"; relative: 0.0 1.0; } + rel2 { to: "elm.swallow.bg"; relative: 1.0 1.0; } + } + } + // left swallow (Type B) + swallow { "elm.swallow.icon"; scale; + desc { state: "default"; + fixed: 1 0; + align: 0.0 0.5; + rel1 { to_x: "elm.padding.left"; to_y: "elm.padding.top"; relative: 1.0 1.0; } + rel2 { to_x: "elm.padding.left"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + } + } + // padding between Type B & Type A + spacer { "elm.padding.B.A"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 0.0 0.5; + rel1 { to_x: "elm.swallow.icon"; to_y: "elm.padding.top"; relative: 1.0 1.0; } + rel2 { to_x: "elm.swallow.icon"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_TYPE_BA_PADDING_INC 0; + } + } + // right swallow (Type C) + swallow { "elm.swallow.end"; scale; + desc { state: "default"; + fixed: 1 0; + align: 1.0 0.5; + rel1 { to_x: "elm.padding.right"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.padding.right"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + } + // padding between Type D & Type C + spacer { "elm.padding.D.C"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 1.0 0.5; + rel1 { to_x: "elm.swallow.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.swallow.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_TYPE_DC_PADDING_INC 0; + } + } + // right swallow 2 (Type D) + swallow { "elm.swallow.icon.2"; scale; + desc { state: "default"; + fixed: 1 0; + align: 1.0 0.5; + rel1 { to_x: "elm.padding.D.C"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.padding.D.C"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + } + // padding between Type A & Type D + spacer { "elm.padding.A.D"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 1.0 0.5; + rel1 { to_x: "elm.swallow.icon.2"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.swallow.icon.2"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_TYPE_AD_PADDING_INC 0; + } + } + // sub text line + textblock { "elm.text.sub.end"; scale; + desc { "default"; + fixed: 1 1; + min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; + max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1; + align: 1.0 0.0; + rel1 { to_x: "elm.padding.A.D"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + text.style: "list_text_sub_end"; + text.min: 1 1; + text.max: 0 1; + text.ellipsis: -1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_text_sub_end_press"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_text_sub_end_dim"; + } + } + spacer { "elm.padding.sub.text.end"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 1.0 0.5; + rel1 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; + } + desc { "text_visible"; inherit: "default"; + min: GENLIST_ITEM_SUB_LINE_TEXT_END_PADDING_INC 0; + rel1 { to_x: "elm.text.sub.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to_x: "elm.text.sub.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + } + textblock { "elm.text.sub"; scale; + desc { "default"; + fixed: 1 1; + min: 0 GENLIST_ITEM_SUB_LINE_HEIGHT_INC; + align: 0.5 0.0; + rel1 { to_x: "elm.padding.B.A"; to_y: "elm.padding.top"; relative: 1.0 1.0; } + rel2 { to_x: "elm.padding.sub.text.end"; to_y: "elm.padding.top"; relative: 0.0 1.0; } + text.style: "list_text_sub_01"; + text.min: 0 1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_text_sub_01_press"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_text_sub_01_dim"; + } + } + // bottom base of main text line + spacer { "base_line"; + desc { "default"; + rel1 { to: "elm.padding.top"; relative: 0.0 1.0; } + rel2 { to: "elm.padding.top"; relative: 1.0 1.0; } + } + desc { "sub_text_visible"; inherit: "default"; + rel1 { to_y: "elm.text.sub"; relative: 0.0 1.0; } + rel2 { to_y: "elm.text.sub"; relative: 1.0 1.0; } + } + } + // main text line + swallow { "elm.swallow.icon.0"; scale; + desc { "default"; + fixed: 1 0; + align: 0.0 0.5; + rel1 { to_x: "elm.padding.B.A"; to_y: "base_line"; relative: 1.0 1.0; } + rel2 { to_x: "elm.padding.B.A"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + } + } + swallow { "elm.swallow.icon.1"; scale; + desc { "default"; + fixed: 1 0; + align: 1.0 0.5; + rel1 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 1.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + } + spacer { "elm.padding.main.icon.text"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 0.0 0.5; + rel1 { to: "elm.swallow.icon.0"; to_y: "base_line"; relative: 1.0 1.0; } + rel2 { to: "elm.swallow.icon.0"; to_y: "elm.padding.bottom"; relative: 1.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_MAIN_LINE_ICON_TEXT_PADDING_INC 0; + } + } + textblock { "elm.text.end"; scale; + desc { "default"; + fixed: 1 0; + min: 0 GENLIST_ITEM_MAIN_LINE_HEIGHT_INC; + max: GENLIST_ITEM_END_TEXT_WIDTH_INC -1; + align: 1.0 0.5; + rel1 { to_x: "elm.padding.A.D"; to_y: "base_line"; relative: 0.0 1.0; } + rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + text.style: "list_text_end"; + text.min: 1 1; + text.max: 0 1; + text.ellipsis: -1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_text_end_press"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_text_end_dim"; + } + } + spacer { "elm.padding.main.text.end"; scale; + desc { "default"; + fixed: 1 0; + min: 0 0; + align: 1.0 0.5; + rel1 { to_x: "elm.swallow.icon.1"; to_y: "base_line"; relative: 0.0 1.0; } + rel2 { to_x: "elm.swallow.icon.1"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "icon_visible"; inherit: "default"; + min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; + } + desc { "text_visible"; inherit: "default"; + min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; + rel1 { to_x: "elm.text.end"; to_y: "base_line"; relative: 0.0 1.0; } + rel2 { to_x: "elm.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + desc { "sub_text_visible"; inherit: "default"; + min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0; + rel1 { to_x: "elm.text.sub.end"; to_y: "base_line"; relative: 0.0 1.0; } + rel2 { to_x: "elm.text.sub.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + } + } + textblock { "elm.text"; scale; + desc { "default"; + fixed: 1 0; + min: 0 GENLIST_ITEM_MAIN_LINE_HEIGHT_INC; + align: 0.5 0.5; + rel1 { to_x: "elm.padding.main.icon.text"; to_y: "base_line"; relative: 1.0 1.0; } + rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; } + text.style: "list_text_main"; + text.min: 0 1; + } + desc { "pressed"; inherit: "default"; + text.style: "list_text_main_press"; + } + desc { "disabled"; inherit: "default"; + text.style: "list_text_main_dim"; + } + } + rect { "elm.bottomline"; scale; + desc { "default"; + fixed: 0 1; + min: 0 LIST_BOTTOMLINE_HEIGHT; + max: -1 LIST_BOTTOMLINE_HEIGHT; + align: 0.5 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + color: 204 204 204 255; + } + desc { "hidden"; inherit: "default"; + visible: 0; + } + } + } + programs { + program { name: "play_sound"; + signal: "elm,state,clicked"; + source: "elm"; + script { + run_program(PROGRAM:"touch_sound"); + } + } + program { name: "touch_sound"; + action: RUN_PLUGIN "touch_sound"; + } + program { + signal: "elm,state,elm.swallow.bg,visible"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "elm.bottomline"; + } + program { + signal: "elm,state,elm.swallow.icon,visible"; + source: "elm"; + action: STATE_SET "icon_visible" 0.0; + target: "elm.padding.B.A"; + } + program { + signal: "elm,state,elm.swallow.icon.2,visible"; + source: "elm"; + action: STATE_SET "icon_visible" 0.0; + target: "elm.padding.A.D"; + } + program { + signal: "elm,state,elm.swallow.end,visible"; + source: "elm"; + action: STATE_SET "icon_visible" 0.0; + target: "elm.padding.D.C"; + } + program { + signal: "elm,state,elm.swallow.icon.0,visible"; + source: "elm"; + action: STATE_SET "icon_visible" 0.0; + target: "elm.padding.main.icon.text"; + } + program { + signal: "elm,state,elm.swallow.icon.1,visible"; + source: "elm"; + script { + if (get_int(sub_end_text_visible) == 0) { + set_state(PART:"elm.padding.main.text.end", "icon_visible", 0.0); + set_state(PART:"elm.padding.sub.text.end", "icon_visible", 0.0); + } + else { + set_state(PART:"elm.padding.main.text.end", "sub_text_visible", 0.0); + set_state(PART:"elm.padding.sub.text.end", "text_visible", 0.0); + } + set_int(end_icon_visible, 1); + } + } + program { + signal: "elm,state,elm.text.sub,visible"; + source: "elm"; + action: STATE_SET "sub_text_visible" 0.0; + target: "base"; + target: "base_line"; + } + program { + signal: "elm,state,elm.text.end,visible"; + source: "elm"; + script { + if (get_int(end_icon_visible) == 1 && get_int(sub_end_text_visible) == 1) { + set_state(PART:"elm.padding.main.text.end", "sub_text_visible", 0.0); + } + else { + set_state(PART:"elm.padding.main.text.end", "text_visible", 0.0); + } + } + } + program { + signal: "elm,state,elm.text.sub.end,visible"; + source: "elm"; + script { + set_int(sub_end_text_visible, 1); + set_state(PART:"elm.padding.sub.text.end", "text_visible", 0.0); + set_state(PART:"elm.swallow.icon.1", "text_visible", 0.0); + } + } + program { name: "default"; + signal: "elm,state,default"; + source: "elm"; + script { + set_state(PART:"base", "default", 0.0); + set_state(PART:"base_line", "default", 0.0); + set_state(PART:"elm.swallow.icon.1", "default", 0.0); + set_state(PART:"elm.padding.B.A", "default", 0.0); + set_state(PART:"elm.padding.A.D", "default", 0.0); + set_state(PART:"elm.padding.D.C", "default", 0.0); + set_state(PART:"elm.padding.main.icon.text", "default", 0.0); + set_state(PART:"elm.padding.main.text.end", "default", 0.0); + set_state(PART:"elm.padding.sub.text.end", "default", 0.0); + set_state(PART:"elm.bottomline", "default", 0.0); + set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"elm.text.end", "default", 0.0); + set_state(PART:"elm.text.sub", "default", 0.0); + set_state(PART:"elm.text.sub.end", "default", 0.0); + set_int(sub_end_text_visible, 0); + } + } + program { name: "pressed"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "bg"; + target: "elm.text"; + target: "elm.text.end"; + target: "elm.text.sub"; + target: "elm.text.sub.end"; + } + program { name: "unpressed"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg"; + target: "elm.text"; + target: "elm.text.end"; + target: "elm.text.sub"; + target: "elm.text.sub.end"; + } + program { name: "enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg"; + target: "elm.text"; + target: "elm.text.end"; + target: "elm.text.sub"; + target: "elm.text.sub.end"; + } + program { name: "disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "bg"; + target: "elm.text"; + target: "elm.text.end"; + target: "elm.text.sub"; + target: "elm.text.sub.end"; + } + } + } +} \ No newline at end of file diff --git a/res/images/list_ic_OTA_message.png b/res/images/list_ic_OTA_message.png deleted file mode 100755 index 73cdc6b..0000000 Binary files a/res/images/list_ic_OTA_message.png and /dev/null differ diff --git a/res/images/list_ic_cb_message.png b/res/images/list_ic_cb_message.png deleted file mode 100755 index d2f555d..0000000 Binary files a/res/images/list_ic_cb_message.png and /dev/null differ diff --git a/res/images/list_ic_contacts.png b/res/images/list_ic_contacts.png deleted file mode 100755 index 8cf49e8..0000000 Binary files a/res/images/list_ic_contacts.png and /dev/null differ diff --git a/res/images/list_ic_contacts_bg.png b/res/images/list_ic_contacts_bg.png deleted file mode 100755 index 9d132ff..0000000 Binary files a/res/images/list_ic_contacts_bg.png and /dev/null differ diff --git a/res/images/list_ic_group.png b/res/images/list_ic_group.png deleted file mode 100755 index 0293572..0000000 Binary files a/res/images/list_ic_group.png and /dev/null differ diff --git a/res/images/list_ic_push_message.png b/res/images/list_ic_push_message.png deleted file mode 100755 index 010c6ab..0000000 Binary files a/res/images/list_ic_push_message.png and /dev/null differ diff --git a/res/images/messages_conversation_thumb_OTA.PNG b/res/images/messages_conversation_thumb_OTA.PNG new file mode 100644 index 0000000..67cd9bc Binary files /dev/null and b/res/images/messages_conversation_thumb_OTA.PNG differ diff --git a/res/images/messages_conversation_thumb_cb.png b/res/images/messages_conversation_thumb_cb.png new file mode 100644 index 0000000..39534c5 Binary files /dev/null and b/res/images/messages_conversation_thumb_cb.png differ diff --git a/res/images/messages_conversation_thumb_masking.png b/res/images/messages_conversation_thumb_masking.png new file mode 100644 index 0000000..66ae050 Binary files /dev/null and b/res/images/messages_conversation_thumb_masking.png differ diff --git a/res/images/messages_conversation_thumb_multi.PNG b/res/images/messages_conversation_thumb_multi.PNG new file mode 100644 index 0000000..c243de2 Binary files /dev/null and b/res/images/messages_conversation_thumb_multi.PNG differ diff --git a/res/images/messages_conversation_thumb_push.png b/res/images/messages_conversation_thumb_push.png new file mode 100644 index 0000000..4c1236d Binary files /dev/null and b/res/images/messages_conversation_thumb_push.png differ diff --git a/res/images/messages_conversation_thumb_single.png b/res/images/messages_conversation_thumb_single.png new file mode 100644 index 0000000..3ffc4b5 Binary files /dev/null and b/res/images/messages_conversation_thumb_single.png differ diff --git a/src/Common/Controller/src/App.cpp b/src/Common/Controller/src/App.cpp index 00a0d7a..b882711 100644 --- a/src/Common/Controller/src/App.cpp +++ b/src/Common/Controller/src/App.cpp @@ -61,6 +61,9 @@ bool App::init() std::string buttonThemePath = PathUtils::getResourcePath(BUTTON_THEME_EDJ_PATH); elm_theme_extension_add(nullptr, buttonThemePath.c_str()); + std::string threadThemePath = PathUtils::getResourcePath(THREAD_THEME_EDJ_PATH); + elm_theme_extension_add(nullptr, threadThemePath.c_str()); + return true; } diff --git a/src/Common/Utils/src/ThumbnailMaker.cpp b/src/Common/Utils/src/ThumbnailMaker.cpp index bd30e57..3c1bfda 100644 --- a/src/Common/Utils/src/ThumbnailMaker.cpp +++ b/src/Common/Utils/src/ThumbnailMaker.cpp @@ -24,7 +24,7 @@ using namespace Msg; -const int defaultThumbSize = 74; +const int defaultThumbSize = 80; const int defaultCache = 512; #define COLOR_BLUE 61, 185, 204, 255 #define RAND (rand() % 220) diff --git a/src/MsgThread/View/src/ThreadListViewItem.cpp b/src/MsgThread/View/src/ThreadListViewItem.cpp index c1cbfd1..47f9b2e 100644 --- a/src/MsgThread/View/src/ThreadListViewItem.cpp +++ b/src/MsgThread/View/src/ThreadListViewItem.cpp @@ -29,7 +29,7 @@ using namespace Msg; namespace { - ListItemStyleRef threadItemStyle = ListItemStyle::create("type2"); + ListItemStyleRef threadItemStyle = ListItemStyle::create("msg_thread"); const char *messagePart = "elm.text"; const char *namePart = "elm.text.sub"; @@ -39,9 +39,6 @@ namespace const char *statusPart = "elm.text.end"; const char *iconPart = "elm.swallow.icon.1"; - const TextStyle nameTextStyle(44, "#131313FF"); - const TextStyle msgTextStyle(38, "#969696FF"); - const TextStyle timeTextStyle(32, "#969696FF"); const TextStyle unreadTextStyle(34, "#e43d3dFF"); const TextStyle failedTextStyle(32, "#e43d3dFF"); const TextStyle draftTextStyle(32, "#e43d3dFF"); @@ -141,17 +138,20 @@ Evas_Object *ThreadListViewItem::getIcon() std::string ThreadListViewItem::decorateNameText(const std::string &text) const { - return TextDecorator::make(text, nameTextStyle); + // Style set in edc + return text; } std::string ThreadListViewItem::decorateMessageText(const std::string &text) const { - return TextDecorator::make(text, msgTextStyle); + // Style set in edc + return text; } std::string ThreadListViewItem::decorateTimeText(const std::string &text) const { - return TextDecorator::make(text, timeTextStyle); + // Style set in edc + return text; } std::string ThreadListViewItem::decorateUnreadText(const std::string &text) const