TizenRefApp-7610 Event's long title improperly displayed on Details screen

Change-Id: I67a5f59ba0c9b548622c39bd8308fa5c34eed6cb
Signed-off-by: Nataliia Sydorchuk <n.sydorchuk@samsung.com>

diff --git a/main-app/res/edje/inc/CalDialogDetailDescriptionItem.edc b/main-app/res/edje/inc/CalDialogDetailDescriptionItem.edc
index 234c7df..87b51b8 100644 (file)
--- a/main-app/res/edje/inc/CalDialogDetailDescriptionItem.edc
+++ b/main-app/res/edje/inc/CalDialogDetailDescriptionItem.edc
@@ -66,14 +66,6 @@ group { name: "elm/genlist/item/CalDialogDetailDescriptionItem/default";
         text.min: 0 1;
         text.style: "list_text_multiline_main";
      )
-     description { state: "pressed" 0.0;
-        inherit: "default" 0.0;
-        text.style: "list_text_multiline_main_press";
-     }
-     description { state: "disabled" 0.0;
-        inherit: "default" 0.0;
-        text.style: "list_text_multiline_main_dim";
-     }
     )
     PART(TEXTBLOCK, "elm.text.title",
      DSC_LRTB("default" 0.0,
@@ -82,14 +74,6 @@ group { name: "elm/genlist/item/CalDialogDetailDescriptionItem/default";
         text.min: 0 1;
         text.style: "list_text_sub_01";
      )
-     description { state: "pressed" 0.0;
-        inherit: "default" 0.0;
-        text.style: "list_text_sub_01_press";
-     }
-     description { state: "disabled" 0.0;
-        inherit: "default" 0.0;
-        text.style: "list_text_sub_01_dim";
-     }
     )
     programs {
          LIST_PROGRAM_SOUND

diff --git a/main-app/res/edje/inc/CalDialogDetailReminderItem.edc b/main-app/res/edje/inc/CalDialogDetailReminderItem.edc
index cc43a20..40ad336 100644 (file)
--- a/main-app/res/edje/inc/CalDialogDetailReminderItem.edc
+++ b/main-app/res/edje/inc/CalDialogDetailReminderItem.edc
@@ -64,14 +64,6 @@ group { name: "elm/genlist/item/CalDialogDetailReminderItem/default";
             text.min: 0 1;
             text.style: "list_text_multiline_main";
          )
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            text.style: "list_text_multiline_main_press";
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text.style: "list_text_multiline_main_dim";
-         }
       )
       PART(TEXTBLOCK, "elm.text.title",
          DSC_LRTB("default" 0.0,
@@ -80,14 +72,6 @@ group { name: "elm/genlist/item/CalDialogDetailReminderItem/default";
             text.min: 0 1;
             text.style: "list_text_sub_01";
          )
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            text.style: "list_text_sub_01_press";
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text.style: "list_text_sub_01_dim";
-         }
       )
       programs {
           LIST_PROGRAM_SOUND

diff --git a/main-app/res/edje/inc/CalDialogDetailSummaryItem.edc b/main-app/res/edje/inc/CalDialogDetailSummaryItem.edc
index ae3e7ac..1d0f4e0 100644 (file)
--- a/main-app/res/edje/inc/CalDialogDetailSummaryItem.edc
+++ b/main-app/res/edje/inc/CalDialogDetailSummaryItem.edc
@@ -15,6 +15,8 @@
  */
 
 #define DETAIL_SUMMARY_H 120
+#define DETAIL_SUMMARY_TB 24
+#define DETAIL_SUMMARY_R 32
 #define DETAIL_SUMMARY_COLORBAR_W 8
 #define DETAIL_SUMMARY_COLORBAR_R 24
 #define DETAIL_ICON_WH 98
@@ -43,6 +45,8 @@
                 clip_to: "masking"; \
                 description { \
                     state: "default" 0.0; \
+                    aspect: 1.0 1.0; \
+                    aspect_preference: SOURCE; \
                 } \
             } \
         } \
@@ -73,6 +77,22 @@ group {
                 rel2.relative: 0.0 1.0;
             }
         }
+        spacer { "elm.top.spacer"; scale;
+            desc { "default";
+                min: 0 DETAIL_SUMMARY_TB;
+                align: 0.5 0.0;
+                rel1.relative: 0.0 0.0;
+                rel2.relative: 1.0 0.0;
+            }
+        }
+        spacer { "elm.bottom.spacer"; scale;
+            desc { "default";
+                min: 0 DETAIL_SUMMARY_TB;
+                align: 0.5 1.0;
+                rel1.relative: 0.0 1.0;
+                rel2.relative: 1.0 1.0;
+            }
+        }
         spacer { "elm.details.color.spacer"; scale;
             desc { "default";
                 min: DETAIL_SUMMARY_COLORBAR_R 0;
@@ -106,11 +126,20 @@ group {
         textblock { "elm.text.multiline"; scale;
             desc { "default";
                 align: 0.0 0.5;
-                rel1 { relative: 1.0 0.0; to_x: "elm.details.icon.spacer"; }
-                rel2 { relative: 1.0 1.0; }
+                rel1 { relative: 1.0 1.0; to_x: "elm.details.icon.spacer"; to_y: "elm.top.spacer"; }
+                rel2 { relative: 0.0 0.0; to_x: "elm.right.spacer"; to_y: "elm.bottom.spacer"; }
+                text.min: 0.0 1.0;
                 text.style: "list_text_multiline_main";
             }
         }
+        spacer { "elm.right.spacer"; scale;
+            desc {
+                min: DETAIL_SUMMARY_R 0;
+                align: 1.0 0.5;
+                rel1 { relative: 1.0 0.0; }
+                rel2 { relative: 1.0 1.0; }
+            }
+        }
     }
     programs {
         program {

diff --git a/main-app/res/edje/theme/inc/WVGA-inc.edc b/main-app/res/edje/theme/inc/WVGA-inc.edc
index 1d8ab12..8d80a41 100644 (file)
--- a/main-app/res/edje/theme/inc/WVGA-inc.edc
+++ b/main-app/res/edje/theme/inc/WVGA-inc.edc
@@ -40,7 +40,7 @@
 
 #define LIST_TEXT_MDAY_SIZE                 50
 #define LIST_TEXT_MAIN_SIZE                 40
-#define LIST_TEXT_SUB_SIZE                  38
+#define LIST_TEXT_SUB_SIZE                  32
 
 // Multiline style
 #define LIST_WRAP_PADDING_LEFT_SIZE         32
@@ -87,29 +87,9 @@ styles {
       STYLE_TAGS
       STYLE_TAG_MATCH
    }
-   style { name: "list_text_sub_01_dim";
-      base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color="CAL_COLOR_T024D" text_class=list_item ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_sub_01_press";
-      base: "font=Tizen:style=Regular font_size="LIST_TEXT_SUB_SIZE" color="CAL_COLOR_T024P" text_class=list_item ellipsis=1.0";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
    // multiline text
    style { name: "list_text_multiline_main";
-      base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color="CAL_COLOR_T023" text_class=list_item wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_main_dim";
-      base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color="CAL_COLOR_T023D" text_class=list_item wrap=mixed";
-      STYLE_TAGS
-      STYLE_TAG_MATCH
-   }
-   style { name: "list_text_multiline_main_press";
-      base: "font=Tizen:style=Regular font_size="LIST_TEXT_MAIN_SIZE" color="CAL_COLOR_T023P" text_class=list_item wrap=mixed";
+      base: "font=Tizen:style=Light font_size="LIST_TEXT_MAIN_SIZE" color="CAL_COLOR_T023" text_class=list_item wrap=mixed";
       STYLE_TAGS
       STYLE_TAG_MATCH
    }

diff --git a/main-app/src/detail/CalDialogDetailEventTimeItem.cpp b/main-app/src/detail/CalDialogDetailEventTimeItem.cpp
index dbaa69a..4e98b33 100644 (file)
--- a/main-app/src/detail/CalDialogDetailEventTimeItem.cpp
+++ b/main-app/src/detail/CalDialogDetailEventTimeItem.cpp
@@ -18,9 +18,10 @@
 #include "CalDataManager.h"
 #include "CalDialogDetailEventTimeItem.h"
 
+#define TEXT_STYLE "Light"
 #define TEXT_SIZE 40
 #define TEXT_COLOR "000"
-#define TEXT_MARKUP "<font_size=%d><color=#%s>"
+#define TEXT_MARKUP "<font=Tizen:style=%s><font_size=%d><color=#%s>"
 
 CalDialogDetailEventTimeItem::CalDialogDetailEventTimeItem(
                const std::shared_ptr<CalSchedule> &schedule)
@@ -43,9 +44,9 @@ Elm_Genlist_Item_Class *CalDialogDetailEventTimeItem::getItemClassStatic()
                        std::string timeText;
                        item->__schedule->getFromToDisplayString(timeText);
 
-                       size_t size = strlen(timeText.c_str()) + strlen(TEXT_COLOR) + strlen(TEXT_MARKUP);
+                       size_t size = strlen(timeText.c_str()) + strlen(TEXT_STYLE) + strlen(TEXT_COLOR) + strlen(TEXT_MARKUP);
                        char *buffer = (char *) malloc(size);
-                       snprintf(buffer, size, TEXT_MARKUP "%s", TEXT_SIZE, TEXT_COLOR, timeText.c_str());
+                       snprintf(buffer, size, TEXT_MARKUP "%s", TEXT_STYLE, TEXT_SIZE, TEXT_COLOR, timeText.c_str());
                        return buffer;
                }
 

diff --git a/main-app/src/edit/CalDialogEditMultiTextRemoveIconItem.cpp b/main-app/src/edit/CalDialogEditMultiTextRemoveIconItem.cpp
index 00eb8f1..10536f7 100644 (file)
--- a/main-app/src/edit/CalDialogEditMultiTextRemoveIconItem.cpp
+++ b/main-app/src/edit/CalDialogEditMultiTextRemoveIconItem.cpp
@@ -18,21 +18,23 @@
 #include "CalDialogEditMultiTextRemoveIconItem.h"
 #include <sstream>
 
-#define TEXT_MARKUP "<font_size=%d><color=#%s>"
+#define TEXT_MARKUP "<font=Tizen:style=%s><font_size=%d><color=#%s>"
 #define TEXT_MARKUP_SIZE sizeof(TEXT_MARKUP)
 
+#define TEXT_STYLE "Light"
 #define TEXT_SIZE 40
 #define TEXT_COLOR "000"
 
+#define SUBTEXT_STYLE "Right"
 #define SUBTEXT_SIZE 32
 #define SUBTEXT_COLOR "737373"
 
 namespace {
-       char *formatText(int textSize, const char *textColor, const char *text)
+       char *formatText(const char *textStyle, int textSize, const char *textColor, const char *text)
        {
-               size_t size = strlen(text) + strlen(textColor) + TEXT_MARKUP_SIZE;
+               size_t size = strlen(text) + strlen(textStyle) + strlen(textColor) + TEXT_MARKUP_SIZE;
                char *buffer = (char *)malloc(size);
-               snprintf(buffer, size, TEXT_MARKUP "%s", textSize, textColor, text);
+               snprintf(buffer, size, TEXT_MARKUP "%s", textStyle, textSize, textColor, text);
                return buffer;
        }
 }
@@ -111,12 +113,12 @@ char *CalDialogEditMultiTextRemoveIconItem::getText(void *data, Evas_Object *obj
 
        if (!strcmp(part, "elm.text")) {
                if (!item->__caption.empty()) {
-                       return formatText(SUBTEXT_SIZE, SUBTEXT_COLOR, _L_G_(item->__caption.c_str()));
+                       return formatText(SUBTEXT_STYLE, SUBTEXT_SIZE, SUBTEXT_COLOR, _L_G_(item->__caption.c_str()));
                }
 
        } else if (!strcmp(part, "elm.text.multiline")) {
                char *mainText = !item->__mainText.empty()
-                               ? formatText(TEXT_SIZE, TEXT_COLOR, _L_G_(item->__mainText.c_str())) : nullptr;
+                               ? formatText(TEXT_STYLE, TEXT_SIZE, TEXT_COLOR, _L_G_(item->__mainText.c_str())) : nullptr;
                if (!mainText) {
                        return NULL;
                }
@@ -124,7 +126,7 @@ char *CalDialogEditMultiTextRemoveIconItem::getText(void *data, Evas_Object *obj
                free(mainText);
 
                char *subText = !item->__subText.empty()
-                               ? formatText(SUBTEXT_SIZE, SUBTEXT_COLOR, _L_G_(item->__subText.c_str())) : nullptr;
+                               ? formatText(SUBTEXT_STYLE, SUBTEXT_SIZE, SUBTEXT_COLOR, _L_G_(item->__subText.c_str())) : nullptr;
                if (subText) {
                        multilineText.append("<br/>").append(subText);
                        free(subText);